Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify service id checks in MessageReceiver

Browse Source
This commit is contained in:
Fedor Indutny
2025-04-24 11:24:52 -07:00
committed by GitHub
parent 5a191b2e49
commit bebdab211e
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ts/util/checkOurPniIdentityKey.ts
View File

@@ -10,6 +10,15 @@ export async function checkOurPniIdentityKey(): Promise<void> {
strictAssert(server, 'WebAPI not ready');
const ourPni = window.storage.user.getCheckedPni();
const { pni: remotePni } = await server.whoami();
if (remotePni !== ourPni) {
log.warn(
`checkOurPniIdentityKey: remote pni mismatch, ${remotePni} != ${ourPni}`
);
window.Whisper.events.trigger('unlinkAndDisconnect');
return;
}
const localKeyPair = await window.storage.protocol.getIdentityKeyPair(ourPni);
if (!localKeyPair) {
log.warn(
@@ -20,7 +29,6 @@ export async function checkOurPniIdentityKey(): Promise<void> {
}
const { identityKey: remoteKey } = await server.getKeysForServiceId(ourPni);
if (!constantTimeEqual(localKeyPair.publicKey.serialize(), remoteKey)) {
log.warn(
`checkOurPniIdentityKey: local/remote key mismatch for ${ourPni}, unlinking`