@open-e2ee/signal-protocol-sdk 9.4.0 → 9.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ADAPTERS.md +1 -0
- package/CHANGELOG.md +176 -0
- package/README.md +1 -1
- package/SECURITY.md +2 -2
- package/dist/client/client.d.ts +61 -62
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +127 -169
- package/dist/client/client.js.map +1 -1
- package/dist/client/content-adapter.d.ts +8 -0
- package/dist/client/content-adapter.d.ts.map +1 -1
- package/dist/client/content-adapter.js +4 -0
- package/dist/client/content-adapter.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +3 -3
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +1 -1
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +20 -5
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/relay-acceptance.d.ts +8 -0
- package/dist/client/relay-acceptance.d.ts.map +1 -1
- package/dist/client/relay-acceptance.js +7 -0
- package/dist/client/relay-acceptance.js.map +1 -1
- package/dist/client/relay-subscription.d.ts +12 -0
- package/dist/client/relay-subscription.d.ts.map +1 -1
- package/dist/client/relay-subscription.js +226 -80
- package/dist/client/relay-subscription.js.map +1 -1
- package/dist/client/retry-family.d.ts +119 -0
- package/dist/client/retry-family.d.ts.map +1 -0
- package/dist/client/retry-family.js +170 -0
- package/dist/client/retry-family.js.map +1 -0
- package/dist/client/retry-request-envelope.d.ts +106 -0
- package/dist/client/retry-request-envelope.d.ts.map +1 -0
- package/dist/client/retry-request-envelope.js +245 -0
- package/dist/client/retry-request-envelope.js.map +1 -0
- package/dist/client/retry.d.ts +63 -22
- package/dist/client/retry.d.ts.map +1 -1
- package/dist/client/retry.js +234 -136
- package/dist/client/retry.js.map +1 -1
- package/dist/client/sealed-sender.d.ts +15 -3
- package/dist/client/sealed-sender.d.ts.map +1 -1
- package/dist/client/sealed-sender.js +22 -3
- package/dist/client/sealed-sender.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts +52 -0
- package/dist/client/signal-service-cipher.d.ts.map +1 -1
- package/dist/client/signal-service-cipher.js +184 -16
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/state.d.ts +7 -60
- package/dist/client/state.d.ts.map +1 -1
- package/dist/client/state.js +8 -86
- package/dist/client/state.js.map +1 -1
- package/dist/client/types.d.ts +10 -2
- package/dist/client/types.d.ts.map +1 -1
- package/dist/internal/protocol/sealed-sender/types.d.ts +1 -1
- package/dist/internal/protocol/sealed-sender/types.js +1 -1
- package/dist/local/store/received-content.d.ts +16 -2
- package/dist/local/store/received-content.d.ts.map +1 -1
- package/dist/local/store/received-content.js +18 -3
- package/dist/local/store/received-content.js.map +1 -1
- package/dist/local/store/reliability.d.ts +258 -2
- package/dist/local/store/reliability.d.ts.map +1 -1
- package/dist/local/store/reliability.js +390 -12
- package/dist/local/store/reliability.js.map +1 -1
- package/dist/remote/relay/types.d.ts +22 -29
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/dist/types/api.d.ts +43 -22
- package/dist/types/api.d.ts.map +1 -1
- package/docs/ASSURANCE.md +5 -5
- package/docs/DEVIATIONS.md +4 -5
- package/docs/INTERFACES.md +2 -0
- package/package.json +1 -1
|
@@ -10,6 +10,7 @@ import type { SealedSenderConfig, SealedSenderDeliveryMode } from './config.js';
|
|
|
10
10
|
import type { Envelope, SealedSenderAuth } from '../remote/relay/types.js';
|
|
11
11
|
import { type Logger } from '../logger.js';
|
|
12
12
|
import type { SignalProtocolLocalStore } from '../types/index.js';
|
|
13
|
+
import { ContentHint } from '../types/messages.js';
|
|
13
14
|
import type { EndorsementManager } from './endorsement-manager.js';
|
|
14
15
|
import { type ContactProfileStateStore } from '../profile/contact-state.js';
|
|
15
16
|
import { SealedSenderContentType } from '../internal/protocol/sealed-sender/types.js';
|
|
@@ -42,7 +43,7 @@ export interface SealedSenderResolutionContext {
|
|
|
42
43
|
export declare function serializeDirectSealedSenderMessage(msg: {
|
|
43
44
|
recipientUserId: string;
|
|
44
45
|
recipientDeviceId: number;
|
|
45
|
-
}, ciphertextBase64: string, messageType: 'prekey_bundle' | 'ciphertext' | 'sender_key', recipientRegistrationId: number | undefined, sealedSender: ResolvedSealedSenderContext): Promise<string>;
|
|
46
|
+
}, ciphertextBase64: string, messageType: 'prekey_bundle' | 'ciphertext' | 'sender_key', recipientRegistrationId: number | undefined, sealedSender: ResolvedSealedSenderContext, contentHint: ContentHint | undefined): Promise<string>;
|
|
46
47
|
export declare function resolveSealedSenderContext(context: SealedSenderResolutionContext, recipientUserId: string, groupId?: string): Promise<ResolvedSealedSenderContext | null>;
|
|
47
48
|
/**
|
|
48
49
|
* Unseal a sealed sender message to reveal the sender and inner ciphertext.
|
|
@@ -57,19 +58,21 @@ export declare function resolveSealedSenderContext(context: SealedSenderResoluti
|
|
|
57
58
|
* @param recipientDeviceId - Recipient's device ID
|
|
58
59
|
* @param config - Sealed sender config with trust roots
|
|
59
60
|
* @param relayEnqueueTime - Immutable time when Relay accepted the message
|
|
60
|
-
* @returns Unsealed envelope info with sender identity and
|
|
61
|
+
* @returns Unsealed envelope info with sender identity, inner ciphertext and content hint
|
|
61
62
|
*/
|
|
62
63
|
export declare function unsealMessage(sealedCiphertextBase64: string, recipientIdentityPrivate: Uint8Array, recipientUuid: string, recipientDeviceId: number, config: SealedSenderConfig, relayEnqueueTime: number | undefined, providedLogger?: Logger): Promise<{
|
|
63
64
|
senderUserId: string;
|
|
64
65
|
senderDeviceId: number;
|
|
65
66
|
innerCiphertextBase64: string;
|
|
66
67
|
contentType: SealedSenderContentType;
|
|
68
|
+
contentHint: ContentHint;
|
|
67
69
|
}>;
|
|
68
70
|
/**
|
|
69
71
|
* Reconstruct an Envelope from an unsealed message.
|
|
70
72
|
*
|
|
71
73
|
* Takes the original sealed sender envelope (with empty sender fields)
|
|
72
|
-
* and fills in the sender identity revealed by unsealing.
|
|
74
|
+
* and fills in the sender identity revealed by unsealing. The content hint
|
|
75
|
+
* also travels inside the seal, so the unsealed envelope carries it.
|
|
73
76
|
*
|
|
74
77
|
* @param originalEnvelope - The incoming envelope with messageType 'unidentified_sender'
|
|
75
78
|
* @param unsealed - The unsealed sender info and inner ciphertext
|
|
@@ -80,7 +83,16 @@ export declare function reconstructEnvelope(originalEnvelope: Envelope, unsealed
|
|
|
80
83
|
senderDeviceId: number;
|
|
81
84
|
innerCiphertextBase64: string;
|
|
82
85
|
contentType: SealedSenderContentType;
|
|
86
|
+
contentHint: ContentHint;
|
|
83
87
|
}): Envelope;
|
|
88
|
+
/**
|
|
89
|
+
* Attach the unsealed envelope to an error that its decryption threw. The
|
|
90
|
+
* error handler then asks the unsealed sender device for a resend, because
|
|
91
|
+
* the sealed envelope names no sender.
|
|
92
|
+
*/
|
|
93
|
+
export declare function attachUnsealedEnvelope(error: unknown, envelope: Envelope): void;
|
|
94
|
+
/** The unsealed envelope that `attachUnsealedEnvelope` attached to an error. */
|
|
95
|
+
export declare function unsealedEnvelopeOf(error: unknown): Envelope | undefined;
|
|
84
96
|
/**
|
|
85
97
|
* Map a sealed envelope's content type onto the envelope type the decrypt
|
|
86
98
|
* path routes on.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sealed-sender.d.ts","sourceRoot":"","sources":["../../client/sealed-sender.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAA+B,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,KAAK,EAAU,wBAAwB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"sealed-sender.d.ts","sourceRoot":"","sources":["../../client/sealed-sender.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* @see https://signal.org/blog/sealed-sender/
|
|
8
8
|
*/
|
|
9
9
|
import { resolveSignalProtocolLogger } from '../logger.js';
|
|
10
|
+
import { ContentHint } from '../types/messages.js';
|
|
10
11
|
import { ProtocolAddress } from '../types/address.js';
|
|
11
12
|
import { x25519 } from '@noble/curves/ed25519.js';
|
|
12
13
|
import { base64ToBytes, bytesToBase64 } from '../internal/crypto/index.js';
|
|
@@ -16,7 +17,7 @@ import { deserializeSenderCertificate, sealMultiRecipient } from '../internal/pr
|
|
|
16
17
|
import { deriveAccessKey } from '../internal/protocol/sealed-sender/delivery-token.js';
|
|
17
18
|
import { unseal } from '../internal/protocol/sealed-sender/decryption.js';
|
|
18
19
|
import { deserializeReceivedMessage, serializeSentMessage, } from '../internal/protocol/sealed-sender/multi-recipient-message.js';
|
|
19
|
-
export async function serializeDirectSealedSenderMessage(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender) {
|
|
20
|
+
export async function serializeDirectSealedSenderMessage(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender, contentHint) {
|
|
20
21
|
const senderCertificate = deserializeSenderCertificate(base64ToBytes(sealedSender.senderCertificateBase64));
|
|
21
22
|
const sealed = await sealMultiRecipient({
|
|
22
23
|
senderCertificate,
|
|
@@ -31,6 +32,7 @@ export async function serializeDirectSealedSenderMessage(msg, ciphertextBase64,
|
|
|
31
32
|
},
|
|
32
33
|
],
|
|
33
34
|
signalProtocolMessage: base64ToBytes(ciphertextBase64),
|
|
35
|
+
contentHint,
|
|
34
36
|
contentType: messageType === 'sender_key'
|
|
35
37
|
? SealedSenderContentType.SENDERKEY_MESSAGE
|
|
36
38
|
: messageType === 'prekey_bundle'
|
|
@@ -164,7 +166,7 @@ export async function resolveSealedSenderContext(context, recipientUserId, group
|
|
|
164
166
|
* @param recipientDeviceId - Recipient's device ID
|
|
165
167
|
* @param config - Sealed sender config with trust roots
|
|
166
168
|
* @param relayEnqueueTime - Immutable time when Relay accepted the message
|
|
167
|
-
* @returns Unsealed envelope info with sender identity and
|
|
169
|
+
* @returns Unsealed envelope info with sender identity, inner ciphertext and content hint
|
|
168
170
|
*/
|
|
169
171
|
export async function unsealMessage(sealedCiphertextBase64, recipientIdentityPrivate, recipientUuid, recipientDeviceId, config, relayEnqueueTime, providedLogger) {
|
|
170
172
|
if (typeof relayEnqueueTime !== 'number' ||
|
|
@@ -237,13 +239,15 @@ async function unsealReceivedMessage(sealedBytes, recipientIdentityPrivate, reci
|
|
|
237
239
|
senderDeviceId: content.senderCertificate.senderDeviceId,
|
|
238
240
|
innerCiphertextBase64: content.signalProtocolMessage,
|
|
239
241
|
contentType: content.contentType,
|
|
242
|
+
contentHint: content.contentHint ?? ContentHint.Default,
|
|
240
243
|
};
|
|
241
244
|
}
|
|
242
245
|
/**
|
|
243
246
|
* Reconstruct an Envelope from an unsealed message.
|
|
244
247
|
*
|
|
245
248
|
* Takes the original sealed sender envelope (with empty sender fields)
|
|
246
|
-
* and fills in the sender identity revealed by unsealing.
|
|
249
|
+
* and fills in the sender identity revealed by unsealing. The content hint
|
|
250
|
+
* also travels inside the seal, so the unsealed envelope carries it.
|
|
247
251
|
*
|
|
248
252
|
* @param originalEnvelope - The incoming envelope with messageType 'unidentified_sender'
|
|
249
253
|
* @param unsealed - The unsealed sender info and inner ciphertext
|
|
@@ -256,8 +260,23 @@ export function reconstructEnvelope(originalEnvelope, unsealed) {
|
|
|
256
260
|
senderDeviceId: unsealed.senderDeviceId,
|
|
257
261
|
ciphertext: unsealed.innerCiphertextBase64,
|
|
258
262
|
messageType: envelopeTypeForContent(unsealed.contentType),
|
|
263
|
+
contentHint: unsealed.contentHint,
|
|
259
264
|
};
|
|
260
265
|
}
|
|
266
|
+
const unsealedEnvelopes = new WeakMap();
|
|
267
|
+
/**
|
|
268
|
+
* Attach the unsealed envelope to an error that its decryption threw. The
|
|
269
|
+
* error handler then asks the unsealed sender device for a resend, because
|
|
270
|
+
* the sealed envelope names no sender.
|
|
271
|
+
*/
|
|
272
|
+
export function attachUnsealedEnvelope(error, envelope) {
|
|
273
|
+
if (typeof error === 'object' && error !== null)
|
|
274
|
+
unsealedEnvelopes.set(error, envelope);
|
|
275
|
+
}
|
|
276
|
+
/** The unsealed envelope that `attachUnsealedEnvelope` attached to an error. */
|
|
277
|
+
export function unsealedEnvelopeOf(error) {
|
|
278
|
+
return typeof error === 'object' && error !== null ? unsealedEnvelopes.get(error) : undefined;
|
|
279
|
+
}
|
|
261
280
|
/**
|
|
262
281
|
* Map a sealed envelope's content type onto the envelope type the decrypt
|
|
263
282
|
* path routes on.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sealed-sender.js","sourceRoot":"","sources":["../../client/sealed-sender.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,2BAA2B,EAAe,MAAM,WAAW,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EAAE,sBAAsB,EAAiC,MAAM,0BAA0B,CAAC;AACjG,OAAO,EACL,uBAAuB,EACvB,mCAAmC,EACnC,6BAA6B,GAC9B,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACtG,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AACvE,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,4DAA4D,CAAC;AAkCpE,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,GAA2D,EAC3D,gBAAwB,EACxB,WAA0D,EAC1D,uBAA2C,EAC3C,YAAyC;
|
|
1
|
+
{"version":3,"file":"sealed-sender.js","sourceRoot":"","sources":["../../client/sealed-sender.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,9 @@ import { SenderKeyManager } from '../internal/protocol/sender-keys/index.js';
|
|
|
22
22
|
import type { EndorsementManager } from './endorsement-manager.js';
|
|
23
23
|
import type { GroupReceiveAuthorizer } from './group-receive-authorization.js';
|
|
24
24
|
import type { PreparedAttachmentUpload, SendOptions, SendResult } from './types.js';
|
|
25
|
+
import { ContentHint } from '../types/messages.js';
|
|
25
26
|
import { type BlockedRecipientsSyncInput, type ConfigurationSyncInput, type MediaAttachmentDeleteSyncInput, type ReadSyncEntryInput, type RecipientUsernameSyncInput, type SignalProtocolContentAdapter, type TaskNotificationAckSyncInput, type UsernameStateSyncInput, type VerificationStateSyncInput, type ViewOnceOpenSyncInput } from './content-adapter.js';
|
|
27
|
+
import { type RetryResendTarget } from '../local/store/reliability.js';
|
|
26
28
|
import { type BoundedFanOut } from '../utils/bounded-fan-out.js';
|
|
27
29
|
import { type SealedSenderProvider as SealedSenderProviderContract } from './sealed-sender.js';
|
|
28
30
|
import { type ContactProfileStateStore } from '../profile/contact-state.js';
|
|
@@ -256,6 +258,56 @@ export declare class SignalProtocolServiceCipher {
|
|
|
256
258
|
* @see https://signal.org/docs/specifications/sesame/
|
|
257
259
|
*/
|
|
258
260
|
encrypt(recipientId: string, content: Uint8Array, options?: SendOptions, sessions?: SendSessionCallbacks | undefined, stopSignal?: AbortSignal): Promise<SendResult>;
|
|
261
|
+
/**
|
|
262
|
+
* Encrypt content for one device of a user and post it to that device only.
|
|
263
|
+
* The send makes no outbox intent and no sent-sync transcript. A retry
|
|
264
|
+
* resend uses it: the retry request is the durable job, and only the device
|
|
265
|
+
* that asked gets the message again. The post uses the sealed-sender
|
|
266
|
+
* context of a direct send to the user.
|
|
267
|
+
*
|
|
268
|
+
* With a retry target, the resend stores its encryption under the device
|
|
269
|
+
* and the failed envelope ID. The resend carries the attempt number of
|
|
270
|
+
* the request that it answers, from the request envelope ID. Its client
|
|
271
|
+
* message ID is `<retryId>:resend` or `<retryId>:null`, with
|
|
272
|
+
* `:<attempt>` from attempt 2. A call for the request envelope and the
|
|
273
|
+
* kind of the stored record posts the stored bytes with their epoch
|
|
274
|
+
* again, and does not encrypt: that is the sender's own retry of a post
|
|
275
|
+
* that did not complete. A call for another request envelope or kind
|
|
276
|
+
* encrypts with a fresh epoch, replaces the record in one write, and
|
|
277
|
+
* posts it. So does a call whose stored bytes the Relay refuses with
|
|
278
|
+
* OPERATION_EXPIRED: the new bytes post under the same ID. A
|
|
279
|
+
* RETRY_CONFLICT answer to a post means that the Relay holds an earlier
|
|
280
|
+
* encryption under this ID, so the answer is complete. When the Relay
|
|
281
|
+
* admits the new bytes after the recipient acknowledged the earlier
|
|
282
|
+
* ones, the recipient drops them as processed. Nothing deletes the
|
|
283
|
+
* record before `RELIABILITY_RECORD_TTL_MS`.
|
|
284
|
+
*
|
|
285
|
+
* @param recipientUserId - The user of the device
|
|
286
|
+
* @param recipientDeviceId - The device that gets the message
|
|
287
|
+
* @param content - The plaintext to encrypt. Null when the plaintext is
|
|
288
|
+
* gone: then only a stored attempt can post
|
|
289
|
+
* @param options - The client timestamp and the content hint of the
|
|
290
|
+
* message, and the retry request that a retry resend answers. Without a
|
|
291
|
+
* retry target, the client message ID is a new UUID and nothing is
|
|
292
|
+
* stored. The timestamp goes in the envelope
|
|
293
|
+
* @param stopSignal - The stop signal of the relay work that sends. When it
|
|
294
|
+
* aborts while the send waits for the recipient's lock, the send throws
|
|
295
|
+
* RelayWorkStopped
|
|
296
|
+
* @returns False only when the content is null and no stored attempt can
|
|
297
|
+
* post: there is none for this request attempt, or the Relay refused it
|
|
298
|
+
* with OPERATION_EXPIRED
|
|
299
|
+
* @throws Error when the request envelope ID is not a retry request of
|
|
300
|
+
* the retry ID. Nothing is posted
|
|
301
|
+
*/
|
|
302
|
+
resendToDevice(recipientUserId: string, recipientDeviceId: number, content: string | null, options: {
|
|
303
|
+
timestamp: number;
|
|
304
|
+
contentHint?: ContentHint;
|
|
305
|
+
retry?: RetryResendTarget;
|
|
306
|
+
}, stopSignal?: AbortSignal): Promise<boolean>;
|
|
307
|
+
/** Post the encrypted bytes of a resend with their operation epoch, under one client message ID. */
|
|
308
|
+
private postResend;
|
|
309
|
+
/** Encrypt one attempt of a resend, with the current time as its operation epoch. */
|
|
310
|
+
private encryptResend;
|
|
259
311
|
/**
|
|
260
312
|
* Encrypt and upload attachment data without sending a standalone message.
|
|
261
313
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signal-service-cipher.d.ts","sourceRoot":"","sources":["../../client/signal-service-cipher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,OAAO,KAAK,EACV,yBAAyB,EACzB,QAAQ,EAGR,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAAE,wBAAwB,EAA2B,MAAM,UAAU,CAAC;AAIlF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGvD,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAwB,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAA+B,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,KAAK,EAAE,wBAAwB,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"signal-service-cipher.d.ts","sourceRoot":"","sources":["../../client/signal-service-cipher.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,15 +24,15 @@ import { isGroupId, extractGroupId } from '../internal/groups/index.js';
|
|
|
24
24
|
import { GroupSenderKeyOperations } from './group-sender-key-operations.js';
|
|
25
25
|
import { createDefaultSignalProtocolContentAdapter, } from './content-adapter.js';
|
|
26
26
|
import * as CryptoUtils from '../internal/crypto/index.js';
|
|
27
|
-
import { completeOutgoingMessageIntent, getOutgoingMessageIntent, reconcileOutgoingDirectDeviceMessages, replaceOutgoingDirectDeviceMessage, storeOutgoingMessageIntent, withOutgoingMessageIntentLock, } from '../local/store/reliability.js';
|
|
27
|
+
import { completeOutgoingMessageIntent, getOutgoingMessageIntent, getRetryResend, reconcileOutgoingDirectDeviceMessages, replaceOutgoingDirectDeviceMessage, retryAttemptClientMessageId, retryNullMessageClientMessageId, retryRequestAttempt, retryResendClientMessageId, storeOutgoingMessageIntent, storeRetryResend, withOutgoingMessageIntentLock, } from '../local/store/reliability.js';
|
|
28
28
|
import { FanOutError, firstItemError } from '../utils/bounded-fan-out.js';
|
|
29
29
|
import { withRetry } from '../utils/retry.js';
|
|
30
30
|
import { acquireUntilStopped, createRelayFanOut, RelayWorkStopped, relaySendsSealedUnderItsBound, rethrowRelayWorkStopped, } from './relay-work.js';
|
|
31
31
|
import { refusesRemovedDevices, relayDeviceRefusal } from './relay-device-refusal.js';
|
|
32
|
-
import { aggregateRelayAcceptance } from './relay-acceptance.js';
|
|
32
|
+
import { aggregateRelayAcceptance, relayOperationRefusal, } from './relay-acceptance.js';
|
|
33
33
|
import { prepareGroupSharedMessage } from './group-sealed-sender.js';
|
|
34
34
|
import { sendGroupWithExactOutbox } from './group-outbox.js';
|
|
35
|
-
import { reconstructEnvelope, resolveSealedSenderContext as resolveSealedSenderSendContext, serializeDirectSealedSenderMessage as serializeDirectSealedSenderTransport, unsealMessage, } from './sealed-sender.js';
|
|
35
|
+
import { attachUnsealedEnvelope, reconstructEnvelope, resolveSealedSenderContext as resolveSealedSenderSendContext, serializeDirectSealedSenderMessage as serializeDirectSealedSenderTransport, unsealMessage, } from './sealed-sender.js';
|
|
36
36
|
import { prepareMediaAttachmentUpload, serializeMediaAttachmentMessage } from '../media/index.js';
|
|
37
37
|
import { UnidentifiedAccessMode, } from '../profile/contact-state.js';
|
|
38
38
|
/**
|
|
@@ -148,6 +148,13 @@ function isRefusalOfDevice(error, message) {
|
|
|
148
148
|
const refusal = relayDeviceRefusal(error);
|
|
149
149
|
return (refusal?.userId === message.recipientUserId && refusal.deviceId === message.recipientDeviceId);
|
|
150
150
|
}
|
|
151
|
+
/** The client message ID of one attempt of a stored resend or null message. */
|
|
152
|
+
function retryResendAttemptId(resend) {
|
|
153
|
+
const id = resend.kind === 'resend'
|
|
154
|
+
? retryResendClientMessageId(resend.retryId)
|
|
155
|
+
: retryNullMessageClientMessageId(resend.retryId);
|
|
156
|
+
return retryAttemptClientMessageId(id, resend.attempt);
|
|
157
|
+
}
|
|
151
158
|
/**
|
|
152
159
|
* SignalProtocolServiceCipher - Routes encryption and decryption to appropriate ciphers
|
|
153
160
|
*
|
|
@@ -477,7 +484,14 @@ export class SignalProtocolServiceCipher {
|
|
|
477
484
|
// Reconstruct envelope with revealed sender identity
|
|
478
485
|
const innerEnvelope = reconstructEnvelope(envelope, unsealed);
|
|
479
486
|
// Recursively decrypt the inner message (now a standard ciphertext)
|
|
480
|
-
|
|
487
|
+
let decrypted;
|
|
488
|
+
try {
|
|
489
|
+
decrypted = await this.decrypt(innerEnvelope, undefined, receiveId, stopSignal);
|
|
490
|
+
}
|
|
491
|
+
catch (error) {
|
|
492
|
+
attachUnsealedEnvelope(error, innerEnvelope);
|
|
493
|
+
throw error;
|
|
494
|
+
}
|
|
481
495
|
return { ...decrypted, arrivedSealed: true };
|
|
482
496
|
}
|
|
483
497
|
// Validate message type before processing
|
|
@@ -622,6 +636,150 @@ export class SignalProtocolServiceCipher {
|
|
|
622
636
|
throw attachClientMessageId(error, clientMessageId);
|
|
623
637
|
}
|
|
624
638
|
}
|
|
639
|
+
/**
|
|
640
|
+
* Encrypt content for one device of a user and post it to that device only.
|
|
641
|
+
* The send makes no outbox intent and no sent-sync transcript. A retry
|
|
642
|
+
* resend uses it: the retry request is the durable job, and only the device
|
|
643
|
+
* that asked gets the message again. The post uses the sealed-sender
|
|
644
|
+
* context of a direct send to the user.
|
|
645
|
+
*
|
|
646
|
+
* With a retry target, the resend stores its encryption under the device
|
|
647
|
+
* and the failed envelope ID. The resend carries the attempt number of
|
|
648
|
+
* the request that it answers, from the request envelope ID. Its client
|
|
649
|
+
* message ID is `<retryId>:resend` or `<retryId>:null`, with
|
|
650
|
+
* `:<attempt>` from attempt 2. A call for the request envelope and the
|
|
651
|
+
* kind of the stored record posts the stored bytes with their epoch
|
|
652
|
+
* again, and does not encrypt: that is the sender's own retry of a post
|
|
653
|
+
* that did not complete. A call for another request envelope or kind
|
|
654
|
+
* encrypts with a fresh epoch, replaces the record in one write, and
|
|
655
|
+
* posts it. So does a call whose stored bytes the Relay refuses with
|
|
656
|
+
* OPERATION_EXPIRED: the new bytes post under the same ID. A
|
|
657
|
+
* RETRY_CONFLICT answer to a post means that the Relay holds an earlier
|
|
658
|
+
* encryption under this ID, so the answer is complete. When the Relay
|
|
659
|
+
* admits the new bytes after the recipient acknowledged the earlier
|
|
660
|
+
* ones, the recipient drops them as processed. Nothing deletes the
|
|
661
|
+
* record before `RELIABILITY_RECORD_TTL_MS`.
|
|
662
|
+
*
|
|
663
|
+
* @param recipientUserId - The user of the device
|
|
664
|
+
* @param recipientDeviceId - The device that gets the message
|
|
665
|
+
* @param content - The plaintext to encrypt. Null when the plaintext is
|
|
666
|
+
* gone: then only a stored attempt can post
|
|
667
|
+
* @param options - The client timestamp and the content hint of the
|
|
668
|
+
* message, and the retry request that a retry resend answers. Without a
|
|
669
|
+
* retry target, the client message ID is a new UUID and nothing is
|
|
670
|
+
* stored. The timestamp goes in the envelope
|
|
671
|
+
* @param stopSignal - The stop signal of the relay work that sends. When it
|
|
672
|
+
* aborts while the send waits for the recipient's lock, the send throws
|
|
673
|
+
* RelayWorkStopped
|
|
674
|
+
* @returns False only when the content is null and no stored attempt can
|
|
675
|
+
* post: there is none for this request attempt, or the Relay refused it
|
|
676
|
+
* with OPERATION_EXPIRED
|
|
677
|
+
* @throws Error when the request envelope ID is not a retry request of
|
|
678
|
+
* the retry ID. Nothing is posted
|
|
679
|
+
*/
|
|
680
|
+
async resendToDevice(recipientUserId, recipientDeviceId, content, options, stopSignal) {
|
|
681
|
+
if (!this.relay)
|
|
682
|
+
throw new Error('Relay not configured - cannot resend');
|
|
683
|
+
const { retry } = options;
|
|
684
|
+
if (content === null && retry === undefined) {
|
|
685
|
+
throw new Error('A resend without content needs a stored attempt');
|
|
686
|
+
}
|
|
687
|
+
// The answer carries the attempt number of its request.
|
|
688
|
+
const target = retry && { ...retry, attempt: retryRequestAttempt(retry) };
|
|
689
|
+
const post = async (resend) => {
|
|
690
|
+
try {
|
|
691
|
+
await this.postResend(resend, retryResendAttemptId(resend), stopSignal);
|
|
692
|
+
}
|
|
693
|
+
catch (error) {
|
|
694
|
+
if (relayOperationRefusal(error) !== 'RETRY_CONFLICT')
|
|
695
|
+
throw error;
|
|
696
|
+
// Only this sender posts this ID. A new encryption for the same
|
|
697
|
+
// request attempt and kind posts the same ID, so a conflict means
|
|
698
|
+
// that the Relay holds the earlier encryption.
|
|
699
|
+
this.logger.info('The Relay holds an earlier encryption of a retry resend attempt', {
|
|
700
|
+
category: 'E2EE',
|
|
701
|
+
data: { retryId: resend.retryId, kind: resend.kind, attempt: resend.attempt },
|
|
702
|
+
});
|
|
703
|
+
}
|
|
704
|
+
};
|
|
705
|
+
return await acquireUntilStopped(this.lock, `encrypt:${recipientUserId}`, async () => {
|
|
706
|
+
if (target === undefined) {
|
|
707
|
+
const resend = await this.encryptResend(recipientUserId, recipientDeviceId, content, options);
|
|
708
|
+
await this.postResend(resend, await CryptoUtils.generateUuidV4(), stopSignal);
|
|
709
|
+
return true;
|
|
710
|
+
}
|
|
711
|
+
const stored = await getRetryResend(this.storage, recipientUserId, recipientDeviceId, target.failedEnvelopeId);
|
|
712
|
+
if (stored?.requestEnvelopeId === target.requestEnvelopeId && stored.kind === target.kind) {
|
|
713
|
+
try {
|
|
714
|
+
await post(stored);
|
|
715
|
+
return true;
|
|
716
|
+
}
|
|
717
|
+
catch (error) {
|
|
718
|
+
if (relayOperationRefusal(error) !== 'OPERATION_EXPIRED')
|
|
719
|
+
throw error;
|
|
720
|
+
}
|
|
721
|
+
// The Relay no longer admits or replays the stored operation.
|
|
722
|
+
if (content === null) {
|
|
723
|
+
this.logger.info('A stored retry resend expired, and its plaintext is gone', {
|
|
724
|
+
category: 'E2EE',
|
|
725
|
+
data: { retryId: stored.retryId, attempt: stored.attempt },
|
|
726
|
+
});
|
|
727
|
+
return false;
|
|
728
|
+
}
|
|
729
|
+
}
|
|
730
|
+
if (content === null)
|
|
731
|
+
return false;
|
|
732
|
+
// A new encryption replaces the record before its post.
|
|
733
|
+
const resend = {
|
|
734
|
+
...target,
|
|
735
|
+
...(await this.encryptResend(recipientUserId, recipientDeviceId, content, options)),
|
|
736
|
+
};
|
|
737
|
+
await storeRetryResend(this.storage, resend);
|
|
738
|
+
await post(resend);
|
|
739
|
+
return true;
|
|
740
|
+
}, stopSignal);
|
|
741
|
+
}
|
|
742
|
+
/** Post the encrypted bytes of a resend with their operation epoch, under one client message ID. */
|
|
743
|
+
async postResend(resend, clientMessageId, stopSignal) {
|
|
744
|
+
const { message } = resend;
|
|
745
|
+
if (resend.transportMode !== 'identified' &&
|
|
746
|
+
(!message.sealedSenderMessage || !resend.sealedSenderAuth)) {
|
|
747
|
+
throw new Error('Corrupt retry-resend record');
|
|
748
|
+
}
|
|
749
|
+
await this.sendToDevice(message, message.ciphertext, message.messageType, message.recipientRegistrationId, null, resend.contentHint, clientMessageId, resend.transportMode === 'identified'
|
|
750
|
+
? undefined
|
|
751
|
+
: {
|
|
752
|
+
sentMessageBase64: message.sealedSenderMessage,
|
|
753
|
+
auth: resend.sealedSenderAuth,
|
|
754
|
+
deliveryMode: resend.transportMode === 'sealed_sender_required' ? 'required' : 'preferred',
|
|
755
|
+
}, {
|
|
756
|
+
...(stopSignal && { stopSignal }),
|
|
757
|
+
operationEpochMilliseconds: resend.operationEpochMilliseconds,
|
|
758
|
+
});
|
|
759
|
+
}
|
|
760
|
+
/** Encrypt one attempt of a resend, with the current time as its operation epoch. */
|
|
761
|
+
async encryptResend(recipientUserId, recipientDeviceId, content, options) {
|
|
762
|
+
const operationEpochMilliseconds = Date.now();
|
|
763
|
+
const sealedSender = await this.resolveSealedSenderContext(recipientUserId);
|
|
764
|
+
const directSealedSender = sealedSender && this.relay?.sendMultiRecipientUnidentified ? sealedSender : null;
|
|
765
|
+
if (directSealedSender && directSealedSender.auth.type !== 'accessKey') {
|
|
766
|
+
throw new Error('Direct sealed-sender delivery requires access-key authorization');
|
|
767
|
+
}
|
|
768
|
+
const message = await this.sesameManager.sendMessage(recipientUserId, recipientDeviceId, new TextEncoder().encode(content), { clientTimestamp: options.timestamp, includeSyncMessages: false });
|
|
769
|
+
return {
|
|
770
|
+
operationEpochMilliseconds,
|
|
771
|
+
transportMode: directSealedSender
|
|
772
|
+
? directSealedSender.config.deliveryMode === 'required'
|
|
773
|
+
? 'sealed_sender_required'
|
|
774
|
+
: 'sealed_sender_preferred'
|
|
775
|
+
: 'identified',
|
|
776
|
+
...(directSealedSender?.auth.type === 'accessKey' && {
|
|
777
|
+
sealedSenderAuth: { ...directSealedSender.auth },
|
|
778
|
+
}),
|
|
779
|
+
...(options.contentHint !== undefined && { contentHint: options.contentHint }),
|
|
780
|
+
message: await this.prepareStoredDirectDeviceMessage(message, directSealedSender, options.contentHint),
|
|
781
|
+
};
|
|
782
|
+
}
|
|
625
783
|
/**
|
|
626
784
|
* Encrypt and upload attachment data without sending a standalone message.
|
|
627
785
|
*/
|
|
@@ -949,7 +1107,7 @@ export class SignalProtocolServiceCipher {
|
|
|
949
1107
|
});
|
|
950
1108
|
// Local work: a stop does not end it, so the intent keeps the ciphertext.
|
|
951
1109
|
const deviceMessages = await this.fanOut
|
|
952
|
-
.all(batch.deviceMessages, (message) => this.prepareStoredDirectDeviceMessage(message, directSealedSender))
|
|
1110
|
+
.all(batch.deviceMessages, (message) => this.prepareStoredDirectDeviceMessage(message, directSealedSender, options.contentHint))
|
|
953
1111
|
.catch((error) => {
|
|
954
1112
|
throw firstItemError(error);
|
|
955
1113
|
});
|
|
@@ -1079,7 +1237,7 @@ export class SignalProtocolServiceCipher {
|
|
|
1079
1237
|
if (sealedSender === undefined) {
|
|
1080
1238
|
sealedSender = await this.resolveStoredDirectSealedSender(intent);
|
|
1081
1239
|
}
|
|
1082
|
-
added.push(await this.prepareStoredDirectDeviceMessage(message, sealedSender));
|
|
1240
|
+
added.push(await this.prepareStoredDirectDeviceMessage(message, sealedSender, intent.contentHint));
|
|
1083
1241
|
}
|
|
1084
1242
|
if (removed.length === 0 && added.length === 0)
|
|
1085
1243
|
return intent;
|
|
@@ -1095,7 +1253,7 @@ export class SignalProtocolServiceCipher {
|
|
|
1095
1253
|
}
|
|
1096
1254
|
return sealedSender;
|
|
1097
1255
|
}
|
|
1098
|
-
async prepareStoredDirectDeviceMessage(message, sealedSender) {
|
|
1256
|
+
async prepareStoredDirectDeviceMessage(message, sealedSender, contentHint) {
|
|
1099
1257
|
const messageType = getEnvelopeMessageType(message.ciphertext);
|
|
1100
1258
|
const session = messageType === 'prekey_bundle'
|
|
1101
1259
|
? await this.sesameManager.getSession(message.recipientUserId, message.recipientDeviceId)
|
|
@@ -1113,7 +1271,7 @@ export class SignalProtocolServiceCipher {
|
|
|
1113
1271
|
}),
|
|
1114
1272
|
};
|
|
1115
1273
|
if (sealedSender) {
|
|
1116
|
-
storedMessage.sealedSenderMessage = await this.serializeDirectSealedSenderMessage(storedMessage, storedMessage.ciphertext, storedMessage.messageType, storedMessage.recipientRegistrationId, sealedSender);
|
|
1274
|
+
storedMessage.sealedSenderMessage = await this.serializeDirectSealedSenderMessage(storedMessage, storedMessage.ciphertext, storedMessage.messageType, storedMessage.recipientRegistrationId, sealedSender, contentHint);
|
|
1117
1275
|
}
|
|
1118
1276
|
return storedMessage;
|
|
1119
1277
|
}
|
|
@@ -1135,7 +1293,7 @@ export class SignalProtocolServiceCipher {
|
|
|
1135
1293
|
throw new EncryptionError('Failed to refresh a rejected recipient device', EncryptionErrorCode.SESSION_ESTABLISHMENT_FAILED, { recipientUserId: rejected.recipientUserId });
|
|
1136
1294
|
}
|
|
1137
1295
|
const freshMessage = await this.sesameManager.sendMessage(rejected.recipientUserId, rejected.recipientDeviceId, plaintextBytes, { clientTimestamp: intent.clientTimestamp, includeSyncMessages: false });
|
|
1138
|
-
const replacement = await this.prepareStoredDirectDeviceMessage(freshMessage, await this.resolveStoredDirectSealedSender(intent));
|
|
1296
|
+
const replacement = await this.prepareStoredDirectDeviceMessage(freshMessage, await this.resolveStoredDirectSealedSender(intent), intent.contentHint);
|
|
1139
1297
|
await replaceOutgoingDirectDeviceMessage(this.storage, intent.clientMessageId, rejected, replacement);
|
|
1140
1298
|
return replacement;
|
|
1141
1299
|
}
|
|
@@ -1311,7 +1469,7 @@ export class SignalProtocolServiceCipher {
|
|
|
1311
1469
|
const sealedSender = await this.resolveSealedSenderContext(member.userId, groupId);
|
|
1312
1470
|
if (!sealedSender || !this.relay?.sendMultiRecipientUnidentified)
|
|
1313
1471
|
return stored;
|
|
1314
|
-
stored.sealedSenderMessage = await this.serializeDirectSealedSenderMessage(stored, ciphertext, 'sender_key', undefined, sealedSender);
|
|
1472
|
+
stored.sealedSenderMessage = await this.serializeDirectSealedSenderMessage(stored, ciphertext, 'sender_key', undefined, sealedSender, undefined);
|
|
1315
1473
|
stored.sealedSenderDeliveryMode =
|
|
1316
1474
|
sealedSender.config.deliveryMode === 'required' ? 'required' : 'preferred';
|
|
1317
1475
|
if (sealedSender.auth.type === 'accessKey') {
|
|
@@ -1352,8 +1510,8 @@ export class SignalProtocolServiceCipher {
|
|
|
1352
1510
|
}
|
|
1353
1511
|
: null;
|
|
1354
1512
|
}
|
|
1355
|
-
async serializeDirectSealedSenderMessage(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender) {
|
|
1356
|
-
return serializeDirectSealedSenderTransport(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender);
|
|
1513
|
+
async serializeDirectSealedSenderMessage(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender, contentHint) {
|
|
1514
|
+
return serializeDirectSealedSenderTransport(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender, contentHint);
|
|
1357
1515
|
}
|
|
1358
1516
|
/**
|
|
1359
1517
|
* Resolve sealed sender context for a recipient.
|
|
@@ -1435,16 +1593,23 @@ export class SignalProtocolServiceCipher {
|
|
|
1435
1593
|
const prepared = preparedSealedSender ??
|
|
1436
1594
|
(sealedSender
|
|
1437
1595
|
? {
|
|
1438
|
-
sentMessageBase64: await this.serializeDirectSealedSenderMessage(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender),
|
|
1596
|
+
sentMessageBase64: await this.serializeDirectSealedSenderMessage(msg, ciphertextBase64, messageType, recipientRegistrationId, sealedSender, contentHint),
|
|
1439
1597
|
auth: sealedSender.auth,
|
|
1440
1598
|
deliveryMode: sealedSender.config.deliveryMode === 'required' ? 'required' : 'preferred',
|
|
1441
1599
|
}
|
|
1442
1600
|
: undefined);
|
|
1443
1601
|
if (!prepared)
|
|
1444
1602
|
throw new Error('Missing sealed-sender delivery state');
|
|
1445
|
-
identifiedControl = {
|
|
1603
|
+
identifiedControl = {
|
|
1604
|
+
...(control.stopSignal && { stopSignal: control.stopSignal }),
|
|
1605
|
+
...(control.operationEpochMilliseconds !== undefined && {
|
|
1606
|
+
operationEpochMilliseconds: control.operationEpochMilliseconds,
|
|
1607
|
+
}),
|
|
1608
|
+
};
|
|
1446
1609
|
try {
|
|
1447
|
-
const result = await this.postToRelay(() => this.relay.sendMultiRecipientUnidentified(prepared.sentMessageBase64, prepared.auth, msg.timestamp, 'user-visible', [msg.recipientUserId], effectiveClientMessageId
|
|
1610
|
+
const result = await this.postToRelay(() => this.relay.sendMultiRecipientUnidentified(prepared.sentMessageBase64, prepared.auth, msg.timestamp, 'user-visible', [msg.recipientUserId], effectiveClientMessageId, ...(control.operationEpochMilliseconds === undefined
|
|
1611
|
+
? []
|
|
1612
|
+
: [control.operationEpochMilliseconds])), true, control);
|
|
1448
1613
|
if (result.uuids404.length > 0) {
|
|
1449
1614
|
throw new SealedSenderRecipientRejectedError();
|
|
1450
1615
|
}
|
|
@@ -1523,6 +1688,9 @@ export class SignalProtocolServiceCipher {
|
|
|
1523
1688
|
messageType,
|
|
1524
1689
|
deliveryClass: 'user-visible',
|
|
1525
1690
|
timestamp: msg.timestamp,
|
|
1691
|
+
...(identifiedControl.operationEpochMilliseconds !== undefined && {
|
|
1692
|
+
operationEpochMilliseconds: identifiedControl.operationEpochMilliseconds,
|
|
1693
|
+
}),
|
|
1526
1694
|
clientMessageId: effectiveClientMessageId,
|
|
1527
1695
|
recipientRegistrationId,
|
|
1528
1696
|
contentHint,
|
|
@@ -1604,7 +1772,7 @@ export class SignalProtocolServiceCipher {
|
|
|
1604
1772
|
});
|
|
1605
1773
|
const stored = [];
|
|
1606
1774
|
for (const message of batch.deviceMessages) {
|
|
1607
|
-
stored.push(await this.prepareStoredDirectDeviceMessage(message, null));
|
|
1775
|
+
stored.push(await this.prepareStoredDirectDeviceMessage(message, null, undefined));
|
|
1608
1776
|
}
|
|
1609
1777
|
return stored;
|
|
1610
1778
|
}, stopSignal)
|