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

OutgoingMessage: Use enqueueSessionJob for all encrypts

Browse source
This commit is contained in:
Scott Nonnenberg 2021-05-04 18:03:03 -07:00 committed by GitHub
parent 7c2f233384
commit 18c86898d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 68 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
ts/textsecure/OutgoingMessage.ts
View file

@ -45,6 +45,13 @@ export const enum SenderCertificateMode {
WithoutE164, WithoutE164,
} }
type SendMetadata = {
type: number;
destinationDeviceId: number;
destinationRegistrationId: number;
content: string;
};
export const serializedCertificateSchema = z export const serializedCertificateSchema = z
.object({ .object({
expires: z.number().optional(), expires: z.number().optional(),
@ -434,58 +441,70 @@ export default class OutgoingMessage {
return Promise.all( return Promise.all(
deviceIds.map(async destinationDeviceId => { deviceIds.map(async destinationDeviceId => {
const protocolAddress = ProtocolAddress.new( const address = `${identifier}.${destinationDeviceId}`;
identifier,
destinationDeviceId return window.textsecure.storage.protocol.enqueueSessionJob<SendMetadata>(
address,
async () => {
const protocolAddress = ProtocolAddress.new(
identifier,
destinationDeviceId
);
const activeSession = await sessionStore.getSession(
protocolAddress
);
if (!activeSession) {
throw new Error(
'OutgoingMessage.doSendMessage: No active sesssion!'
);
}
const destinationRegistrationId = activeSession.remoteRegistrationId();
if (sealedSender && senderCertificate) {
const certificate = SenderCertificate.deserialize(
Buffer.from(senderCertificate.serialized)
);
const buffer = await sealedSenderEncryptMessage(
Buffer.from(plaintext),
protocolAddress,
certificate,
sessionStore,
identityKeyStore
);
return {
type:
window.textsecure.protobuf.Envelope.Type.UNIDENTIFIED_SENDER,
destinationDeviceId,
destinationRegistrationId,
content: buffer.toString('base64'),
};
}
const ciphertextMessage = await signalEncrypt(
Buffer.from(plaintext),
protocolAddress,
sessionStore,
identityKeyStore
);
const type = ciphertextMessageTypeToEnvelopeType(
ciphertextMessage.type()
);
return {
type,
destinationDeviceId,
destinationRegistrationId,
content: ciphertextMessage.serialize().toString('base64'),
};
}
); );
const activeSession = await sessionStore.getSession(protocolAddress);
if (!activeSession) {
throw new Error('OutgoingMessage.doSendMessage: No active sesssion!');
}
const destinationRegistrationId = activeSession.remoteRegistrationId();
if (sealedSender && senderCertificate) {
const certificate = SenderCertificate.deserialize(
Buffer.from(senderCertificate.serialized)
);
const buffer = await sealedSenderEncryptMessage(
Buffer.from(plaintext),
protocolAddress,
certificate,
sessionStore,
identityKeyStore
);
return {
type: window.textsecure.protobuf.Envelope.Type.UNIDENTIFIED_SENDER,
destinationDeviceId,
destinationRegistrationId,
content: buffer.toString('base64'),
};
}
const ciphertextMessage = await signalEncrypt(
Buffer.from(plaintext),
protocolAddress,
sessionStore,
identityKeyStore
);
const type = ciphertextMessageTypeToEnvelopeType(
ciphertextMessage.type()
);
return {
type,
destinationDeviceId,
destinationRegistrationId,
content: ciphertextMessage.serialize().toString('base64'),
};
}) })
) )
.then(async jsonData => { .then(async (jsonData: Array<SendMetadata>) => {
if (sealedSender) { if (sealedSender) {
return this.transmitMessage(identifier, jsonData, this.timestamp, { return this.transmitMessage(identifier, jsonData, this.timestamp, {
accessKey, accessKey,