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

archiveSessionOnMatch: Check for ratchet key match as well

Browse source
This commit is contained in:
Scott Nonnenberg 2021-07-23 10:44:21 -07:00 • committed by GitHub
parent fdec47d637
commit b0eaae93f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ts/util/handleRetry.ts
View file

@ -158,6 +158,7 @@ export async function onDecryptionError(
// Helpers
async function archiveSessionOnMatch({
ratchetKey,
requesterUuid,
requesterDevice,
senderDevice,
@ -166,9 +167,17 @@ async function archiveSessionOnMatch({
window.textsecure.storage.user.getDeviceId(),
'archiveSessionOnMatch/getDeviceId'
);
if (ourDeviceId === senderDevice) {
const address = `${requesterUuid}.${requesterDevice}`;
window.log.info('archiveSessionOnMatch: Devices match, archiving session');
if (ourDeviceId !== senderDevice || !ratchetKey) {
return;
}
const address = `${requesterUuid}.${requesterDevice}`;
const session = await window.textsecure.storage.protocol.loadSession(address);
if (session && session.currentRatchetKeyMatches(ratchetKey)) {
window.log.info(
'archiveSessionOnMatch: Matching device and ratchetKey, archiving session'
);
await window.textsecure.storage.protocol.archiveSession(address);
}
}
@ -200,7 +209,7 @@ async function sendDistributionMessageOrNullMessage(
if (group && distributionId) {
window.log.info(
`sendDistributionMessageOrNullMessage/${logId}: Found matching group, sending sender key distribution message'`
`sendDistributionMessageOrNullMessage/${logId}: Found matching group, sending sender key distribution message`
);
try {