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

Store identity keys in indexeddb

Browse source 
Let device storage request them from axolotl store rather than storing a
copy.
This commit is contained in:
lilia 2015-04-21 15:54:25 -07:00
parent 7eda48f755
commit 121671c99f
3 changed files with 68 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

51
js/axolotl_store.js
View file

@ -55,6 +55,19 @@
return res; return res;
} }
function equalArrayBuffers(ab1, ab2) {
if (ab1.bytelength !== ab2.bytelength) {
return false;
}
var result = true;
var ta1 = new Uint8Array(ab1);
var ta2 = new Uint8Array(ab2);
for (var i = 0; i < ab1.bytelength; ++i) {
if (ta1[i] !== ta2[i]) { result = false; }
}
return result;
}
var Model = Backbone.Model.extend({ database: Whisper.Database }); var Model = Backbone.Model.extend({ database: Whisper.Database });
var PreKey = Model.extend({ storeName: 'preKeys' }); var PreKey = Model.extend({ storeName: 'preKeys' });
var SignedPreKey = Model.extend({ storeName: 'signedPreKeys' }); var SignedPreKey = Model.extend({ storeName: 'signedPreKeys' });
@ -215,31 +228,37 @@
if (identifier === null || identifier === undefined) if (identifier === null || identifier === undefined)
throw new Error("Tried to get identity key for undefined/null key"); throw new Error("Tried to get identity key for undefined/null key");
var number = textsecure.utils.unencodeNumber(identifier)[0]; var number = textsecure.utils.unencodeNumber(identifier)[0];
return Promise.resolve(convertToArrayBuffer(function() { return new Promise(function(resolve) {
var map = textsecure.storage.get("devices" + number); var contact = new Contact({id: number});
return map === undefined ? undefined : map.identityKey; contact.fetch().always(function() {
}()); resolve(contact.get('identityKey'));
});
});
}, },
putIdentityKey: function(identifier, identityKey) { putIdentityKey: function(identifier, identityKey) {
if (identifier === null || identifier === undefined) if (identifier === null || identifier === undefined)
throw new Error("Tried to put identity key for undefined/null key"); throw new Error("Tried to put identity key for undefined/null key");
var number = textsecure.utils.unencodeNumber(identifier)[0]; var number = textsecure.utils.unencodeNumber(identifier)[0];
return Promise.resolve((function() { return new Promise(function(resolve) {
var map = textsecure.storage.get("devices" + number); var contact = new Contact({id: number});
if (map === undefined) contact.fetch().always(function() {
textsecure.storage.put("devices" + number, { devices: [], identityKey: identityKey}); var oldidentityKey = contact.get('identityKey');
else if (getString(map.identityKey) !== getString(identityKey)) if (oldidentityKey && !equalArrayBuffers(oldidentityKey, identityKey))
throw new Error("Attempted to overwrite a different identity key"); throw new Error("Attempted to overwrite a different identity key");
})()); contact.save({identityKey: identityKey}).then(resolve);
});
});
}, },
removeIdentityKey: function(number) { removeIdentityKey: function(number) {
return Promise.resolve((function() { return new Promise(function(resolve) {
var map = textsecure.storage.get("devices" + number); var contact = new Contact({id: number});
if (map === undefined) contact.fetch().then(function() {
contact.save({identityKey: undefined});
}).fail(function() {
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); });
return textsecure.storage.axolotl.removeAllSessions(number); resolve(textsecure.storage.axolotl.removeAllSessions(number));
})()); });
}, },

22
js/libtextsecure.js
View file

@ -38118,12 +38118,15 @@ axolotlInternal.RecipientRecord = function() {
}, },
getDeviceObjectsForNumber: function(number) { getDeviceObjectsForNumber: function(number) {
return Promise.resolve((function() { return textsecure.storage.axolotl.getIdentityKey(number).then(function(identityKey) {
var map = textsecure.storage.get("devices" + number); var map = textsecure.storage.get("devices" + number);
if (map === undefined) if (map === undefined)
return []; return [];
return map.devices; return map.devices.map(function(device) {
})()); device.identityKey = identityKey;
return device;
});
});
}, },
getDeviceObject: function(encodedNumber) { getDeviceObject: function(encodedNumber) {
@ -38171,17 +38174,18 @@ axolotlInternal.RecipientRecord = function() {
}; };
var internalSaveDeviceObject = function(deviceObject, onlyKeys) { var internalSaveDeviceObject = function(deviceObject, onlyKeys) {
return Promise.resolve((function() { if (deviceObject.encodedNumber === undefined)
if (deviceObject.identityKey === undefined || deviceObject.encodedNumber === undefined)
throw new Error("Tried to store invalid deviceObject"); throw new Error("Tried to store invalid deviceObject");
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 (map === undefined) return textsecure.storage.axolotl.getIdentityKey(number).then(function(identityKey) {
map = { devices: [deviceObject], identityKey: deviceObject.identityKey }; if (identityKey !== undefined && deviceObject.identityKey !== undefined && getString(identityKey) != getString(deviceObject.identityKey))
else if (map.identityKey != getString(deviceObject.identityKey))
throw new Error("Identity key changed"); throw new Error("Identity key changed");
if (map === undefined)
map = { devices: [deviceObject] };
else { else {
var updated = false; var updated = false;
for (var i in map.devices) { for (var i in map.devices) {
@ -38205,7 +38209,7 @@ axolotlInternal.RecipientRecord = function() {
} }
textsecure.storage.put("devices" + number, map); textsecure.storage.put("devices" + number, map);
})()); });
}; };
})(); })();

22
libtextsecure/storage/devices.js
View file

@ -47,12 +47,15 @@
}, },
getDeviceObjectsForNumber: function(number) { getDeviceObjectsForNumber: function(number) {
return Promise.resolve((function() { return textsecure.storage.axolotl.getIdentityKey(number).then(function(identityKey) {
var map = textsecure.storage.get("devices" + number); var map = textsecure.storage.get("devices" + number);
if (map === undefined) if (map === undefined)
return []; return [];
return map.devices; return map.devices.map(function(device) {
})()); device.identityKey = identityKey;
return device;
});
});
}, },
getDeviceObject: function(encodedNumber) { getDeviceObject: function(encodedNumber) {
@ -100,17 +103,18 @@
}; };
var internalSaveDeviceObject = function(deviceObject, onlyKeys) { var internalSaveDeviceObject = function(deviceObject, onlyKeys) {
return Promise.resolve((function() { if (deviceObject.encodedNumber === undefined)
if (deviceObject.identityKey === undefined || deviceObject.encodedNumber === undefined)
throw new Error("Tried to store invalid deviceObject"); throw new Error("Tried to store invalid deviceObject");
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 (map === undefined) return textsecure.storage.axolotl.getIdentityKey(number).then(function(identityKey) {
map = { devices: [deviceObject], identityKey: deviceObject.identityKey }; if (identityKey !== undefined && deviceObject.identityKey !== undefined && getString(identityKey) != getString(deviceObject.identityKey))
else if (map.identityKey != getString(deviceObject.identityKey))
throw new Error("Identity key changed"); throw new Error("Identity key changed");
if (map === undefined)
map = { devices: [deviceObject] };
else { else {
var updated = false; var updated = false;
for (var i in map.devices) { for (var i in map.devices) {
@ -134,6 +138,6 @@
} }
textsecure.storage.put("devices" + number, map); textsecure.storage.put("devices" + number, map);
})()); });
}; };
})(); })();