jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better logging for sealed sender, sender key distribution

This commit is contained in:
Scott Nonnenberg 2021-07-23 15:37:04 -07:00 committed by GitHub
parent 18140c4a9d
commit eba182f8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ts/textsecure/MessageReceiver.ts
View File

@ -911,7 +911,7 @@ export default class MessageReceiver extends EventTarget {
return `${sender}.${envelope.sourceDevice} ${timestamp} (${envelope.id})`;
}
return envelope.id;
return `${timestamp} (${envelope.id})`;
}
private clearRetryTimeout(): void {
@ -1322,8 +1322,6 @@ export default class MessageReceiver extends EventTarget {
const originalSource = envelope.source;
const originalSourceUuid = envelope.sourceUuid;
const unidentifiedLogId = this.getEnvelopeId(envelope);
const newEnvelope: DecryptedEnvelope = {
...envelope,
@ -1385,10 +1383,11 @@ export default class MessageReceiver extends EventTarget {
);
}
const unidentifiedLogId = this.getEnvelopeId(newEnvelope);
if (newEnvelope.serverTimestamp > certificate.expiration()) {
const envelopeId = this.getEnvelopeId(newEnvelope);
throw new Error(
`MessageReceiver.decryptSealedSender: Sender certificate is expired for envelope ${envelopeId}`
`MessageReceiver.decryptSealedSender: Sender certificate is expired for envelope ${unidentifiedLogId}`
);
}

3
ts/textsecure/SendMessage.ts
View File

@ -1912,6 +1912,9 @@ export default class MessageSender {
): Promise<CallbackResultType> {
const contentMessage = new Proto.Content();
const timestamp = Date.now();
window.log.info(
`sendSenderKeyDistributionMessage: Sending ${distributionId} with timestamp ${timestamp}`
);
const senderKeyDistributionMessage = await this.getSenderKeyDistributionMessage(
distributionId

6
ts/util/sendToGroup.ts
View File

@ -621,7 +621,7 @@ async function markIdentifierUnregistered(identifier: string) {
);
conversation.setUnregistered();
await window.Signal.Data.saveConversation(conversation.attributes);
await window.Signal.Data.updateConversation(conversation.attributes);
await window.textsecure.storage.protocol.archiveAllSessions(identifier);
}
@ -975,7 +975,7 @@ async function resetSenderKey(conversation: ConversationModel): Promise<void> {
memberDevices: [],
},
});
await window.Signal.Data.saveConversation(conversation.attributes);
await window.Signal.Data.updateConversation(conversation.attributes);
}
function getAccessKey(
@ -1047,7 +1047,7 @@ async function fetchKeysForIdentifier(
emptyConversation.set({
sealedSender: SEALED_SENDER.DISABLED,
});
await window.Signal.Data.saveConversation(emptyConversation.attributes);
await window.Signal.Data.updateConversation(emptyConversation.attributes);
}
} catch (error) {
if (error.name === 'UnregisteredUserError') {