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

Serialize prekey refreshes & other account mgmt

Browse source 
Fixes #1060

// FREEBIE
This commit is contained in:
lilia 2017-02-14 11:27:59 -08:00
parent a98857a1d1
commit dfc292ac70
3 changed files with 146 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

29
js/background.js
View file

@ -44,20 +44,23 @@
return -1; return -1;
} }
}; };
var accountManager;
window.getAccountManager = function() { window.getAccountManager = function() {
var USERNAME = storage.get('number_id'); if (!accountManager) {
var PASSWORD = storage.get('password'); var USERNAME = storage.get('number_id');
var accountManager = new textsecure.AccountManager( var PASSWORD = storage.get('password');
SERVER_URL, SERVER_PORTS, USERNAME, PASSWORD accountManager = new textsecure.AccountManager(
); SERVER_URL, SERVER_PORTS, USERNAME, PASSWORD
accountManager.addEventListener('registration', function() { );
if (!Whisper.Registration.everDone()) { accountManager.addEventListener('registration', function() {
storage.put('safety-numbers-approval', false); if (!Whisper.Registration.everDone()) {
} storage.put('safety-numbers-approval', false);
Whisper.Registration.markDone(); }
console.log("dispatching registration event"); Whisper.Registration.markDone();
extension.trigger('registration_done'); console.log("dispatching registration event");
}); extension.trigger('registration_done');
});
}
return accountManager; return accountManager;
}; };

118
js/libtextsecure.js
View file

@ -37902,6 +37902,7 @@ var TextSecureServer = (function() {
function AccountManager(url, ports, username, password) { function AccountManager(url, ports, username, password) {
this.server = new TextSecureServer(url, ports, username, password); this.server = new TextSecureServer(url, ports, username, password);
this.pending = Promise.resolve();
} }
AccountManager.prototype = new textsecure.EventTarget(); AccountManager.prototype = new textsecure.EventTarget();
@ -37918,12 +37919,16 @@ var TextSecureServer = (function() {
var createAccount = this.createAccount.bind(this); var createAccount = this.createAccount.bind(this);
var generateKeys = this.generateKeys.bind(this, 100); var generateKeys = this.generateKeys.bind(this, 100);
var registrationDone = this.registrationDone.bind(this); var registrationDone = this.registrationDone.bind(this);
return libsignal.KeyHelper.generateIdentityKeyPair().then(function(identityKeyPair) { this.pending = this.pending.then(function() {
return createAccount(number, verificationCode, identityKeyPair). return libsignal.KeyHelper.generateIdentityKeyPair().then(function(identityKeyPair) {
then(generateKeys). return createAccount(number, verificationCode, identityKeyPair).
then(registerKeys). then(generateKeys).
then(registrationDone); then(registerKeys).
then(registrationDone);
}.bind(this));
}.bind(this)); }.bind(this));
return this.pending;
}, },
registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) { registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
var createAccount = this.createAccount.bind(this); var createAccount = this.createAccount.bind(this);
@ -37931,61 +37936,68 @@ var TextSecureServer = (function() {
var registrationDone = this.registrationDone.bind(this); var registrationDone = this.registrationDone.bind(this);
var registerKeys = this.server.registerKeys.bind(this.server); var registerKeys = this.server.registerKeys.bind(this.server);
var getSocket = this.server.getProvisioningSocket.bind(this.server); var getSocket = this.server.getProvisioningSocket.bind(this.server);
var provisioningCipher = new libsignal.ProvisioningCipher(); this.pending = this.pending.then(function() {
return provisioningCipher.getPublicKey().then(function(pubKey) { var provisioningCipher = new libsignal.ProvisioningCipher();
return new Promise(function(resolve, reject) { return provisioningCipher.getPublicKey().then(function(pubKey) {
var socket = getSocket(); return new Promise(function(resolve, reject) {
socket.onclose = function(e) { var socket = getSocket();
console.log('websocket closed', e.code); socket.onclose = function(e) {
reject(new Error('websocket closed')); console.log('websocket closed', e.code);
}; reject(new Error('websocket closed'));
var wsr = new WebSocketResource(socket, { };
keepalive: { path: '/v1/keepalive/provisioning' }, var wsr = new WebSocketResource(socket, {
handleRequest: function(request) { keepalive: { path: '/v1/keepalive/provisioning' },
if (request.path === "/v1/address" && request.verb === "PUT") { handleRequest: function(request) {
var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body); if (request.path === "/v1/address" && request.verb === "PUT") {
setProvisioningUrl([ var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
'tsdevice:/?uuid=', proto.uuid, '&pub_key=', setProvisioningUrl([
encodeURIComponent(btoa(getString(pubKey))) 'tsdevice:/?uuid=', proto.uuid, '&pub_key=',
].join('')); encodeURIComponent(btoa(getString(pubKey)))
request.respond(200, 'OK'); ].join(''));
} else if (request.path === "/v1/message" && request.verb === "PUT") { request.respond(200, 'OK');
var envelope = textsecure.protobuf.ProvisionEnvelope.decode(request.body, 'binary'); } else if (request.path === "/v1/message" && request.verb === "PUT") {
request.respond(200, 'OK'); var envelope = textsecure.protobuf.ProvisionEnvelope.decode(request.body, 'binary');
wsr.close(); request.respond(200, 'OK');
resolve(provisioningCipher.decrypt(envelope).then(function(provisionMessage) { wsr.close();
return confirmNumber(provisionMessage.number).then(function(deviceName) { resolve(provisioningCipher.decrypt(envelope).then(function(provisionMessage) {
if (typeof deviceName !== 'string' || deviceName.length === 0) { return confirmNumber(provisionMessage.number).then(function(deviceName) {
throw new Error('Invalid device name'); if (typeof deviceName !== 'string' || deviceName.length === 0) {
} throw new Error('Invalid device name');
return createAccount( }
provisionMessage.number, return createAccount(
provisionMessage.provisioningCode, provisionMessage.number,
provisionMessage.identityKeyPair, provisionMessage.provisioningCode,
deviceName, provisionMessage.identityKeyPair,
provisionMessage.userAgent deviceName,
); provisionMessage.userAgent
}); );
})); });
} else { }));
console.log('Unknown websocket message', request.path); } else {
console.log('Unknown websocket message', request.path);
}
} }
} });
}); });
}); }).then(generateKeys).
}).then(generateKeys). then(registerKeys).
then(registerKeys). then(registrationDone);
then(registrationDone); }.bind(this));
return this.pending;
}, },
refreshPreKeys: function() { refreshPreKeys: function() {
var generateKeys = this.generateKeys.bind(this, 100); var generateKeys = this.generateKeys.bind(this, 100);
var registerKeys = this.server.registerKeys.bind(this.server); var registerKeys = this.server.registerKeys.bind(this.server);
return this.server.getMyKeys().then(function(preKeyCount) {
console.log('prekey count ' + preKeyCount); this.pending = this.pending.then(function() {
if (preKeyCount < 10) { return this.server.getMyKeys().then(function(preKeyCount) {
return generateKeys().then(registerKeys); console.log('prekey count ' + preKeyCount);
} if (preKeyCount < 10) {
return generateKeys().then(registerKeys);
}
}.bind(this));
}.bind(this)); }.bind(this));
return this.pending;
}, },
createAccount: function(number, verificationCode, identityKeyPair, deviceName, userAgent) { createAccount: function(number, verificationCode, identityKeyPair, deviceName, userAgent) {
var signalingKey = libsignal.crypto.getRandomBytes(32 + 20); var signalingKey = libsignal.crypto.getRandomBytes(32 + 20);

118
libtextsecure/account_manager.js
View file

@ -9,6 +9,7 @@
function AccountManager(url, ports, username, password) { function AccountManager(url, ports, username, password) {
this.server = new TextSecureServer(url, ports, username, password); this.server = new TextSecureServer(url, ports, username, password);
this.pending = Promise.resolve();
} }
AccountManager.prototype = new textsecure.EventTarget(); AccountManager.prototype = new textsecure.EventTarget();
@ -25,12 +26,16 @@
var createAccount = this.createAccount.bind(this); var createAccount = this.createAccount.bind(this);
var generateKeys = this.generateKeys.bind(this, 100); var generateKeys = this.generateKeys.bind(this, 100);
var registrationDone = this.registrationDone.bind(this); var registrationDone = this.registrationDone.bind(this);
return libsignal.KeyHelper.generateIdentityKeyPair().then(function(identityKeyPair) { this.pending = this.pending.then(function() {
return createAccount(number, verificationCode, identityKeyPair). return libsignal.KeyHelper.generateIdentityKeyPair().then(function(identityKeyPair) {
then(generateKeys). return createAccount(number, verificationCode, identityKeyPair).
then(registerKeys). then(generateKeys).
then(registrationDone); then(registerKeys).
then(registrationDone);
}.bind(this));
}.bind(this)); }.bind(this));
return this.pending;
}, },
registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) { registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
var createAccount = this.createAccount.bind(this); var createAccount = this.createAccount.bind(this);
@ -38,61 +43,68 @@
var registrationDone = this.registrationDone.bind(this); var registrationDone = this.registrationDone.bind(this);
var registerKeys = this.server.registerKeys.bind(this.server); var registerKeys = this.server.registerKeys.bind(this.server);
var getSocket = this.server.getProvisioningSocket.bind(this.server); var getSocket = this.server.getProvisioningSocket.bind(this.server);
var provisioningCipher = new libsignal.ProvisioningCipher(); this.pending = this.pending.then(function() {
return provisioningCipher.getPublicKey().then(function(pubKey) { var provisioningCipher = new libsignal.ProvisioningCipher();
return new Promise(function(resolve, reject) { return provisioningCipher.getPublicKey().then(function(pubKey) {
var socket = getSocket(); return new Promise(function(resolve, reject) {
socket.onclose = function(e) { var socket = getSocket();
console.log('websocket closed', e.code); socket.onclose = function(e) {
reject(new Error('websocket closed')); console.log('websocket closed', e.code);
}; reject(new Error('websocket closed'));
var wsr = new WebSocketResource(socket, { };
keepalive: { path: '/v1/keepalive/provisioning' }, var wsr = new WebSocketResource(socket, {
handleRequest: function(request) { keepalive: { path: '/v1/keepalive/provisioning' },
if (request.path === "/v1/address" && request.verb === "PUT") { handleRequest: function(request) {
var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body); if (request.path === "/v1/address" && request.verb === "PUT") {
setProvisioningUrl([ var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
'tsdevice:/?uuid=', proto.uuid, '&pub_key=', setProvisioningUrl([
encodeURIComponent(btoa(getString(pubKey))) 'tsdevice:/?uuid=', proto.uuid, '&pub_key=',
].join('')); encodeURIComponent(btoa(getString(pubKey)))
request.respond(200, 'OK'); ].join(''));
} else if (request.path === "/v1/message" && request.verb === "PUT") { request.respond(200, 'OK');
var envelope = textsecure.protobuf.ProvisionEnvelope.decode(request.body, 'binary'); } else if (request.path === "/v1/message" && request.verb === "PUT") {
request.respond(200, 'OK'); var envelope = textsecure.protobuf.ProvisionEnvelope.decode(request.body, 'binary');
wsr.close(); request.respond(200, 'OK');
resolve(provisioningCipher.decrypt(envelope).then(function(provisionMessage) { wsr.close();
return confirmNumber(provisionMessage.number).then(function(deviceName) { resolve(provisioningCipher.decrypt(envelope).then(function(provisionMessage) {
if (typeof deviceName !== 'string' || deviceName.length === 0) { return confirmNumber(provisionMessage.number).then(function(deviceName) {
throw new Error('Invalid device name'); if (typeof deviceName !== 'string' || deviceName.length === 0) {
} throw new Error('Invalid device name');
return createAccount( }
provisionMessage.number, return createAccount(
provisionMessage.provisioningCode, provisionMessage.number,
provisionMessage.identityKeyPair, provisionMessage.provisioningCode,
deviceName, provisionMessage.identityKeyPair,
provisionMessage.userAgent deviceName,
); provisionMessage.userAgent
}); );
})); });
} else { }));
console.log('Unknown websocket message', request.path); } else {
console.log('Unknown websocket message', request.path);
}
} }
} });
}); });
}); }).then(generateKeys).
}).then(generateKeys). then(registerKeys).
then(registerKeys). then(registrationDone);
then(registrationDone); }.bind(this));
return this.pending;
}, },
refreshPreKeys: function() { refreshPreKeys: function() {
var generateKeys = this.generateKeys.bind(this, 100); var generateKeys = this.generateKeys.bind(this, 100);
var registerKeys = this.server.registerKeys.bind(this.server); var registerKeys = this.server.registerKeys.bind(this.server);
return this.server.getMyKeys().then(function(preKeyCount) {
console.log('prekey count ' + preKeyCount); this.pending = this.pending.then(function() {
if (preKeyCount < 10) { return this.server.getMyKeys().then(function(preKeyCount) {
return generateKeys().then(registerKeys); console.log('prekey count ' + preKeyCount);
} if (preKeyCount < 10) {
return generateKeys().then(registerKeys);
}
}.bind(this));
}.bind(this)); }.bind(this));
return this.pending;
}, },
createAccount: function(number, verificationCode, identityKeyPair, deviceName, userAgent) { createAccount: function(number, verificationCode, identityKeyPair, deviceName, userAgent) {
var signalingKey = libsignal.crypto.getRandomBytes(32 + 20); var signalingKey = libsignal.crypto.getRandomBytes(32 + 20);