Move accountManager to typescript
Audric Ackermann
4 years ago
parent
fe684088de
commit
5d6d81b9ef
@ -1,162 +0,0 @@
|
|||||||
/* global
|
|
||||||
window,
|
|
||||||
textsecure,
|
|
||||||
libsignal,
|
|
||||||
mnemonic,
|
|
||||||
btoa,
|
|
||||||
getString,
|
|
||||||
Event,
|
|
||||||
dcodeIO,
|
|
||||||
StringView,
|
|
||||||
Event,
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* eslint-disable more/no-then */
|
|
||||||
/* eslint-disable no-unused-vars */
|
|
||||||
/* eslint-disable no-await-in-loop */
|
|
||||||
|
|
||||||
// eslint-disable-next-line func-names
|
|
||||||
(function() {
|
|
||||||
window.textsecure = window.textsecure || {};
|
|
||||||
|
|
||||||
const ARCHIVE_AGE = 7 * 24 * 60 * 60 * 1000;
|
|
||||||
|
|
||||||
function AccountManager(username, password) {
|
|
||||||
this.pending = Promise.resolve();
|
|
||||||
}
|
|
||||||
|
|
||||||
function getNumber(numberId) {
|
|
||||||
if (!numberId || !numberId.length) {
|
|
||||||
return numberId;
|
|
||||||
}
|
|
||||||
|
|
||||||
const parts = numberId.split('.');
|
|
||||||
if (!parts.length) {
|
|
||||||
return numberId;
|
|
||||||
}
|
|
||||||
|
|
||||||
return parts[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
AccountManager.prototype = new textsecure.EventTarget();
|
|
||||||
AccountManager.prototype.extend({
|
|
||||||
constructor: AccountManager,
|
|
||||||
registerSingleDevice(mnemonic, mnemonicLanguage, profileName) {
|
|
||||||
const createAccount = this.createAccount.bind(this);
|
|
||||||
const clearSessionsAndPreKeys = this.clearSessionsAndPreKeys.bind(this);
|
|
||||||
const registrationDone = this.registrationDone.bind(this);
|
|
||||||
let generateKeypair;
|
|
||||||
if (mnemonic) {
|
|
||||||
generateKeypair = () => {
|
|
||||||
let seedHex = window.mnemonic.mn_decode(mnemonic, mnemonicLanguage);
|
|
||||||
// handle shorter than 32 bytes seeds
|
|
||||||
const privKeyHexLength = 32 * 2;
|
|
||||||
if (seedHex.length !== privKeyHexLength) {
|
|
||||||
seedHex = seedHex.concat('0'.repeat(32));
|
|
||||||
seedHex = seedHex.substring(0, privKeyHexLength);
|
|
||||||
}
|
|
||||||
const seed = dcodeIO.ByteBuffer.wrap(seedHex, 'hex').toArrayBuffer();
|
|
||||||
return window.sessionGenerateKeyPair(seed);
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
generateKeypair = libsignal.KeyHelper.generateIdentityKeyPair;
|
|
||||||
}
|
|
||||||
return this.queueTask(() =>
|
|
||||||
generateKeypair().then(async identityKeyPair =>
|
|
||||||
createAccount(identityKeyPair)
|
|
||||||
.then(() => this.saveRecoveryPhrase(mnemonic))
|
|
||||||
.then(clearSessionsAndPreKeys)
|
|
||||||
.then(() => {
|
|
||||||
const pubKeyString = StringView.arrayBufferToHex(
|
|
||||||
identityKeyPair.pubKey
|
|
||||||
);
|
|
||||||
registrationDone(pubKeyString, profileName);
|
|
||||||
})
|
|
||||||
)
|
|
||||||
);
|
|
||||||
},
|
|
||||||
queueTask(task) {
|
|
||||||
const taskWithTimeout = textsecure.createTaskWithTimeout(task);
|
|
||||||
this.pending = this.pending.then(taskWithTimeout, taskWithTimeout);
|
|
||||||
|
|
||||||
return this.pending;
|
|
||||||
},
|
|
||||||
async createAccount(identityKeyPair, userAgent, readReceipts) {
|
|
||||||
let password = btoa(getString(libsignal.crypto.getRandomBytes(16)));
|
|
||||||
password = password.substring(0, password.length - 2);
|
|
||||||
|
|
||||||
await Promise.all([
|
|
||||||
textsecure.storage.remove('identityKey'),
|
|
||||||
textsecure.storage.remove('signaling_key'),
|
|
||||||
textsecure.storage.remove('password'),
|
|
||||||
textsecure.storage.remove('registrationId'),
|
|
||||||
textsecure.storage.remove('number_id'),
|
|
||||||
textsecure.storage.remove('device_name'),
|
|
||||||
textsecure.storage.remove('userAgent'),
|
|
||||||
textsecure.storage.remove('read-receipt-setting'),
|
|
||||||
textsecure.storage.remove('typing-indicators-setting'),
|
|
||||||
textsecure.storage.remove('regionCode'),
|
|
||||||
]);
|
|
||||||
|
|
||||||
// update our own identity key, which may have changed
|
|
||||||
// if we're relinking after a reinstall on the master device
|
|
||||||
const pubKeyString = StringView.arrayBufferToHex(identityKeyPair.pubKey);
|
|
||||||
|
|
||||||
await textsecure.storage.put('identityKey', identityKeyPair);
|
|
||||||
await textsecure.storage.put('password', password);
|
|
||||||
if (userAgent) {
|
|
||||||
await textsecure.storage.put('userAgent', userAgent);
|
|
||||||
}
|
|
||||||
|
|
||||||
await textsecure.storage.put(
|
|
||||||
'read-receipt-setting',
|
|
||||||
Boolean(readReceipts)
|
|
||||||
);
|
|
||||||
|
|
||||||
// Enable typing indicators by default
|
|
||||||
await textsecure.storage.put('typing-indicators-setting', Boolean(true));
|
|
||||||
|
|
||||||
await textsecure.storage.user.setNumberAndDeviceId(pubKeyString, 1);
|
|
||||||
},
|
|
||||||
async clearSessionsAndPreKeys() {
|
|
||||||
window.log.info('clearing all sessions');
|
|
||||||
// During secondary device registration we need to keep our prekeys sent
|
|
||||||
// to other pubkeys
|
|
||||||
await Promise.all([
|
|
||||||
window.Signal.Data.removeAllPreKeys(),
|
|
||||||
window.Signal.Data.removeAllSignedPreKeys(),
|
|
||||||
window.Signal.Data.removeAllContactPreKeys(),
|
|
||||||
window.Signal.Data.removeAllContactSignedPreKeys(),
|
|
||||||
window.Signal.Data.removeAllSessions(),
|
|
||||||
]);
|
|
||||||
},
|
|
||||||
async generateMnemonic(language = 'english') {
|
|
||||||
// Note: 4 bytes are converted into 3 seed words, so length 12 seed words
|
|
||||||
// (13 - 1 checksum) are generated using 12 * 4 / 3 = 16 bytes.
|
|
||||||
const seedSize = 16;
|
|
||||||
const seed = window.Signal.Crypto.getRandomBytes(seedSize);
|
|
||||||
const hex = StringView.arrayBufferToHex(seed);
|
|
||||||
return mnemonic.mn_encode(hex, language);
|
|
||||||
},
|
|
||||||
getCurrentRecoveryPhrase() {
|
|
||||||
return textsecure.storage.get('mnemonic');
|
|
||||||
},
|
|
||||||
saveRecoveryPhrase(mnemonic) {
|
|
||||||
return textsecure.storage.put('mnemonic', mnemonic);
|
|
||||||
},
|
|
||||||
async registrationDone(number, displayName) {
|
|
||||||
window.log.info('registration done');
|
|
||||||
|
|
||||||
textsecure.storage.put('primaryDevicePubKey', number);
|
|
||||||
|
|
||||||
// Ensure that we always have a conversation for ourself
|
|
||||||
const conversation = await window
|
|
||||||
.getConversationController()
|
|
||||||
.getOrCreateAndWait(number, 'private');
|
|
||||||
await conversation.setLokiProfile({ displayName });
|
|
||||||
|
|
||||||
this.dispatchEvent(new Event('registration'));
|
|
||||||
},
|
|
||||||
});
|
|
||||||
textsecure.AccountManager = AccountManager;
|
|
||||||
})();
|
|
||||||
@ -0,0 +1,135 @@
|
|||||||
|
import { ConversationController } from '../session/conversations';
|
||||||
|
import { getSodium } from '../session/crypto';
|
||||||
|
import { UserUtils } from '../session/utils';
|
||||||
|
import {
|
||||||
|
fromArrayBufferToBase64,
|
||||||
|
fromHex,
|
||||||
|
toHex,
|
||||||
|
} from '../session/utils/String';
|
||||||
|
import { getOurPubKeyStrFromCache } from '../session/utils/User';
|
||||||
|
import { trigger } from '../shims/events';
|
||||||
|
|
||||||
|
const generateKeypair = async (mnemonic: string, mnemonicLanguage: string) => {
|
||||||
|
let seedHex = window.mnemonic.mn_decode(mnemonic, mnemonicLanguage);
|
||||||
|
// handle shorter than 32 bytes seeds
|
||||||
|
const privKeyHexLength = 32 * 2;
|
||||||
|
if (seedHex.length !== privKeyHexLength) {
|
||||||
|
seedHex = seedHex.concat('0'.repeat(32));
|
||||||
|
seedHex = seedHex.substring(0, privKeyHexLength);
|
||||||
|
}
|
||||||
|
const seed = fromHex(seedHex);
|
||||||
|
console.warn('generateKeypair seedHex', seedHex);
|
||||||
|
console.warn('generateKeypair seed', seed);
|
||||||
|
return window.sessionGenerateKeyPair(seed);
|
||||||
|
};
|
||||||
|
|
||||||
|
// TODO not sure why AccountManager was a singleton before. Can we get rid of it as a singleton?
|
||||||
|
// tslint:disable-next-line: no-unnecessary-class
|
||||||
|
export class AccountManager {
|
||||||
|
public static async registerSingleDevice(
|
||||||
|
mnemonic: string,
|
||||||
|
mnemonicLanguage: string,
|
||||||
|
profileName: string
|
||||||
|
) {
|
||||||
|
const createAccount = this.createAccount.bind(this);
|
||||||
|
const clearSessionsAndPreKeys = this.clearSessionsAndPreKeys.bind(this);
|
||||||
|
const registrationDone = this.registrationDone.bind(this);
|
||||||
|
if (!mnemonic) {
|
||||||
|
throw new Error(
|
||||||
|
'Session always needs a mnemonic. Either generated or given by the user'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!profileName) {
|
||||||
|
throw new Error('We always needs a profileName');
|
||||||
|
}
|
||||||
|
if (!mnemonicLanguage) {
|
||||||
|
throw new Error('We always needs a mnemonicLanguage');
|
||||||
|
}
|
||||||
|
|
||||||
|
const identityKeyPair = await generateKeypair(mnemonic, mnemonicLanguage);
|
||||||
|
await createAccount(identityKeyPair);
|
||||||
|
UserUtils.saveRecoveryPhrase(mnemonic);
|
||||||
|
await clearSessionsAndPreKeys();
|
||||||
|
const pubKeyString = toHex(identityKeyPair.pubKey);
|
||||||
|
await registrationDone(pubKeyString, profileName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async generateMnemonic(language = 'english') {
|
||||||
|
// Note: 4 bytes are converted into 3 seed words, so length 12 seed words
|
||||||
|
// (13 - 1 checksum) are generated using 12 * 4 / 3 = 16 bytes.
|
||||||
|
const seedSize = 16;
|
||||||
|
const seed = window.Signal.Crypto.getRandomBytes(seedSize);
|
||||||
|
const hex = toHex(seed);
|
||||||
|
return window.mnemonic.mn_encode(hex, language);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async clearSessionsAndPreKeys() {
|
||||||
|
window.log.info('clearing all sessions');
|
||||||
|
// During secondary device registration we need to keep our prekeys sent
|
||||||
|
// to other pubkeys
|
||||||
|
await Promise.all([
|
||||||
|
window.Signal.Data.removeAllPreKeys(),
|
||||||
|
window.Signal.Data.removeAllSignedPreKeys(),
|
||||||
|
window.Signal.Data.removeAllContactPreKeys(),
|
||||||
|
window.Signal.Data.removeAllContactSignedPreKeys(),
|
||||||
|
window.Signal.Data.removeAllSessions(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async createAccount(identityKeyPair: any) {
|
||||||
|
const sodium = await getSodium();
|
||||||
|
let password = fromArrayBufferToBase64(sodium.randombytes_buf(16));
|
||||||
|
password = password.substring(0, password.length - 2);
|
||||||
|
|
||||||
|
await Promise.all([
|
||||||
|
window.textsecure.storage.remove('identityKey'),
|
||||||
|
window.textsecure.storage.remove('signaling_key'),
|
||||||
|
window.textsecure.storage.remove('password'),
|
||||||
|
window.textsecure.storage.remove('registrationId'),
|
||||||
|
window.textsecure.storage.remove('number_id'),
|
||||||
|
window.textsecure.storage.remove('device_name'),
|
||||||
|
window.textsecure.storage.remove('userAgent'),
|
||||||
|
window.textsecure.storage.remove('read-receipt-setting'),
|
||||||
|
window.textsecure.storage.remove('typing-indicators-setting'),
|
||||||
|
window.textsecure.storage.remove('regionCode'),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// update our own identity key, which may have changed
|
||||||
|
// if we're relinking after a reinstall on the master device
|
||||||
|
const pubKeyString = toHex(identityKeyPair.pubKey);
|
||||||
|
|
||||||
|
await window.textsecure.storage.put('identityKey', identityKeyPair);
|
||||||
|
await window.textsecure.storage.put('password', password);
|
||||||
|
await window.textsecure.storage.put('read-receipt-setting', false);
|
||||||
|
|
||||||
|
// Enable typing indicators by default
|
||||||
|
await window.textsecure.storage.put(
|
||||||
|
'typing-indicators-setting',
|
||||||
|
Boolean(true)
|
||||||
|
);
|
||||||
|
|
||||||
|
await window.textsecure.storage.user.setNumberAndDeviceId(pubKeyString, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async registrationDone(number: string, displayName: string) {
|
||||||
|
window.log.info('registration done');
|
||||||
|
|
||||||
|
window.textsecure.storage.put('primaryDevicePubKey', number);
|
||||||
|
|
||||||
|
// Ensure that we always have a conversation for ourself
|
||||||
|
const conversation = await ConversationController.getInstance().getOrCreateAndWait(
|
||||||
|
number,
|
||||||
|
'private'
|
||||||
|
);
|
||||||
|
await conversation.setLokiProfile({ displayName });
|
||||||
|
const user = {
|
||||||
|
ourNumber: getOurPubKeyStrFromCache(),
|
||||||
|
ourPrimary: window.textsecure.storage.get('primaryDevicePubKey'),
|
||||||
|
};
|
||||||
|
trigger('userChanged', user);
|
||||||
|
|
||||||
|
window.Whisper.Registration.markDone();
|
||||||
|
window.log.info('dispatching registration event');
|
||||||
|
trigger('registration_done');
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue