mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Store session information separately

Browse source
This commit is contained in:
Matt Corallo 2015-03-24 18:07:33 -07:00 committed by lilia
parent e33c6fddda
commit 8b9a168524
2 changed files with 72 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
js/libtextsecure.js
View file

@ -38054,23 +38054,45 @@ window.axolotl.sessions = {
window.textsecure.storage.sessions = { window.textsecure.storage.sessions = {
getSessionsForNumber: function(encodedNumber) { getSessionsForNumber: function(encodedNumber) {
var device = textsecure.storage.devices.getDeviceObject(encodedNumber, true); var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
if (device === undefined || device.sessions === undefined) var deviceId = textsecure.utils.unencodeNumber(encodedNumber)[1];
var sessions = textsecure.storage.get("sessions" + number);
if (sessions === undefined)
return undefined; return undefined;
return device.sessions; if (sessions[deviceId] === undefined)
return undefined;
var record = new axolotl.sessions.RecipientRecord();
record.deserialize(sessions[deviceId]);
if (getString(textsecure.storage.devices.getIdentityKeyForNumber(number)) !== getString(record.identityKey))
throw new Error("Got mismatched identity key on device object load");
return record;
}, },
putSessionsForDevice: function(encodedNumber, sessions) { putSessionsForDevice: function(encodedNumber, record) {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var deviceId = textsecure.utils.unencodeNumber(encodedNumber)[1];
textsecure.storage.devices.checkSaveIdentityKeyForNumber(number, record.identityKey);
var sessions = textsecure.storage.get("sessions" + number);
if (sessions === undefined)
sessions = {};
sessions[deviceId] = record.serialize();
textsecure.storage.put("sessions" + number, sessions);
var device = textsecure.storage.devices.getDeviceObject(encodedNumber); var device = textsecure.storage.devices.getDeviceObject(encodedNumber);
if (device === undefined) { if (device === undefined) {
device = { encodedNumber: encodedNumber, device = { encodedNumber: encodedNumber,
//TODO: Remove this duplication //TODO: Remove this duplication
identityKey: sessions.identityKey identityKey: record.identityKey
}; };
} }
if (getString(device.identityKey) !== getString(sessions.identityKey)) if (getString(device.identityKey) !== getString(record.identityKey)) {
console.error("Got device object with key inconsistent after checkSaveIdentityKeyForNumber returned!");
throw new Error("Tried to put session for device with changed identity key"); throw new Error("Tried to put session for device with changed identity key");
device.sessions = sessions; }
return textsecure.storage.devices.saveDeviceObject(device); return textsecure.storage.devices.saveDeviceObject(device);
}, },
@ -38080,6 +38102,12 @@ window.axolotl.sessions = {
return false; return false;
return true; return true;
}, },
// Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead
_removeIdentityKeyForNumber: function(number) {
textsecure.storage.remove("sessions" + number);
},
}; };
window.textsecure.storage.devices = { window.textsecure.storage.devices = {
@ -38108,15 +38136,6 @@ window.axolotl.sessions = {
var map = textsecure.storage.get("devices" + number); var map = textsecure.storage.get("devices" + number);
if (map === undefined) if (map === undefined)
return []; return [];
for (key in map.devices) {
if (map.devices[key].sessions !== undefined) {
var record = new axolotl.sessions.RecipientRecord();
record.deserialize(map.devices[key].sessions);
if (getString(map.identityKey) !== getString(record.identityKey))
throw new Error("Got mismatched identity key on device object load");
map.devices[key].sessions = record;
}
}
return map.devices; return map.devices;
}, },
@ -38138,6 +38157,7 @@ window.axolotl.sessions = {
if (map === undefined) if (map === undefined)
throw new Error("Tried to remove identity for unknown number"); throw new Error("Tried to remove identity for unknown number");
textsecure.storage.remove("devices" + number); textsecure.storage.remove("devices" + number);
textsecure.storage.sessions._removeIdentityKeyForNumber(number);
}, },
getDeviceObject: function(encodedNumber, returnIdentityKey) { getDeviceObject: function(encodedNumber, returnIdentityKey) {
@ -38200,9 +38220,6 @@ window.axolotl.sessions = {
var number = textsecure.utils.unencodeNumber(deviceObject.encodedNumber)[0]; var number = textsecure.utils.unencodeNumber(deviceObject.encodedNumber)[0];
var map = textsecure.storage.get("devices" + number); var map = textsecure.storage.get("devices" + number);
if (deviceObject.sessions !== undefined)
deviceObject.sessions = deviceObject.sessions.serialize()
if (map === undefined) if (map === undefined)
map = { devices: [deviceObject], identityKey: deviceObject.identityKey }; map = { devices: [deviceObject], identityKey: deviceObject.identityKey };
else if (map.identityKey != getString(deviceObject.identityKey)) else if (map.identityKey != getString(deviceObject.identityKey))

55
libtextsecure/storage/devices.js
View file

@ -25,23 +25,45 @@
window.textsecure.storage.sessions = { window.textsecure.storage.sessions = {
getSessionsForNumber: function(encodedNumber) { getSessionsForNumber: function(encodedNumber) {
var device = textsecure.storage.devices.getDeviceObject(encodedNumber, true); var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
if (device === undefined || device.sessions === undefined) var deviceId = textsecure.utils.unencodeNumber(encodedNumber)[1];
var sessions = textsecure.storage.get("sessions" + number);
if (sessions === undefined)
return undefined; return undefined;
return device.sessions; if (sessions[deviceId] === undefined)
return undefined;
var record = new axolotl.sessions.RecipientRecord();
record.deserialize(sessions[deviceId]);
if (getString(textsecure.storage.devices.getIdentityKeyForNumber(number)) !== getString(record.identityKey))
throw new Error("Got mismatched identity key on device object load");
return record;
}, },
putSessionsForDevice: function(encodedNumber, sessions) { putSessionsForDevice: function(encodedNumber, record) {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var deviceId = textsecure.utils.unencodeNumber(encodedNumber)[1];
textsecure.storage.devices.checkSaveIdentityKeyForNumber(number, record.identityKey);
var sessions = textsecure.storage.get("sessions" + number);
if (sessions === undefined)
sessions = {};
sessions[deviceId] = record.serialize();
textsecure.storage.put("sessions" + number, sessions);
var device = textsecure.storage.devices.getDeviceObject(encodedNumber); var device = textsecure.storage.devices.getDeviceObject(encodedNumber);
if (device === undefined) { if (device === undefined) {
device = { encodedNumber: encodedNumber, device = { encodedNumber: encodedNumber,
//TODO: Remove this duplication //TODO: Remove this duplication
identityKey: sessions.identityKey identityKey: record.identityKey
}; };
} }
if (getString(device.identityKey) !== getString(sessions.identityKey)) if (getString(device.identityKey) !== getString(record.identityKey)) {
console.error("Got device object with key inconsistent after checkSaveIdentityKeyForNumber returned!");
throw new Error("Tried to put session for device with changed identity key"); throw new Error("Tried to put session for device with changed identity key");
device.sessions = sessions; }
return textsecure.storage.devices.saveDeviceObject(device); return textsecure.storage.devices.saveDeviceObject(device);
}, },
@ -51,6 +73,12 @@
return false; return false;
return true; return true;
}, },
// Use textsecure.storage.devices.removeIdentityKeyForNumber (which calls this) instead
_removeIdentityKeyForNumber: function(number) {
textsecure.storage.remove("sessions" + number);
},
}; };
window.textsecure.storage.devices = { window.textsecure.storage.devices = {
@ -79,15 +107,6 @@
var map = textsecure.storage.get("devices" + number); var map = textsecure.storage.get("devices" + number);
if (map === undefined) if (map === undefined)
return []; return [];
for (key in map.devices) {
if (map.devices[key].sessions !== undefined) {
var record = new axolotl.sessions.RecipientRecord();
record.deserialize(map.devices[key].sessions);
if (getString(map.identityKey) !== getString(record.identityKey))
throw new Error("Got mismatched identity key on device object load");
map.devices[key].sessions = record;
}
}
return map.devices; return map.devices;
}, },
@ -109,6 +128,7 @@
if (map === undefined) if (map === undefined)
throw new Error("Tried to remove identity for unknown number"); throw new Error("Tried to remove identity for unknown number");
textsecure.storage.remove("devices" + number); textsecure.storage.remove("devices" + number);
textsecure.storage.sessions._removeIdentityKeyForNumber(number);
}, },
getDeviceObject: function(encodedNumber, returnIdentityKey) { getDeviceObject: function(encodedNumber, returnIdentityKey) {
@ -171,9 +191,6 @@
var number = textsecure.utils.unencodeNumber(deviceObject.encodedNumber)[0]; var number = textsecure.utils.unencodeNumber(deviceObject.encodedNumber)[0];
var map = textsecure.storage.get("devices" + number); var map = textsecure.storage.get("devices" + number);
if (deviceObject.sessions !== undefined)
deviceObject.sessions = deviceObject.sessions.serialize()
if (map === undefined) if (map === undefined)
map = { devices: [deviceObject], identityKey: deviceObject.identityKey }; map = { devices: [deviceObject], identityKey: deviceObject.identityKey };
else if (map.identityKey != getString(deviceObject.identityKey)) else if (map.identityKey != getString(deviceObject.identityKey))