Reorder getSendTarget logic for clarity

This commit is contained in:
Fedor Indutny 2025-05-20 12:40:16 -07:00 committed by GitHub
commit 49161b7e17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 78 additions and 59 deletions

View file

@ -7,23 +7,16 @@ import type {
SendMetadataType,
SendOptionsType,
} from '../textsecure/SendMessage';
import * as Bytes from '../Bytes';
import { getRandomBytes, getZeroes } from '../Crypto';
import { getConversationMembers } from './getConversationMembers';
import { isDirectConversation, isMe } from './whatTypeOfConversation';
import { senderCertificateService } from '../services/senderCertificate';
import { shouldSharePhoneNumberWith } from './phoneNumberSharingMode';
import type { SerializedCertificateType } from '../textsecure/OutgoingMessage';
import { SenderCertificateMode } from '../textsecure/OutgoingMessage';
import { ZERO_ACCESS_KEY, SEALED_SENDER } from '../types/SealedSender';
import { isNotNil } from './isNotNil';
import { maybeCreateGroupSendEndorsementState } from './groupSendEndorsements';
const SEALED_SENDER = {
UNKNOWN: 0,
ENABLED: 1,
DISABLED: 2,
UNRESTRICTED: 3,
};
import { missingCaseError } from './missingCaseError';
export async function getSendOptionsForRecipients(
recipients: ReadonlyArray<string>,
@ -94,61 +87,69 @@ export async function getSendOptions(
};
}
const { accessKey, sealedSender } = conversationAttrs;
const { accessKey } = conversationAttrs;
const { e164, serviceId } = conversationAttrs;
let sealedSender = conversationAttrs.sealedSender as
| SEALED_SENDER
| undefined;
const senderCertificate =
await getSenderCertificateForDirectConversation(conversationAttrs);
let identifierData: SendIdentifierData | null = null;
// If we've never fetched user's profile, we default to what we have
if (sealedSender === SEALED_SENDER.UNKNOWN || story) {
identifierData = {
accessKey:
accessKey ||
(story
? Bytes.toBase64(getZeroes(16))
: Bytes.toBase64(getRandomBytes(16))),
senderCertificate,
groupSendToken: null,
};
if (story) {
// Always send story using zero access key
sealedSender = SEALED_SENDER.UNRESTRICTED;
}
if (sealedSender === SEALED_SENDER.DISABLED) {
if (serviceId != null && groupId != null) {
const { state: groupSendEndorsementState, didRefreshGroupState } =
await maybeCreateGroupSendEndorsementState(
groupId,
alreadyRefreshedGroupState
);
switch (sealedSender) {
case SEALED_SENDER.DISABLED:
// Try to get GSE token
if (serviceId != null && groupId != null) {
const { state: groupSendEndorsementState, didRefreshGroupState } =
await maybeCreateGroupSendEndorsementState(
groupId,
alreadyRefreshedGroupState
);
if (
groupSendEndorsementState != null &&
groupSendEndorsementState.hasMember(serviceId)
) {
const token = groupSendEndorsementState.buildToken(
new Set([serviceId])
);
if (token != null) {
identifierData = {
accessKey: null,
senderCertificate,
groupSendToken: token,
};
if (
groupSendEndorsementState != null &&
groupSendEndorsementState.hasMember(serviceId)
) {
const token = groupSendEndorsementState.buildToken(
new Set([serviceId])
);
if (token != null) {
identifierData = {
accessKey: null,
senderCertificate,
groupSendToken: token,
};
}
} else if (didRefreshGroupState && !alreadyRefreshedGroupState) {
return getSendOptions(conversationAttrs, options, true);
}
} else if (didRefreshGroupState && !alreadyRefreshedGroupState) {
return getSendOptions(conversationAttrs, options, true);
}
}
} else {
identifierData = {
accessKey:
accessKey && sealedSender === SEALED_SENDER.ENABLED
? accessKey
: Bytes.toBase64(getRandomBytes(16)),
senderCertificate,
groupSendToken: null,
};
break;
case SEALED_SENDER.UNRESTRICTED:
identifierData = {
accessKey: ZERO_ACCESS_KEY,
senderCertificate,
groupSendToken: null,
};
break;
case SEALED_SENDER.ENABLED:
case SEALED_SENDER.UNKNOWN:
case undefined:
identifierData = {
accessKey: accessKey || ZERO_ACCESS_KEY,
senderCertificate,
groupSendToken: null,
};
break;
default:
throw missingCaseError(sealedSender);
}
let sendMetadata: SendMetadataType = {};