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

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}`
);
}