mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libaxolotl/protocol.js
View file

@ -113,6 +113,16 @@ window.axolotl.protocol = function() {
openSessionRemaining = true;
if (!openSessionRemaining) // Used as a flag to get new pre keys for the next session
record.registrationId = null;
else if (record.registrationId === null && registrationId !== undefined)
record.registrationId = registrationId;
else if (record.registrationId === null)
throw new Error("Had open sessions on a record that had no registrationId set");
var identityKey = axolotl.api.storage.identityKeys.get(encodedNumber);
if (identityKey === undefined)
axolotl.api.storage.identityKeys.put(encodedNumber, record.identityKey);
else if (getString(identityKey) !== getString(record.identityKey))
throw new Error("Tried to change identity key at save time");
axolotl.api.storage.sessions.put(encodedNumber, record);
}
@ -160,8 +170,12 @@ window.axolotl.protocol = function() {
crypto_storage.getSessionOrIdentityKeyByBaseKey = function(encodedNumber, baseKey) {
var record = axolotl.api.storage.sessions.get(encodedNumber);
if (record === undefined)
return undefined;
if (record === undefined) {
var identityKey = axolotl.api.storage.identityKeys.get(encodedNumber);
if (identityKey === undefined)
return undefined;
return { indexInfo: { remoteIdentityKey: identityKey } };
}
var sessions = record._sessions;
var preferredSession = record._sessions[getString(baseKey)];

10
libaxolotl/test/fake_api.js
View file

@ -1,6 +1,7 @@
'use strict';
var testSessionMap = {};
var testIdentityKeysMap = {};
;(function() {
window.axolotl = window.axolotl || {};
@ -24,6 +25,15 @@ var testSessionMap = {};
localStorage.removeItem(key);
},
identityKeys: {
get: function(identifier) {
return testIdentityKeysMap[identifier];
},
put: function(identifier, identityKey) {
testIdentityKeysMap[identifier] = identityKey;
},
},
sessions: {
get: function(identifier) {
return testSessionMap[identifier];

1
libaxolotl/test/protocol_test.js
View file

@ -224,6 +224,7 @@ describe('Protocol', function() {
it(axolotlTestVectors[i].name, function(done) {
localStorage.clear();
testSessionMap = {};
testIdentityKeysMap = {};
return runAxolotlTest(axolotlTestVectors[i].vectors).then(function(res) {
assert(res);
}).then(done).catch(done);

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);