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

Split out identity key storage from session storage

Browse source
This commit is contained in:
Matt Corallo 2015-01-20 22:14:44 -10:00 • committed by lilia
parent 298c8624b2
commit 1bef1ce5d3
5 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libtextsecure/axolotl_wrapper.js
View file

@ -19,17 +19,22 @@
return textsecure.storage.removeEncrypted(key);
},
identityKeys: {
get: function(identifier) {
return textsecure.storage.devices.getIdentityKeyForNumber(textsecure.utils.unencodeNumber(identifier)[0]);
},
put: function(identifier, identityKey) {
return textsecure.storage.devices.checkSaveIdentityKeyForNumber(textsecure.utils.unencodeNumber(identifier)[0], identityKey);
},
},
sessions: {
get: function(identifier) {
var device = textsecure.storage.devices.getDeviceObject(identifier, true);
if (device === undefined)
if (device === undefined || device.sessions === undefined)
return undefined;
var record = new axolotl.sessions.RecipientRecord();
if (device.sessions !== undefined)
record.deserialize(device.sessions);
else
// TODO: (even for numbers, not devices) We MUST return an identityKey if we have one available
record.identityKey = device.identityKey;
record.deserialize(device.sessions);
if (getString(device.identityKey) !== getString(record.identityKey))
throw new Error("Got mismatched identity key on sessions load");
return record;

13
libtextsecure/storage/devices.js
View file

@ -49,6 +49,19 @@
return map === undefined ? [] : map.devices;
},
getIdentityKeyForNumber: function(number) {
var map = textsecure.storage.getEncrypted("devices" + number);
return map === undefined ? undefined : map.identityKey;
},
checkSaveIdentityKeyForNumber: function(number, identityKey) {
var map = textsecure.storage.getEncrypted("devices" + number);
if (map === undefined)
textsecure.storage.putEncrypted("devices" + number, { devices: [], identityKey: identityKey});
else if (getString(map.identityKey) !== getString(identityKey))
throw new Error("Attempted to overwrite a different identity key");
},
getDeviceObject: function(encodedNumber, returnIdentityKey) {
var number = textsecure.utils.unencodeNumber(encodedNumber)[0];
var devices = textsecure.storage.devices.getDeviceObjectsForNumber(number);