Reset sender key when group member has safety number change

This commit is contained in:
Scott Nonnenberg 2024-02-08 19:56:23 -08:00 committed by GitHub
parent 2434d5f16e
commit cecd10da34
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 40 deletions

View file

@ -720,6 +720,37 @@ export async function sendToGroupViaSenderKey(options: {
}
}
// Public utility methods
export async function resetSenderKey(
sendTarget: SenderKeyTargetType
): Promise<void> {
const logId = sendTarget.idForLogging();
log.info(`resetSenderKey/${logId}: Sender key needs reset. Clearing data...`);
const senderKeyInfo = sendTarget.getSenderKeyInfo();
if (!senderKeyInfo) {
log.warn(`resetSenderKey/${logId}: No sender key info`);
return;
}
const { distributionId } = senderKeyInfo;
const ourAddress = getOurAddress();
// Note: We preserve existing distributionId to minimize space for sender key storage
await sendTarget.saveSenderKeyInfo({
createdAtDate: Date.now(),
distributionId,
memberDevices: [],
});
const ourAci = window.storage.user.getCheckedAci();
await window.textsecure.storage.protocol.removeSenderKey(
new QualifiedAddress(ourAci, ourAddress),
distributionId
);
}
// Utility Methods
function mergeSendResult({
@ -1233,33 +1264,6 @@ function getOurAddress(): Address {
return new Address(ourAci, ourDeviceId);
}
async function resetSenderKey(sendTarget: SenderKeyTargetType): Promise<void> {
const logId = sendTarget.idForLogging();
log.info(`resetSenderKey/${logId}: Sender key needs reset. Clearing data...`);
const senderKeyInfo = sendTarget.getSenderKeyInfo();
if (!senderKeyInfo) {
log.warn(`resetSenderKey/${logId}: No sender key info`);
return;
}
const { distributionId } = senderKeyInfo;
const ourAddress = getOurAddress();
// Note: We preserve existing distributionId to minimize space for sender key storage
await sendTarget.saveSenderKeyInfo({
createdAtDate: Date.now(),
distributionId,
memberDevices: [],
});
const ourAci = window.storage.user.getCheckedAci();
await window.textsecure.storage.protocol.removeSenderKey(
new QualifiedAddress(ourAci, ourAddress),
distributionId
);
}
function getAccessKey(
attributes: ConversationAttributesType,
{ story }: { story?: boolean }