@push.rocks/smartsecret 1.0.2 → 1.2.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.
@@ -0,0 +1,57 @@
1
+ import * as plugins from './smartsecret.plugins.js';
2
+ export declare const SMARTSECRET_KEYRING_SCHEMA_VERSION: 1;
3
+ export declare const SMARTSECRET_KEYRING_PROFILE: "smartsecret-aes-256-gcm-dek-kek-v1";
4
+ export type TSmartSecretKeyringProfile = typeof SMARTSECRET_KEYRING_PROFILE;
5
+ export declare const SMARTSECRET_KEYRING_MAX_PAYLOAD_BYTES = 524288;
6
+ export declare const SMARTSECRET_KEYRING_MIN_CONTEXT_BYTES = 1;
7
+ export declare const SMARTSECRET_KEYRING_MAX_CONTEXT_BYTES = 65536;
8
+ export declare const SMARTSECRET_KEYRING_MAX_IDENTIFIER_BYTES = 200;
9
+ export declare const SMARTSECRET_KEYRING_MAX_KEK_VERSION = 2147483647;
10
+ export interface ISmartSecretEnvelopeCiphertext {
11
+ nonce: string;
12
+ ciphertext: string;
13
+ tag: string;
14
+ }
15
+ export interface ISmartSecretEnvelopeV1 {
16
+ schemaVersion: 1;
17
+ profile: TSmartSecretKeyringProfile;
18
+ envelopeId: string;
19
+ createdAt: number;
20
+ contextDigest: string;
21
+ kek: {
22
+ keyringId: string;
23
+ version: number;
24
+ fingerprint: `sha256:${string}`;
25
+ };
26
+ payload: ISmartSecretEnvelopeCiphertext;
27
+ wrappedDek: ISmartSecretEnvelopeCiphertext;
28
+ }
29
+ export interface IParsedSmartSecretEnvelopeV1 {
30
+ envelope: ISmartSecretEnvelopeV1;
31
+ contextDigest: Uint8Array;
32
+ kekFingerprint: Uint8Array;
33
+ payload: plugins.smartcrypto.IAesGcmCiphertext;
34
+ wrappedDek: plugins.smartcrypto.IAesGcmCiphertext;
35
+ }
36
+ export interface ISmartSecretWrapAadFields {
37
+ envelopeId: string;
38
+ createdAt: number;
39
+ contextDigest: Uint8Array;
40
+ payloadDigest: Uint8Array;
41
+ keyringId: string;
42
+ kekVersion: number;
43
+ kekFingerprint: Uint8Array;
44
+ }
45
+ export declare const requireSmartSecretIdentifier: (valueArg: unknown) => string;
46
+ export declare const requireEnvelopeIdentifier: (valueArg: unknown) => string;
47
+ export declare const requireKekVersion: (valueArg: unknown, envelopeArg?: boolean) => number;
48
+ export declare const requireEpochMilliseconds: (valueArg: unknown, envelopeArg?: boolean) => number;
49
+ export declare const requireFingerprint: (valueArg: unknown, envelopeArg?: boolean) => `sha256:${string}`;
50
+ export declare const fingerprintToBytes: (valueArg: `sha256:${string}`) => Uint8Array;
51
+ export declare const encodeCanonicalBase64Url: (valueArg: Uint8Array) => string;
52
+ export declare const parseSmartSecretEnvelope: (valueArg: unknown) => IParsedSmartSecretEnvelopeV1;
53
+ export declare const sha256Bytes: (...valuesArg: Uint8Array[]) => Uint8Array;
54
+ export declare const createSmartSecretPayloadDigest: (payloadArg: plugins.smartcrypto.IAesGcmCiphertext) => Uint8Array;
55
+ export declare const createSmartSecretWrapAad: (fieldsArg: ISmartSecretWrapAadFields) => Uint8Array;
56
+ export declare const wipeCiphertext: (valueArg: plugins.smartcrypto.IAesGcmCiphertext | undefined) => void;
57
+ export declare const timingSafeEqual: (leftArg: Uint8Array, rightArg: Uint8Array) => boolean;
@@ -0,0 +1,290 @@
1
+ import * as plugins from './smartsecret.plugins.js';
2
+ import { SmartSecretKeyringError, createSmartSecretKeyringError, } from './smartsecret.keyring.error.js';
3
+ export const SMARTSECRET_KEYRING_SCHEMA_VERSION = 1;
4
+ export const SMARTSECRET_KEYRING_PROFILE = 'smartsecret-aes-256-gcm-dek-kek-v1';
5
+ export const SMARTSECRET_KEYRING_MAX_PAYLOAD_BYTES = 524_288;
6
+ export const SMARTSECRET_KEYRING_MIN_CONTEXT_BYTES = 1;
7
+ export const SMARTSECRET_KEYRING_MAX_CONTEXT_BYTES = 65_536;
8
+ export const SMARTSECRET_KEYRING_MAX_IDENTIFIER_BYTES = 200;
9
+ export const SMARTSECRET_KEYRING_MAX_KEK_VERSION = 2_147_483_647;
10
+ const identifierPattern = /^[A-Za-z0-9][A-Za-z0-9:._-]{0,199}$/;
11
+ const fingerprintPattern = /^sha256:[0-9a-f]{64}$/;
12
+ const base64UrlPattern = /^[A-Za-z0-9_-]*$/;
13
+ const wrapAadMagic = Buffer.from('smartsecret-envelope-wrap-aad-v1', 'ascii');
14
+ const payloadDigestMagic = Buffer.from('smartsecret-envelope-payload-digest-v1', 'ascii');
15
+ const requirePlainObject = (valueArg, expectedKeysArg) => {
16
+ try {
17
+ if (valueArg === null || typeof valueArg !== 'object' || Array.isArray(valueArg)) {
18
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
19
+ }
20
+ const prototype = Object.getPrototypeOf(valueArg);
21
+ if (prototype !== Object.prototype && prototype !== null) {
22
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
23
+ }
24
+ const ownKeys = Reflect.ownKeys(valueArg);
25
+ if (ownKeys.length !== expectedKeysArg.length
26
+ || ownKeys.some((keyArg) => typeof keyArg !== 'string')) {
27
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
28
+ }
29
+ const actualKeys = ownKeys;
30
+ if (expectedKeysArg.some((keyArg) => !actualKeys.includes(keyArg))) {
31
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
32
+ }
33
+ const result = Object.create(null);
34
+ for (const key of actualKeys) {
35
+ const descriptor = Object.getOwnPropertyDescriptor(valueArg, key);
36
+ if (!descriptor?.enumerable || !('value' in descriptor)) {
37
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
38
+ }
39
+ result[key] = descriptor.value;
40
+ }
41
+ return result;
42
+ }
43
+ catch (error) {
44
+ if (error instanceof SmartSecretKeyringError) {
45
+ throw error;
46
+ }
47
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
48
+ }
49
+ };
50
+ export const requireSmartSecretIdentifier = (valueArg) => {
51
+ if (typeof valueArg !== 'string'
52
+ || !identifierPattern.test(valueArg)
53
+ || Buffer.byteLength(valueArg, 'utf8') < 1
54
+ || Buffer.byteLength(valueArg, 'utf8') > SMARTSECRET_KEYRING_MAX_IDENTIFIER_BYTES) {
55
+ throw createSmartSecretKeyringError('CONFIG_INVALID');
56
+ }
57
+ return valueArg;
58
+ };
59
+ export const requireEnvelopeIdentifier = (valueArg) => {
60
+ try {
61
+ return requireSmartSecretIdentifier(valueArg);
62
+ }
63
+ catch {
64
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
65
+ }
66
+ };
67
+ export const requireKekVersion = (valueArg, envelopeArg = false) => {
68
+ if (!Number.isSafeInteger(valueArg)
69
+ || valueArg < 1
70
+ || valueArg > SMARTSECRET_KEYRING_MAX_KEK_VERSION) {
71
+ throw createSmartSecretKeyringError(envelopeArg ? 'ENVELOPE_INVALID' : 'CONFIG_INVALID');
72
+ }
73
+ return valueArg;
74
+ };
75
+ export const requireEpochMilliseconds = (valueArg, envelopeArg = false) => {
76
+ if (!Number.isSafeInteger(valueArg) || valueArg < 0) {
77
+ throw createSmartSecretKeyringError(envelopeArg ? 'ENVELOPE_INVALID' : 'CONFIG_INVALID');
78
+ }
79
+ return valueArg;
80
+ };
81
+ export const requireFingerprint = (valueArg, envelopeArg = false) => {
82
+ if (typeof valueArg !== 'string' || !fingerprintPattern.test(valueArg)) {
83
+ throw createSmartSecretKeyringError(envelopeArg ? 'ENVELOPE_INVALID' : 'CONFIG_INVALID');
84
+ }
85
+ return valueArg;
86
+ };
87
+ export const fingerprintToBytes = (valueArg) => new Uint8Array(Buffer.from(valueArg.slice('sha256:'.length), 'hex'));
88
+ export const encodeCanonicalBase64Url = (valueArg) => Buffer.from(valueArg).toString('base64url');
89
+ const decodeCanonicalBase64Url = (valueArg, maximumBytesArg, exactBytesArg) => {
90
+ if (typeof valueArg !== 'string') {
91
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
92
+ }
93
+ const maximumEncodedLength = Math.ceil(maximumBytesArg * 4 / 3);
94
+ if (valueArg.length > maximumEncodedLength) {
95
+ throw createSmartSecretKeyringError('SIZE_LIMIT_EXCEEDED');
96
+ }
97
+ if (!base64UrlPattern.test(valueArg) || valueArg.length % 4 === 1) {
98
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
99
+ }
100
+ let result;
101
+ let decodedBuffer;
102
+ let didSucceed = false;
103
+ try {
104
+ decodedBuffer = Buffer.from(valueArg, 'base64url');
105
+ result = new Uint8Array(decodedBuffer);
106
+ if (result.byteLength > maximumBytesArg) {
107
+ throw createSmartSecretKeyringError('SIZE_LIMIT_EXCEEDED');
108
+ }
109
+ if (exactBytesArg !== undefined && result.byteLength !== exactBytesArg) {
110
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
111
+ }
112
+ if (encodeCanonicalBase64Url(result) !== valueArg) {
113
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
114
+ }
115
+ didSucceed = true;
116
+ return result;
117
+ }
118
+ catch (error) {
119
+ if (error instanceof SmartSecretKeyringError) {
120
+ throw error;
121
+ }
122
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
123
+ }
124
+ finally {
125
+ decodedBuffer?.fill(0);
126
+ if (!didSucceed) {
127
+ result?.fill(0);
128
+ }
129
+ }
130
+ };
131
+ const parseCiphertext = (valueArg, maximumCiphertextBytesArg, exactCiphertextBytesArg) => {
132
+ const value = requirePlainObject(valueArg, ['nonce', 'ciphertext', 'tag']);
133
+ let nonce;
134
+ let ciphertext;
135
+ let tag;
136
+ let didSucceed = false;
137
+ try {
138
+ nonce = decodeCanonicalBase64Url(value.nonce, 12, 12);
139
+ ciphertext = decodeCanonicalBase64Url(value.ciphertext, maximumCiphertextBytesArg, exactCiphertextBytesArg);
140
+ tag = decodeCanonicalBase64Url(value.tag, 16, 16);
141
+ const result = {
142
+ encoded: {
143
+ nonce: value.nonce,
144
+ ciphertext: value.ciphertext,
145
+ tag: value.tag,
146
+ },
147
+ raw: { nonce, ciphertext, tag },
148
+ };
149
+ didSucceed = true;
150
+ return result;
151
+ }
152
+ finally {
153
+ if (!didSucceed) {
154
+ nonce?.fill(0);
155
+ ciphertext?.fill(0);
156
+ tag?.fill(0);
157
+ }
158
+ }
159
+ };
160
+ export const parseSmartSecretEnvelope = (valueArg) => {
161
+ const value = requirePlainObject(valueArg, [
162
+ 'schemaVersion',
163
+ 'profile',
164
+ 'envelopeId',
165
+ 'createdAt',
166
+ 'contextDigest',
167
+ 'kek',
168
+ 'payload',
169
+ 'wrappedDek',
170
+ ]);
171
+ if (value.schemaVersion !== SMARTSECRET_KEYRING_SCHEMA_VERSION) {
172
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
173
+ }
174
+ if (value.profile !== SMARTSECRET_KEYRING_PROFILE) {
175
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
176
+ }
177
+ let contextDigest;
178
+ let kekFingerprint;
179
+ let payload;
180
+ let wrappedDek;
181
+ let didSucceed = false;
182
+ try {
183
+ const envelopeId = requireEnvelopeIdentifier(value.envelopeId);
184
+ const createdAt = requireEpochMilliseconds(value.createdAt, true);
185
+ contextDigest = decodeCanonicalBase64Url(value.contextDigest, 32, 32);
186
+ const kekValue = requirePlainObject(value.kek, ['keyringId', 'version', 'fingerprint']);
187
+ const keyringId = requireEnvelopeIdentifier(kekValue.keyringId);
188
+ const version = requireKekVersion(kekValue.version, true);
189
+ const fingerprint = requireFingerprint(kekValue.fingerprint, true);
190
+ kekFingerprint = fingerprintToBytes(fingerprint);
191
+ payload = parseCiphertext(value.payload, SMARTSECRET_KEYRING_MAX_PAYLOAD_BYTES);
192
+ wrappedDek = parseCiphertext(value.wrappedDek, 32, 32);
193
+ const result = {
194
+ envelope: {
195
+ schemaVersion: SMARTSECRET_KEYRING_SCHEMA_VERSION,
196
+ profile: SMARTSECRET_KEYRING_PROFILE,
197
+ envelopeId,
198
+ createdAt,
199
+ contextDigest: value.contextDigest,
200
+ kek: { keyringId, version, fingerprint },
201
+ payload: payload.encoded,
202
+ wrappedDek: wrappedDek.encoded,
203
+ },
204
+ contextDigest,
205
+ kekFingerprint,
206
+ payload: payload.raw,
207
+ wrappedDek: wrappedDek.raw,
208
+ };
209
+ didSucceed = true;
210
+ return result;
211
+ }
212
+ finally {
213
+ if (!didSucceed) {
214
+ contextDigest?.fill(0);
215
+ kekFingerprint?.fill(0);
216
+ wipeCiphertext(payload?.raw);
217
+ wipeCiphertext(wrappedDek?.raw);
218
+ }
219
+ }
220
+ };
221
+ export const sha256Bytes = (...valuesArg) => {
222
+ const hash = plugins.crypto.createHash('sha256');
223
+ for (const value of valuesArg) {
224
+ hash.update(value);
225
+ }
226
+ return new Uint8Array(hash.digest());
227
+ };
228
+ const uint32Bytes = (valueArg) => {
229
+ const result = Buffer.allocUnsafe(4);
230
+ result.writeUInt32BE(valueArg, 0);
231
+ return result;
232
+ };
233
+ const uint64Bytes = (valueArg) => {
234
+ const result = Buffer.allocUnsafe(8);
235
+ result.writeBigUInt64BE(BigInt(valueArg), 0);
236
+ return result;
237
+ };
238
+ const lengthPrefixed = (valueArg) => {
239
+ if (valueArg.byteLength > 0xffff_ffff) {
240
+ throw createSmartSecretKeyringError('SIZE_LIMIT_EXCEEDED');
241
+ }
242
+ return Buffer.concat([uint32Bytes(valueArg.byteLength), valueArg]);
243
+ };
244
+ export const createSmartSecretPayloadDigest = (payloadArg) => {
245
+ const hash = plugins.crypto.createHash('sha256');
246
+ hash.update(payloadDigestMagic);
247
+ for (const value of [payloadArg.nonce, payloadArg.ciphertext, payloadArg.tag]) {
248
+ const length = uint32Bytes(value.byteLength);
249
+ try {
250
+ hash.update(length);
251
+ hash.update(value);
252
+ }
253
+ finally {
254
+ length.fill(0);
255
+ }
256
+ }
257
+ return new Uint8Array(hash.digest());
258
+ };
259
+ export const createSmartSecretWrapAad = (fieldsArg) => {
260
+ if (fieldsArg.contextDigest.byteLength !== 32
261
+ || fieldsArg.payloadDigest.byteLength !== 32
262
+ || fieldsArg.kekFingerprint.byteLength !== 32) {
263
+ throw createSmartSecretKeyringError('ENVELOPE_INVALID');
264
+ }
265
+ const profile = Buffer.from(SMARTSECRET_KEYRING_PROFILE, 'utf8');
266
+ const envelopeId = Buffer.from(requireEnvelopeIdentifier(fieldsArg.envelopeId), 'utf8');
267
+ const keyringId = Buffer.from(requireEnvelopeIdentifier(fieldsArg.keyringId), 'utf8');
268
+ const createdAt = requireEpochMilliseconds(fieldsArg.createdAt, true);
269
+ const kekVersion = requireKekVersion(fieldsArg.kekVersion, true);
270
+ return Buffer.concat([
271
+ wrapAadMagic,
272
+ uint64Bytes(SMARTSECRET_KEYRING_SCHEMA_VERSION),
273
+ lengthPrefixed(profile),
274
+ lengthPrefixed(envelopeId),
275
+ uint64Bytes(createdAt),
276
+ fieldsArg.contextDigest,
277
+ fieldsArg.payloadDigest,
278
+ lengthPrefixed(keyringId),
279
+ uint64Bytes(kekVersion),
280
+ fieldsArg.kekFingerprint,
281
+ ]);
282
+ };
283
+ export const wipeCiphertext = (valueArg) => {
284
+ valueArg?.nonce.fill(0);
285
+ valueArg?.ciphertext.fill(0);
286
+ valueArg?.tag.fill(0);
287
+ };
288
+ export const timingSafeEqual = (leftArg, rightArg) => leftArg.byteLength === rightArg.byteLength
289
+ && plugins.crypto.timingSafeEqual(leftArg, rightArg);
290
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartsecret.keyring.protocol.js","sourceRoot":"","sources":["../ts/smartsecret.keyring.protocol.ts"],"names":[],"mappings":"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"}
@@ -3,4 +3,8 @@ import * as crypto from 'crypto';
3
3
  import * as fs from 'fs';
4
4
  import * as os from 'os';
5
5
  import * as path from 'path';
6
- export { childProcess, crypto, fs, os, path };
6
+ import * as url from 'url';
7
+ import * as smartcrypto from '@push.rocks/smartcrypto';
8
+ import * as smartipc from '@push.rocks/smartipc';
9
+ import * as smartrust from '@push.rocks/smartrust';
10
+ export { childProcess, crypto, fs, os, path, url, smartcrypto, smartipc, smartrust };
@@ -4,5 +4,10 @@ import * as crypto from 'crypto';
4
4
  import * as fs from 'fs';
5
5
  import * as os from 'os';
6
6
  import * as path from 'path';
7
- export { childProcess, crypto, fs, os, path };
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzZWNyZXQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c2VjcmV0LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxZQUFZLE1BQU0sZUFBZSxDQUFDO0FBQzlDLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQ2pDLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUMifQ==
7
+ import * as url from 'url';
8
+ // @push.rocks scope
9
+ import * as smartcrypto from '@push.rocks/smartcrypto';
10
+ import * as smartipc from '@push.rocks/smartipc';
11
+ import * as smartrust from '@push.rocks/smartrust';
12
+ export { childProcess, crypto, fs, os, path, url, smartcrypto, smartipc, smartrust };
13
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzZWNyZXQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0c2VjcmV0LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxZQUFZLE1BQU0sZUFBZSxDQUFDO0FBQzlDLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQ2pDLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBRTNCLG9CQUFvQjtBQUNwQixPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxRQUFRLE1BQU0sc0JBQXNCLENBQUM7QUFDakQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUVuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsV0FBVyxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsQ0FBQyJ9
package/package.json CHANGED
@@ -1,16 +1,11 @@
1
1
  {
2
2
  "name": "@push.rocks/smartsecret",
3
- "version": "1.0.2",
3
+ "version": "1.2.0",
4
4
  "private": false,
5
- "description": "OS keychain-based secret storage with encrypted-file fallback for Node.js.",
5
+ "description": "OS-backed secret storage plus strict Linux kernel-keyring and envelope APIs for Node.js.",
6
6
  "main": "dist_ts/index.js",
7
7
  "typings": "dist_ts/index.d.ts",
8
8
  "type": "module",
9
- "scripts": {
10
- "test": "(tstest test/ --verbose)",
11
- "build": "(tsbuild)",
12
- "buildDocs": "tsdoc"
13
- },
14
9
  "repository": {
15
10
  "type": "git",
16
11
  "url": "https://code.foss.global/push.rocks/smartsecret.git"
@@ -34,10 +29,11 @@
34
29
  },
35
30
  "homepage": "https://code.foss.global/push.rocks/smartsecret",
36
31
  "devDependencies": {
37
- "@git.zone/tsbuild": "^4.1.2",
38
- "@git.zone/tsrun": "^2.0.1",
39
- "@git.zone/tstest": "^3.1.8",
40
- "@types/node": "^22.15.0"
32
+ "@git.zone/tsbuild": "^4.4.2",
33
+ "@git.zone/tsrun": "^2.0.6",
34
+ "@git.zone/tsrust": "^1.7.0",
35
+ "@git.zone/tstest": "^3.6.7",
36
+ "@types/node": "^25.9.5"
41
37
  },
42
38
  "files": [
43
39
  "ts/**/*",
@@ -48,10 +44,22 @@
48
44
  "dist_ts_web/**/*",
49
45
  "assets/**/*",
50
46
  "cli.js",
51
- "npmextra.json",
52
- "readme.md"
47
+ ".smartconfig.json",
48
+ "readme.md",
49
+ "third-party-notices.md"
53
50
  ],
54
51
  "browserslist": [
55
52
  "last 1 chrome versions"
56
- ]
57
- }
53
+ ],
54
+ "dependencies": {
55
+ "@push.rocks/smartcrypto": "^2.2.0",
56
+ "@push.rocks/smartipc": "^2.4.0",
57
+ "@push.rocks/smartrust": "^1.6.0"
58
+ },
59
+ "scripts": {
60
+ "test": "(tstest test/ --verbose)",
61
+ "test:before": "(tsrust) && (cargo test --manifest-path rust/Cargo.toml --target-dir .nogit/cargo-test-target)",
62
+ "build": "(tsbuild) && (tsrust)",
63
+ "buildDocs": "tsdoc"
64
+ }
65
+ }
package/readme.hints.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  ## Architecture
4
4
  - 3-tier backend: macOS Keychain → Linux secret-tool → encrypted file vault
5
- - Zero runtime dependencies (Node.js built-ins only)
5
+ - The legacy SmartSecret backends use Node.js built-ins only
6
6
  - All OS interactions via child_process.execFile (no shell injection)
7
7
 
8
8
  ## File Backend
@@ -10,3 +10,21 @@
10
10
  - Keyfile: auto-generated 32 random bytes at ~/.config/smartsecret/.keyfile (mode 0600)
11
11
  - Key derivation: PBKDF2 (SHA-512, 100k iterations, service-name salt)
12
12
  - Atomic writes: write .tmp then rename()
13
+
14
+ ## SmartSecret Keyring
15
+ - Separate Linux-only API; it does not alter legacy SmartSecret backend selection or behavior
16
+ - Uses @push.rocks/smartcrypto for AES-GCM payload encryption and DEK wrap/unwrap/rewrap
17
+ - Loads exact 32-byte KEKs from validated absolute credential paths into immutable per-instance snapshots
18
+ - Consumers own envelope persistence and compare-and-swap coordination
19
+ - JavaScript key and plaintext zeroization is best effort
20
+
21
+ ## SmartSecret Kernel Store
22
+ - Additive strict API; legacy SmartSecret backend selection remains unchanged
23
+ - Requires Node.js 25, Linux x64, Linux keyutils, and the exact package-owned static Rust worker
24
+ - No shell, PATH lookup, environment override, Secret Service, or filesystem secret fallback
25
+ - Generic values are framed and limited to 0..1024 bytes; service/account names are valid scalar UTF-8 strings of 1..1024 bytes
26
+ - Persistent-root service rings are revalidated on every operation; process keyring ownership is staging-only
27
+ - Service-wide SmartIPC NamedMutex plus a single monotonic 1..60000 ms deadline bounds cooperating cross-process access
28
+ - Any post-dispatch mutation ambiguity or worker integrity failure terminates and poisons the store
29
+ - DevIdP v1 migration is opaque, receipt-bound, keyutils-only, and requires a quiescent legacy writer
30
+ - Same-UID readability and kernel expiry/reboot behavior are part of the security model