|
|
|
@ -84,19 +84,18 @@ export async function handleUnpairRequest(
|
|
|
|
export async function handlePairingAuthorisationMessage(
|
|
|
|
export async function handlePairingAuthorisationMessage(
|
|
|
|
envelope: EnvelopePlus,
|
|
|
|
envelope: EnvelopePlus,
|
|
|
|
pairingAuthorisation: SignalService.IPairingAuthorisationMessage,
|
|
|
|
pairingAuthorisation: SignalService.IPairingAuthorisationMessage,
|
|
|
|
dataMessage: SignalService.IDataMessage,
|
|
|
|
dataMessage: SignalService.IDataMessage | undefined | null
|
|
|
|
syncMessage: SignalService.ISyncMessage
|
|
|
|
|
|
|
|
): Promise<void> {
|
|
|
|
): Promise<void> {
|
|
|
|
const { secondaryDevicePubKey, grantSignature } = pairingAuthorisation;
|
|
|
|
const { secondaryDevicePubKey, grantSignature } = pairingAuthorisation;
|
|
|
|
const isGrant =
|
|
|
|
const isGrant =
|
|
|
|
grantSignature &&
|
|
|
|
grantSignature &&
|
|
|
|
|
|
|
|
grantSignature.length > 0 &&
|
|
|
|
secondaryDevicePubKey === window.textsecure.storage.user.getNumber();
|
|
|
|
secondaryDevicePubKey === window.textsecure.storage.user.getNumber();
|
|
|
|
if (isGrant) {
|
|
|
|
if (isGrant) {
|
|
|
|
await handleAuthorisationForSelf(
|
|
|
|
await handleAuthorisationForSelf(
|
|
|
|
envelope,
|
|
|
|
envelope,
|
|
|
|
pairingAuthorisation,
|
|
|
|
pairingAuthorisation,
|
|
|
|
dataMessage,
|
|
|
|
dataMessage
|
|
|
|
syncMessage
|
|
|
|
|
|
|
|
);
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
await handlePairingRequest(envelope, pairingAuthorisation);
|
|
|
|
await handlePairingRequest(envelope, pairingAuthorisation);
|
|
|
|
@ -134,8 +133,7 @@ async function handlePairingRequest(
|
|
|
|
async function handleAuthorisationForSelf(
|
|
|
|
async function handleAuthorisationForSelf(
|
|
|
|
envelope: EnvelopePlus,
|
|
|
|
envelope: EnvelopePlus,
|
|
|
|
pairingAuthorisation: SignalService.IPairingAuthorisationMessage,
|
|
|
|
pairingAuthorisation: SignalService.IPairingAuthorisationMessage,
|
|
|
|
dataMessage: SignalService.IDataMessage,
|
|
|
|
dataMessage: SignalService.IDataMessage | undefined | null
|
|
|
|
syncMessage: SignalService.ISyncMessage
|
|
|
|
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
const { ConversationController, libloki, Whisper } = window;
|
|
|
|
const { ConversationController, libloki, Whisper } = window;
|
|
|
|
|
|
|
|
|
|
|
|
@ -143,7 +141,6 @@ async function handleAuthorisationForSelf(
|
|
|
|
pairingAuthorisation
|
|
|
|
pairingAuthorisation
|
|
|
|
);
|
|
|
|
);
|
|
|
|
const alreadySecondaryDevice = !!window.storage.get('isSecondaryDevice');
|
|
|
|
const alreadySecondaryDevice = !!window.storage.get('isSecondaryDevice');
|
|
|
|
let removedFromCache = false;
|
|
|
|
|
|
|
|
if (alreadySecondaryDevice) {
|
|
|
|
if (alreadySecondaryDevice) {
|
|
|
|
window.log.warn(
|
|
|
|
window.log.warn(
|
|
|
|
'Received an unexpected pairing authorisation (device is already paired as secondary device). Ignoring.'
|
|
|
|
'Received an unexpected pairing authorisation (device is already paired as secondary device). Ignoring.'
|
|
|
|
@ -154,7 +151,7 @@ async function handleAuthorisationForSelf(
|
|
|
|
);
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
const { primaryDevicePubKey, grantSignature } = pairingAuthorisation;
|
|
|
|
const { primaryDevicePubKey, grantSignature } = pairingAuthorisation;
|
|
|
|
if (grantSignature) {
|
|
|
|
if (grantSignature && grantSignature.length > 0) {
|
|
|
|
// Authorisation received to become a secondary device
|
|
|
|
// Authorisation received to become a secondary device
|
|
|
|
window.log.info(
|
|
|
|
window.log.info(
|
|
|
|
`Received pairing authorisation from ${primaryDevicePubKey}`
|
|
|
|
`Received pairing authorisation from ${primaryDevicePubKey}`
|
|
|
|
@ -188,22 +185,12 @@ async function handleAuthorisationForSelf(
|
|
|
|
window.log.warn('profile or profileKey are missing in DataMessage');
|
|
|
|
window.log.warn('profile or profileKey are missing in DataMessage');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Update contact list
|
|
|
|
|
|
|
|
if (syncMessage && syncMessage.contacts) {
|
|
|
|
|
|
|
|
// Note: we do not return here because we don't want to block the next message on
|
|
|
|
|
|
|
|
// this attachment download and a lot of processing of that attachment.
|
|
|
|
|
|
|
|
// This call already removes the envelope from the cache
|
|
|
|
|
|
|
|
void handleContacts(envelope, syncMessage.contacts);
|
|
|
|
|
|
|
|
removedFromCache = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
window.log.warn('Unimplemented pairing authorisation message type');
|
|
|
|
window.log.warn('Unimplemented pairing authorisation message type');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!removedFromCache) {
|
|
|
|
|
|
|
|
await removeFromCache(envelope);
|
|
|
|
await removeFromCache(envelope);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function parseContacts(arrbuf: ArrayBuffer): Array<any> {
|
|
|
|
function parseContacts(arrbuf: ArrayBuffer): Array<any> {
|
|
|
|
const buffer = new ByteBuffer();
|
|
|
|
const buffer = new ByteBuffer();
|
|
|
|
|
Mikunj
5 years ago