@open-e2ee/signal-protocol-sdk 4.0.0 → 5.0.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/CHANGELOG.md +74 -0
- package/README.md +2 -2
- package/SECURITY.md +2 -2
- package/client/README.md +3 -3
- package/dist/client/client.d.ts +9 -20
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +9 -22
- package/dist/client/client.js.map +1 -1
- package/dist/client/config.d.ts +25 -25
- package/dist/client/headless.d.ts +9 -20
- package/dist/client/headless.d.ts.map +1 -1
- package/dist/client/headless.js +22 -67
- package/dist/client/headless.js.map +1 -1
- package/dist/client/hosted-anonymous-delivery.d.ts.map +1 -1
- package/dist/client/hosted-anonymous-delivery.js +15 -2
- package/dist/client/hosted-anonymous-delivery.js.map +1 -1
- package/dist/client/hosted-mailbox-subscription.d.ts.map +1 -1
- package/dist/client/hosted-mailbox-subscription.js +32 -0
- package/dist/client/hosted-mailbox-subscription.js.map +1 -1
- package/dist/client/hosted-transport.d.ts +14 -7
- package/dist/client/hosted-transport.d.ts.map +1 -1
- package/dist/client/hosted-transport.js +81 -60
- package/dist/client/hosted-transport.js.map +1 -1
- package/dist/client/key-rotation-core.d.ts +46 -69
- package/dist/client/key-rotation-core.d.ts.map +1 -1
- package/dist/client/key-rotation-core.js +161 -256
- package/dist/client/key-rotation-core.js.map +1 -1
- package/dist/client/key-rotation.d.ts +14 -29
- package/dist/client/key-rotation.d.ts.map +1 -1
- package/dist/client/key-rotation.js +37 -61
- package/dist/client/key-rotation.js.map +1 -1
- package/dist/client/one-time-prekey-refill.d.ts +52 -0
- package/dist/client/one-time-prekey-refill.d.ts.map +1 -0
- package/dist/client/one-time-prekey-refill.js +79 -0
- package/dist/client/one-time-prekey-refill.js.map +1 -0
- package/dist/client/prekeys.d.ts.map +1 -1
- package/dist/client/prekeys.js +38 -73
- package/dist/client/prekeys.js.map +1 -1
- package/dist/client/signal-service-cipher.d.ts +1 -1
- package/dist/client/signal-service-cipher.js +2 -2
- package/dist/client/signal-service-cipher.js.map +1 -1
- package/dist/client/types.d.ts +1 -1
- package/dist/device/lifecycle/manager.d.ts.map +1 -1
- package/dist/device/lifecycle/manager.js +0 -3
- package/dist/device/lifecycle/manager.js.map +1 -1
- package/dist/device/lifecycle/types.d.ts +1 -9
- package/dist/device/lifecycle/types.d.ts.map +1 -1
- package/dist/device/lifecycle/utils.d.ts +2 -4
- package/dist/device/lifecycle/utils.d.ts.map +1 -1
- package/dist/device/lifecycle/utils.js +2 -4
- package/dist/device/lifecycle/utils.js.map +1 -1
- package/dist/hooks/index.d.ts +1 -2
- package/dist/hooks/index.d.ts.map +1 -1
- package/dist/hooks/index.js +0 -1
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/use-key-rotation.d.ts +2 -5
- package/dist/hooks/use-key-rotation.d.ts.map +1 -1
- package/dist/hooks/use-key-rotation.js +8 -5
- package/dist/hooks/use-key-rotation.js.map +1 -1
- package/dist/hooks/use-single-flight.d.ts +4 -4
- package/dist/hooks/use-single-flight.js +4 -4
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/internal/manager/manager.d.ts +4 -4
- package/dist/internal/manager/manager.js +4 -4
- package/dist/local/store/expo/models/ec-one-time-prekey.d.ts.map +1 -1
- package/dist/local/store/expo/models/ec-one-time-prekey.js +4 -6
- package/dist/local/store/expo/models/ec-one-time-prekey.js.map +1 -1
- package/dist/local/store/expo/models/kyber-one-time-prekey.d.ts.map +1 -1
- package/dist/local/store/expo/models/kyber-one-time-prekey.js +4 -8
- package/dist/local/store/expo/models/kyber-one-time-prekey.js.map +1 -1
- package/dist/remote/relay/memory/adapter.d.ts +2 -14
- package/dist/remote/relay/memory/adapter.d.ts.map +1 -1
- package/dist/remote/relay/memory/adapter.js +5 -58
- package/dist/remote/relay/memory/adapter.js.map +1 -1
- package/dist/remote/relay/types.d.ts +20 -64
- package/dist/remote/relay/types.d.ts.map +1 -1
- package/dist/safety/index.d.ts +2 -2
- package/dist/safety/index.js +2 -2
- package/dist/types/api.d.ts +25 -13
- package/dist/types/api.d.ts.map +1 -1
- package/docs/ASSURANCE.md +4 -4
- package/docs/ERROR_HANDLING.md +2 -2
- package/docs/PACKAGE_SURFACE.md +1 -2
- package/examples/browser/index.html +1 -1
- package/hooks/README.md +4 -14
- package/package.json +1 -5
- package/dist/hooks/use-connection-presence.d.ts +0 -66
- package/dist/hooks/use-connection-presence.d.ts.map +0 -1
- package/dist/hooks/use-connection-presence.js +0 -298
- package/dist/hooks/use-connection-presence.js.map +0 -1
|
@@ -2,40 +2,53 @@
|
|
|
2
2
|
* Key rotation operations for SignalProtocolClient
|
|
3
3
|
*
|
|
4
4
|
* Extracted from DefaultSignalProtocolClient class to reduce file size.
|
|
5
|
-
*
|
|
5
|
+
* One entry point rotates the EC signed prekey, the Kyber (post-quantum)
|
|
6
|
+
* last-resort prekey, and the one-time prekey batches.
|
|
6
7
|
*
|
|
7
|
-
* With relay configured: Delegates to key-rotation-core.ts
|
|
8
|
-
*
|
|
8
|
+
* With relay configured: Delegates to key-rotation-core.ts, which reads the
|
|
9
|
+
* inventory once and publishes every due key in one publication.
|
|
9
10
|
*
|
|
10
|
-
* Without relay (local-only): Always rotates
|
|
11
|
-
* check server metadata.
|
|
11
|
+
* Without relay (local-only): Always rotates both signed keys unconditionally
|
|
12
|
+
* since we cannot check server metadata. No one-time refill runs.
|
|
12
13
|
*/
|
|
13
14
|
import { EncryptionError, EncryptionErrorCode } from '../types/index.js';
|
|
14
15
|
import { callHook } from './event-hooks.js';
|
|
15
16
|
import { KEY_REFRESH_INTERVAL_MS_DEFAULT, MAX_UNACKNOWLEDGED_SESSION_AGE_MS, getActiveIdentityTypes, } from './config.js';
|
|
16
|
-
import { nextKyberLastResortPreKeyId,
|
|
17
|
-
export async function
|
|
17
|
+
import { nextKyberLastResortPreKeyId, rotatePreKeysCore } from './key-rotation-core.js';
|
|
18
|
+
export async function rotatePreKeys(ctx) {
|
|
18
19
|
// Use config value if provided, otherwise use profile default (2 days)
|
|
19
20
|
const refreshIntervalMs = ctx.config.keyRefreshIntervalMs ?? KEY_REFRESH_INTERVAL_MS_DEFAULT;
|
|
20
|
-
// With relay: delegate to core
|
|
21
|
+
// With relay: delegate to the core for the inventory-based rotation decision
|
|
21
22
|
if (ctx.relay) {
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
ctx.
|
|
23
|
+
const result = await rotatePreKeysCore(ctx.relay, ctx.userId, ctx.deviceId, ctx.storage, {
|
|
24
|
+
refreshIntervalMs,
|
|
25
|
+
identityTypes: getActiveIdentityTypes(ctx.config),
|
|
26
|
+
preKeyMaintenance: ctx.config.preKeyMaintenance,
|
|
27
|
+
logger: ctx.logger,
|
|
28
|
+
});
|
|
29
|
+
if (result.signedRotated) {
|
|
30
|
+
await callHook(ctx.hooks, 'onKeyRotated', 'ecSignedPreKey');
|
|
31
|
+
}
|
|
32
|
+
if (result.kyberRotated) {
|
|
33
|
+
await callHook(ctx.hooks, 'onKeyRotated', 'kemLastResortPreKey');
|
|
34
|
+
}
|
|
35
|
+
if (result.signedRotated || result.kyberRotated || result.oneTimeReplenished) {
|
|
36
|
+
ctx.logger.debug('Prekeys rotated', {
|
|
25
37
|
category: 'E2EE',
|
|
26
|
-
data: { userId: ctx.userId, refreshIntervalMs },
|
|
38
|
+
data: { userId: ctx.userId, refreshIntervalMs, ...result, errors: result.errors.length },
|
|
27
39
|
});
|
|
28
|
-
await callHook(ctx.hooks, 'onKeyRotated', 'ecSignedPreKey');
|
|
29
40
|
await cullReplacedPreKeysQuietly(ctx);
|
|
30
41
|
}
|
|
31
|
-
return
|
|
42
|
+
return result;
|
|
32
43
|
}
|
|
33
|
-
// Without relay: unconditional local-only rotation
|
|
34
|
-
const
|
|
35
|
-
|
|
44
|
+
// Without relay: unconditional local-only rotation of both signed keys
|
|
45
|
+
const errors = [];
|
|
46
|
+
const signedRotated = await rotateEcSignedPreKeyLocalOnly(ctx, errors);
|
|
47
|
+
const kyberRotated = await rotateKyberPreKeyLocalOnly(ctx, errors);
|
|
48
|
+
if (signedRotated || kyberRotated) {
|
|
36
49
|
await cullReplacedPreKeysQuietly(ctx);
|
|
37
50
|
}
|
|
38
|
-
return
|
|
51
|
+
return { signedRotated, kyberRotated, oneTimeReplenished: false, errors };
|
|
39
52
|
}
|
|
40
53
|
/**
|
|
41
54
|
* Local-only EC signed prekey rotation (no relay)
|
|
@@ -43,7 +56,7 @@ export async function rotateEcSignedPreKey(ctx) {
|
|
|
43
56
|
* Always rotates unconditionally since we cannot check server metadata.
|
|
44
57
|
* Used for local development without a backend.
|
|
45
58
|
*/
|
|
46
|
-
async function rotateEcSignedPreKeyLocalOnly(ctx, identityType = 'aci') {
|
|
59
|
+
async function rotateEcSignedPreKeyLocalOnly(ctx, errors, identityType = 'aci') {
|
|
47
60
|
const { withRetry } = await import('../utils/retry.js');
|
|
48
61
|
const { generateEcSignedPreKey } = await import('../keys/index.js');
|
|
49
62
|
try {
|
|
@@ -68,56 +81,18 @@ async function rotateEcSignedPreKeyLocalOnly(ctx, identityType = 'aci') {
|
|
|
68
81
|
error: error,
|
|
69
82
|
data: { userId: ctx.userId },
|
|
70
83
|
});
|
|
84
|
+
errors.push(`ecSignedPreKey: ${error.message}`);
|
|
71
85
|
return false;
|
|
72
86
|
}
|
|
73
87
|
}
|
|
74
|
-
/**
|
|
75
|
-
* Rotate the post-quantum KEM last-resort prekey.
|
|
76
|
-
*
|
|
77
|
-
* Call this periodically (default: every 2 days) alongside signed prekey rotation.
|
|
78
|
-
* Generates fresh ML-KEM/Kyber-compatible key material and uploads it to the
|
|
79
|
-
* relay if configured.
|
|
80
|
-
*
|
|
81
|
-
* Each rotation takes the next key id, so a session that names an id resolves
|
|
82
|
-
* to exactly one retained key.
|
|
83
|
-
* Uses the same timing as signed prekey rotation for synchronized PQ security.
|
|
84
|
-
*
|
|
85
|
-
* With relay: Checks key age and config.keyRefreshIntervalMs to decide on rotation.
|
|
86
|
-
* Without relay: Always rotates (local-only development mode).
|
|
87
|
-
*
|
|
88
|
-
* @param ctx - Client context with dependencies
|
|
89
|
-
* @returns True if the function rotated the key, false if the key is still fresh
|
|
90
|
-
*/
|
|
91
|
-
export async function rotateKyberPreKey(ctx) {
|
|
92
|
-
// Use config value if provided, otherwise use profile default (2 days)
|
|
93
|
-
const refreshIntervalMs = ctx.config.keyRefreshIntervalMs ?? KEY_REFRESH_INTERVAL_MS_DEFAULT;
|
|
94
|
-
// With relay: delegate to core function for metadata-based rotation check
|
|
95
|
-
if (ctx.relay) {
|
|
96
|
-
const rotated = await rotateKyberPreKeyCore(ctx.relay, ctx.userId, ctx.deviceId, ctx.storage, refreshIntervalMs, getActiveIdentityTypes(ctx.config), ctx.logger);
|
|
97
|
-
if (rotated) {
|
|
98
|
-
ctx.logger.debug('Kyber prekey rotated (PQXDH security maintained)', {
|
|
99
|
-
category: 'E2EE',
|
|
100
|
-
data: { userId: ctx.userId, refreshIntervalMs },
|
|
101
|
-
});
|
|
102
|
-
await callHook(ctx.hooks, 'onKeyRotated', 'kemLastResortPreKey');
|
|
103
|
-
await cullReplacedPreKeysQuietly(ctx);
|
|
104
|
-
}
|
|
105
|
-
return rotated;
|
|
106
|
-
}
|
|
107
|
-
// Without relay: unconditional local-only rotation
|
|
108
|
-
const localResult = await rotateKyberPreKeyLocalOnly(ctx);
|
|
109
|
-
if (localResult) {
|
|
110
|
-
await cullReplacedPreKeysQuietly(ctx);
|
|
111
|
-
}
|
|
112
|
-
return localResult;
|
|
113
|
-
}
|
|
114
88
|
/**
|
|
115
89
|
* Local-only Kyber prekey rotation (no relay)
|
|
116
90
|
*
|
|
117
91
|
* Always rotates unconditionally since we cannot check server metadata.
|
|
118
|
-
*
|
|
92
|
+
* Each rotation takes the next key id, so a session that names an id resolves
|
|
93
|
+
* to exactly one retained key.
|
|
119
94
|
*/
|
|
120
|
-
async function rotateKyberPreKeyLocalOnly(ctx, identityType = 'aci') {
|
|
95
|
+
async function rotateKyberPreKeyLocalOnly(ctx, errors, identityType = 'aci') {
|
|
121
96
|
const { withRetry } = await import('../utils/retry.js');
|
|
122
97
|
const { generateKyberLastResortPreKey } = await import('../keys/index.js');
|
|
123
98
|
try {
|
|
@@ -142,6 +117,7 @@ async function rotateKyberPreKeyLocalOnly(ctx, identityType = 'aci') {
|
|
|
142
117
|
error: error,
|
|
143
118
|
data: { userId: ctx.userId },
|
|
144
119
|
});
|
|
120
|
+
errors.push(`kemLastResortPreKey: ${error.message}`);
|
|
145
121
|
return false;
|
|
146
122
|
}
|
|
147
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key-rotation.js","sourceRoot":"","sources":["../../client/key-rotation.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"key-rotation.js","sourceRoot":"","sources":["../../client/key-rotation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One-time prekey refill
|
|
3
|
+
*
|
|
4
|
+
* One owner for the refill decision and the fresh batch. The rotation core
|
|
5
|
+
* (background and headless rotation) and the server sync path call this
|
|
6
|
+
* function with the server counts they already hold, so neither keeps its own
|
|
7
|
+
* copy of the rules:
|
|
8
|
+
*
|
|
9
|
+
* - The EC set and the KEM set are checked against the threshold separately.
|
|
10
|
+
* - A set is marked replaced only when this call makes a new batch of that
|
|
11
|
+
* type. Retained keys stay decrypt-only until the maintenance store culls
|
|
12
|
+
* them after the grace period.
|
|
13
|
+
* - Each batch starts at the highest local ID of its type plus one. The local
|
|
14
|
+
* read includes retained replaced keys, so a fresh batch never reuses an ID
|
|
15
|
+
* whose private key a peer may still address.
|
|
16
|
+
*
|
|
17
|
+
* The caller publishes the returned uploads. This module makes no relay call.
|
|
18
|
+
*/
|
|
19
|
+
import { type Logger } from '../logger.js';
|
|
20
|
+
import type { SignalProtocolLocalStore } from '../types/index.js';
|
|
21
|
+
import type { IdentityType } from '../keys/types.js';
|
|
22
|
+
import type { PreKeyUpload } from '../remote/relay/types.js';
|
|
23
|
+
import type { PreKeyMaintenanceStore } from './config.js';
|
|
24
|
+
/**
|
|
25
|
+
* Minimum one-time prekeys before a refill starts.
|
|
26
|
+
* When a server count drops below this threshold, the client generates and
|
|
27
|
+
* uploads a new batch of that type.
|
|
28
|
+
*/
|
|
29
|
+
export declare const MIN_PREKEY_REPLENISHMENT_THRESHOLD = 10;
|
|
30
|
+
export interface OneTimePreKeyRefillInput {
|
|
31
|
+
storage: SignalProtocolLocalStore;
|
|
32
|
+
identityType: IdentityType;
|
|
33
|
+
/** Server count of unconsumed EC one-time prekeys. */
|
|
34
|
+
serverEcCount: number;
|
|
35
|
+
/** Server count of unconsumed KEM one-time prekeys. */
|
|
36
|
+
serverKemCount: number;
|
|
37
|
+
threshold?: number;
|
|
38
|
+
preKeyMaintenance?: PreKeyMaintenanceStore;
|
|
39
|
+
logger?: Required<Logger>;
|
|
40
|
+
}
|
|
41
|
+
export interface OneTimePreKeyRefill {
|
|
42
|
+
/** Public halves of every fresh key, in generation order: EC first, then KEM. */
|
|
43
|
+
uploads: PreKeyUpload[];
|
|
44
|
+
ecGenerated: number;
|
|
45
|
+
kemGenerated: number;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Generate and store the one-time prekey batches that the server counts call
|
|
49
|
+
* for, and return their public halves for the caller's publication.
|
|
50
|
+
*/
|
|
51
|
+
export declare function refillOneTimePreKeys(input: OneTimePreKeyRefillInput): Promise<OneTimePreKeyRefill>;
|
|
52
|
+
//# sourceMappingURL=one-time-prekey-refill.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"one-time-prekey-refill.d.ts","sourceRoot":"","sources":["../../client/one-time-prekey-refill.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAA+B,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,KAAK,CAAC;AAErD,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,wBAAwB,CAAC;IAClC,YAAY,EAAE,YAAY,CAAC;IAC3B,sDAAsD;IACtD,aAAa,EAAE,MAAM,CAAC;IACtB,uDAAuD;IACvD,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;IAC3C,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,iFAAiF;IACjF,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAMD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,mBAAmB,CAAC,CA0D9B"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One-time prekey refill
|
|
3
|
+
*
|
|
4
|
+
* One owner for the refill decision and the fresh batch. The rotation core
|
|
5
|
+
* (background and headless rotation) and the server sync path call this
|
|
6
|
+
* function with the server counts they already hold, so neither keeps its own
|
|
7
|
+
* copy of the rules:
|
|
8
|
+
*
|
|
9
|
+
* - The EC set and the KEM set are checked against the threshold separately.
|
|
10
|
+
* - A set is marked replaced only when this call makes a new batch of that
|
|
11
|
+
* type. Retained keys stay decrypt-only until the maintenance store culls
|
|
12
|
+
* them after the grace period.
|
|
13
|
+
* - Each batch starts at the highest local ID of its type plus one. The local
|
|
14
|
+
* read includes retained replaced keys, so a fresh batch never reuses an ID
|
|
15
|
+
* whose private key a peer may still address.
|
|
16
|
+
*
|
|
17
|
+
* The caller publishes the returned uploads. This module makes no relay call.
|
|
18
|
+
*/
|
|
19
|
+
import { defaultSignalProtocolLogger } from '../logger.js';
|
|
20
|
+
import { ONE_TIME_PREKEY_BATCH_SIZE } from '../types/index.js';
|
|
21
|
+
import { generateEcOneTimePreKeys, generateKemOneTimePreKeys } from '../keys/index.js';
|
|
22
|
+
/**
|
|
23
|
+
* Minimum one-time prekeys before a refill starts.
|
|
24
|
+
* When a server count drops below this threshold, the client generates and
|
|
25
|
+
* uploads a new batch of that type.
|
|
26
|
+
*/
|
|
27
|
+
export const MIN_PREKEY_REPLENISHMENT_THRESHOLD = 10;
|
|
28
|
+
function nextOneTimePreKeyId(retained) {
|
|
29
|
+
return retained.reduce((max, key) => Math.max(max, key.keyId), -1) + 1;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Generate and store the one-time prekey batches that the server counts call
|
|
33
|
+
* for, and return their public halves for the caller's publication.
|
|
34
|
+
*/
|
|
35
|
+
export async function refillOneTimePreKeys(input) {
|
|
36
|
+
const { storage, identityType, serverEcCount, serverKemCount, threshold = MIN_PREKEY_REPLENISHMENT_THRESHOLD, preKeyMaintenance, logger = defaultSignalProtocolLogger, } = input;
|
|
37
|
+
const uploads = [];
|
|
38
|
+
let ecGenerated = 0;
|
|
39
|
+
let kemGenerated = 0;
|
|
40
|
+
if (serverEcCount < threshold) {
|
|
41
|
+
await preKeyMaintenance?.markEcOneTimePreKeysReplaced(identityType);
|
|
42
|
+
const startId = nextOneTimePreKeyId(await storage.getEcOneTimePreKeys(identityType));
|
|
43
|
+
const batch = await generateEcOneTimePreKeys(ONE_TIME_PREKEY_BATCH_SIZE, startId);
|
|
44
|
+
await storage.storeEcOneTimePreKeys(batch, identityType);
|
|
45
|
+
uploads.push(...batch.map((key) => ({
|
|
46
|
+
type: 'ecPreKey',
|
|
47
|
+
keyId: key.keyId,
|
|
48
|
+
publicKey: key.publicKey,
|
|
49
|
+
})));
|
|
50
|
+
ecGenerated = batch.length;
|
|
51
|
+
logger.debug('Generated fresh EC one-time prekeys', {
|
|
52
|
+
category: 'E2EE',
|
|
53
|
+
data: { identityType, count: batch.length, startId, serverEcCount, threshold },
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
if (serverKemCount < threshold) {
|
|
57
|
+
const identityKey = await storage.getIdentityKey(identityType);
|
|
58
|
+
if (!identityKey) {
|
|
59
|
+
throw new Error(`Identity key missing, cannot sign KEM one-time prekeys (${identityType})`);
|
|
60
|
+
}
|
|
61
|
+
await preKeyMaintenance?.markKyberOneTimePreKeysReplaced(identityType);
|
|
62
|
+
const startId = nextOneTimePreKeyId(await storage.getKemOneTimePreKeys(identityType));
|
|
63
|
+
const batch = await generateKemOneTimePreKeys(identityKey, ONE_TIME_PREKEY_BATCH_SIZE, startId);
|
|
64
|
+
await storage.storeKemOneTimePreKeys(batch, identityType);
|
|
65
|
+
uploads.push(...batch.map((key) => ({
|
|
66
|
+
type: 'kemOneTimePreKey',
|
|
67
|
+
keyId: key.keyId,
|
|
68
|
+
publicKey: key.publicKey,
|
|
69
|
+
signature: key.signature,
|
|
70
|
+
})));
|
|
71
|
+
kemGenerated = batch.length;
|
|
72
|
+
logger.debug('Generated fresh KEM one-time prekeys', {
|
|
73
|
+
category: 'E2EE',
|
|
74
|
+
data: { identityType, count: batch.length, startId, serverKemCount, threshold },
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
return { uploads, ecGenerated, kemGenerated };
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=one-time-prekey-refill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"one-time-prekey-refill.js","sourceRoot":"","sources":["../../client/one-time-prekey-refill.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prekeys.d.ts","sourceRoot":"","sources":["../../client/prekeys.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"prekeys.d.ts","sourceRoot":"","sources":["../../client/prekeys.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,UAAU,CAAC;AAIlB,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAE3D,uDAAuD;AACvD,OAAO,EAAE,CAAC;AAgMV;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAG/C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,2BAA2B,EAChC,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5B,OAAO,CAAC,IAAI,CAAC,CAyDf;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,2BAA2B,EAChC,YAAY,EAAE,YAAY,EAC1B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAuNf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,2BAA2B,EAChC,YAAY,GAAE,YAAoB,GACjC,OAAO,CAAC,IAAI,CAAC,CAgGf;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE;QACd,eAAe,EAAE,MAAM,CAAC;QACxB,gBAAgB,EAAE,MAAM,CAAC;QACzB,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,2BAA2B,EAChC,YAAY,GAAE,YAAoB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAgG9B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,2BAA2B,EAChC,YAAY,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAClD,WAAW,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,EACxD,SAAS,EAAE,MAAM,EACjB,YAAY,GAAE,YAAoB,GACjC,OAAO,CAAC,IAAI,CAAC,CAwEf;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,uBAAuB,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,2BAA2B,EAChC,SAAS,GAAE,MAAW,EACtB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,EACzC,YAAY,GAAE,YAAoB,EAClC,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CA2C7B"}
|
package/dist/client/prekeys.js
CHANGED
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
* Handles prekey bundle upload, verification, and regeneration.
|
|
6
6
|
*/
|
|
7
7
|
import { EncryptionError, EncryptionErrorCode, ONE_TIME_PREKEY_BATCH_SIZE } from '../types/index.js';
|
|
8
|
-
import {
|
|
8
|
+
import { generateEcSignedPreKey, generateKyberLastResortPreKey } from '../keys/index.js';
|
|
9
9
|
import { getActiveIdentityTypes, PREKEY_CHECK_THROTTLE_MS_DEFAULT, } from './config.js';
|
|
10
10
|
import { MAX_UNACKNOWLEDGED_SESSION_AGE_MS } from './config.js';
|
|
11
|
-
import {
|
|
11
|
+
import { nextKyberLastResortPreKeyId } from './key-rotation-core.js';
|
|
12
|
+
import { MIN_PREKEY_REPLENISHMENT_THRESHOLD, refillOneTimePreKeys } from './one-time-prekey-refill.js';
|
|
12
13
|
const lastPreKeySyncTimeByClient = new Map();
|
|
13
14
|
const lastPreKeyStatusCheckTimeByIdentity = new Map();
|
|
14
15
|
const PREKEY_PUBLICATION_CANDIDATE_VERSION = 1;
|
|
@@ -226,7 +227,6 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
226
227
|
// Get keys from storage
|
|
227
228
|
const identityKey = await ctx.storage.getIdentityKey(identityType);
|
|
228
229
|
const signedPreKey = await ctx.storage.getEcSignedPreKey(undefined, identityType);
|
|
229
|
-
const oneTimePreKeys = await ctx.storage.getEcOneTimePreKeys(identityType);
|
|
230
230
|
if (!identityKey || !signedPreKey) {
|
|
231
231
|
throw new Error(`Keys not generated - identity or signed prekey missing (${identityType})`);
|
|
232
232
|
}
|
|
@@ -287,43 +287,6 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
287
287
|
const oneTimeUploads = pendingOneTimeUploads
|
|
288
288
|
? pendingOneTimeUploads.map((upload) => ({ ...upload }))
|
|
289
289
|
: [];
|
|
290
|
-
// Retained private keys are decrypt-only. A depleted server receives one
|
|
291
|
-
// exact fresh batch, never an arbitrary prefix of the private-key store.
|
|
292
|
-
if (pendingOneTimeUploads === null && serverEcCount < MIN_PREKEY_REPLENISHMENT_THRESHOLD) {
|
|
293
|
-
// Mark existing active one-time prekeys as replaced before generating new batch
|
|
294
|
-
await preKeyMaintenance?.markEcOneTimePreKeysReplaced(identityType);
|
|
295
|
-
// Determine next key ID from existing local prekeys
|
|
296
|
-
const maxExistingId = oneTimePreKeys.reduce((max, k) => Math.max(max, k.keyId), -1);
|
|
297
|
-
const startId = maxExistingId + 1;
|
|
298
|
-
const freshPreKeys = await generateEcOneTimePreKeys(ONE_TIME_PREKEY_BATCH_SIZE, startId);
|
|
299
|
-
await ctx.storage.storeEcOneTimePreKeys(freshPreKeys, identityType);
|
|
300
|
-
oneTimeUploads.push(...freshPreKeys.map((prekey) => ({
|
|
301
|
-
type: 'ecPreKey',
|
|
302
|
-
keyId: prekey.keyId,
|
|
303
|
-
publicKey: prekey.publicKey,
|
|
304
|
-
})));
|
|
305
|
-
onProgress?.({
|
|
306
|
-
stage: 'generating-keys',
|
|
307
|
-
percent: 30,
|
|
308
|
-
message: 'Encryption keys ready',
|
|
309
|
-
detail: {
|
|
310
|
-
current: freshPreKeys.length,
|
|
311
|
-
total: ONE_TIME_PREKEY_BATCH_SIZE,
|
|
312
|
-
},
|
|
313
|
-
});
|
|
314
|
-
ctx.logger.debug('Generated fresh EC one-time prekeys', {
|
|
315
|
-
category: 'E2EE',
|
|
316
|
-
data: { identityType, count: freshPreKeys.length, startId },
|
|
317
|
-
});
|
|
318
|
-
}
|
|
319
|
-
ctx.logger.debug('One-time prekey upload calculation', {
|
|
320
|
-
category: 'E2EE',
|
|
321
|
-
data: {
|
|
322
|
-
identityType,
|
|
323
|
-
serverPreKeyCount: serverEcCount,
|
|
324
|
-
uploading: oneTimeUploads.filter((upload) => upload.type === 'ecPreKey').length,
|
|
325
|
-
},
|
|
326
|
-
});
|
|
327
290
|
// Build prekey batch for upload
|
|
328
291
|
const preKeyUploads = [
|
|
329
292
|
// Signed prekey (rotated on the configured refresh interval, 2 days by default)
|
|
@@ -343,43 +306,45 @@ export async function syncIdentityToServer(ctx, identityType, onProgress) {
|
|
|
343
306
|
signature: kyberPreKey.signature,
|
|
344
307
|
});
|
|
345
308
|
}
|
|
346
|
-
//
|
|
347
|
-
//
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
await
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
// Store locally
|
|
359
|
-
await ctx.storage.storeKemOneTimePreKeys(kemOneTimePreKeys, identityType);
|
|
360
|
-
onProgress?.({
|
|
361
|
-
stage: 'generating-kyber',
|
|
362
|
-
percent: 65,
|
|
363
|
-
message: 'Post-quantum prekeys ready',
|
|
364
|
-
detail: {
|
|
365
|
-
current: kemOneTimePreKeys.length,
|
|
366
|
-
total: ONE_TIME_PREKEY_BATCH_SIZE,
|
|
367
|
-
},
|
|
309
|
+
// Retained private keys are decrypt-only. A depleted server receives one
|
|
310
|
+
// exact fresh batch, never an arbitrary prefix of the private-key store.
|
|
311
|
+
if (pendingOneTimeUploads === null) {
|
|
312
|
+
// Re-fetch the KEM count because a concurrent consumer may have changed it.
|
|
313
|
+
const serverKemPreKeyCount = await ctx.relay.getPreKeyCount(ctx.userId, ctx.deviceId, 'kem', identityType);
|
|
314
|
+
const refill = await refillOneTimePreKeys({
|
|
315
|
+
storage: ctx.storage,
|
|
316
|
+
identityType,
|
|
317
|
+
serverEcCount,
|
|
318
|
+
serverKemCount: serverKemPreKeyCount,
|
|
319
|
+
preKeyMaintenance,
|
|
320
|
+
logger: ctx.logger,
|
|
368
321
|
});
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
322
|
+
oneTimeUploads.push(...refill.uploads);
|
|
323
|
+
if (refill.ecGenerated > 0) {
|
|
324
|
+
onProgress?.({
|
|
325
|
+
stage: 'generating-keys',
|
|
326
|
+
percent: 30,
|
|
327
|
+
message: 'Encryption keys ready',
|
|
328
|
+
detail: { current: refill.ecGenerated, total: ONE_TIME_PREKEY_BATCH_SIZE },
|
|
329
|
+
});
|
|
330
|
+
}
|
|
331
|
+
if (refill.kemGenerated > 0) {
|
|
332
|
+
onProgress?.({
|
|
333
|
+
stage: 'generating-kyber',
|
|
334
|
+
percent: 65,
|
|
335
|
+
message: 'Post-quantum prekeys ready',
|
|
336
|
+
detail: { current: refill.kemGenerated, total: ONE_TIME_PREKEY_BATCH_SIZE },
|
|
376
337
|
});
|
|
377
338
|
}
|
|
378
|
-
ctx.logger.debug('Generated and uploading KEM one-time prekeys', {
|
|
379
|
-
category: 'E2EE',
|
|
380
|
-
data: { identityType, count: kemOneTimePreKeys.length, startId },
|
|
381
|
-
});
|
|
382
339
|
}
|
|
340
|
+
ctx.logger.debug('One-time prekey upload calculation', {
|
|
341
|
+
category: 'E2EE',
|
|
342
|
+
data: {
|
|
343
|
+
identityType,
|
|
344
|
+
serverPreKeyCount: serverEcCount,
|
|
345
|
+
uploading: oneTimeUploads.filter((upload) => upload.type === 'ecPreKey').length,
|
|
346
|
+
},
|
|
347
|
+
});
|
|
383
348
|
if (pendingOneTimeUploads === null && oneTimeUploads.length > 0) {
|
|
384
349
|
await storePublicationCandidate(ctx, identityType, oneTimeUploads);
|
|
385
350
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prekeys.js","sourceRoot":"","sources":["../../client/prekeys.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prekeys.js","sourceRoot":"","sources":["../../client/prekeys.ts"],"names":[],"mappings":"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"}
|
|
@@ -232,7 +232,7 @@ export declare class SignalProtocolServiceCipher {
|
|
|
232
232
|
/**
|
|
233
233
|
* Decrypt a pairwise message via SESAME
|
|
234
234
|
*
|
|
235
|
-
* Public for use by
|
|
235
|
+
* Public for use by DefaultSignalProtocolClient.receive() which takes raw SesameMessage.
|
|
236
236
|
*
|
|
237
237
|
* @throws {EncryptionError} DECRYPTION_FAILED if decryption fails
|
|
238
238
|
*/
|
|
@@ -571,7 +571,7 @@ export class SignalProtocolServiceCipher {
|
|
|
571
571
|
/**
|
|
572
572
|
* Decrypt a pairwise message via SESAME
|
|
573
573
|
*
|
|
574
|
-
* Public for use by
|
|
574
|
+
* Public for use by DefaultSignalProtocolClient.receive() which takes raw SesameMessage.
|
|
575
575
|
*
|
|
576
576
|
* @throws {EncryptionError} DECRYPTION_FAILED if decryption fails
|
|
577
577
|
*/
|
|
@@ -1338,7 +1338,7 @@ export class SignalProtocolServiceCipher {
|
|
|
1338
1338
|
}
|
|
1339
1339
|
async prepareAttachmentUpload(data, options) {
|
|
1340
1340
|
if (!this.remoteObjectStore) {
|
|
1341
|
-
throw new EncryptionError('Remote object storage not configured. Provide remoteObjectStore in
|
|
1341
|
+
throw new EncryptionError('Remote object storage not configured. Provide remoteObjectStore in DefaultSignalProtocolClient.create() config.', EncryptionErrorCode.INITIALIZATION_FAILED);
|
|
1342
1342
|
}
|
|
1343
1343
|
return prepareMediaAttachmentUpload(data, {
|
|
1344
1344
|
remoteObjectStore: this.remoteObjectStore,
|