@push.rocks/smartconfig 6.1.0 → 6.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.
- package/.smartconfig.json +11 -6
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.appdata.js +7 -6
- package/dist_ts/classes.keyvaluestore.d.ts +1 -1
- package/dist_ts/classes.keyvaluestore.js +18 -10
- package/dist_ts/classes.smartconfig.js +4 -3
- package/dist_ts/plugins.d.ts +4 -2
- package/dist_ts/plugins.js +5 -3
- package/dist_ts/sshagent/index.d.ts +1 -0
- package/dist_ts/sshagent/index.js +2 -0
- package/dist_ts/sshagent/smartconfig.sshagentsecret.d.ts +62 -0
- package/dist_ts/sshagent/smartconfig.sshagentsecret.js +453 -0
- package/package.json +31 -18
- package/readme.md +56 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.appdata.ts +8 -7
- package/ts/classes.keyvaluestore.ts +17 -12
- package/ts/classes.smartconfig.ts +5 -7
- package/ts/plugins.ts +6 -2
- package/ts/sshagent/index.ts +1 -0
- package/ts/sshagent/smartconfig.sshagentsecret.ts +602 -0
|
@@ -0,0 +1,453 @@
|
|
|
1
|
+
import { createCipheriv, createDecipheriv, createHash, createPublicKey, hkdfSync, randomBytes, verify, } from 'node:crypto';
|
|
2
|
+
import { promises as fs } from 'node:fs';
|
|
3
|
+
import * as net from 'node:net';
|
|
4
|
+
import { homedir } from 'node:os';
|
|
5
|
+
import { join } from 'node:path';
|
|
6
|
+
const sshAgentFailure = 5;
|
|
7
|
+
const sshAgentRequestIdentities = 11;
|
|
8
|
+
const sshAgentIdentitiesAnswer = 12;
|
|
9
|
+
const sshAgentSignRequest = 13;
|
|
10
|
+
const sshAgentSignResponse = 14;
|
|
11
|
+
const maxAgentResponseBytes = 16 * 1024 * 1024;
|
|
12
|
+
const maxAgentIdentities = 1024;
|
|
13
|
+
const defaultAgentTimeoutMs = 15_000;
|
|
14
|
+
const secretFormat = 'ssh-agent-sign-v1';
|
|
15
|
+
const aadEncoding = 'utf8';
|
|
16
|
+
class BinaryReader {
|
|
17
|
+
constructor(buffer) {
|
|
18
|
+
this.buffer = buffer;
|
|
19
|
+
this.offset = 0;
|
|
20
|
+
}
|
|
21
|
+
readUInt8() {
|
|
22
|
+
this.ensureAvailable(1);
|
|
23
|
+
const value = this.buffer.readUInt8(this.offset);
|
|
24
|
+
this.offset += 1;
|
|
25
|
+
return value;
|
|
26
|
+
}
|
|
27
|
+
readUInt32BE() {
|
|
28
|
+
this.ensureAvailable(4);
|
|
29
|
+
const value = this.buffer.readUInt32BE(this.offset);
|
|
30
|
+
this.offset += 4;
|
|
31
|
+
return value;
|
|
32
|
+
}
|
|
33
|
+
readBuffer(lengthArg) {
|
|
34
|
+
this.ensureAvailable(lengthArg);
|
|
35
|
+
const value = this.buffer.subarray(this.offset, this.offset + lengthArg);
|
|
36
|
+
this.offset += lengthArg;
|
|
37
|
+
return value;
|
|
38
|
+
}
|
|
39
|
+
readSshStringBuffer() {
|
|
40
|
+
return this.readBuffer(this.readUInt32BE());
|
|
41
|
+
}
|
|
42
|
+
readSshStringUtf8() {
|
|
43
|
+
return this.readSshStringBuffer().toString('utf8');
|
|
44
|
+
}
|
|
45
|
+
get remainingBytes() {
|
|
46
|
+
return this.buffer.length - this.offset;
|
|
47
|
+
}
|
|
48
|
+
ensureAvailable(lengthArg) {
|
|
49
|
+
if (lengthArg < 0 || this.buffer.length - this.offset < lengthArg) {
|
|
50
|
+
throw new Error('Malformed ssh-agent response.');
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
class SshAgentClient {
|
|
55
|
+
constructor(socketPath = process.env.SSH_AUTH_SOCK ?? '') {
|
|
56
|
+
this.socketPath = socketPath;
|
|
57
|
+
}
|
|
58
|
+
async listIdentities() {
|
|
59
|
+
const response = await this.request(Buffer.from([sshAgentRequestIdentities]));
|
|
60
|
+
const reader = new BinaryReader(response);
|
|
61
|
+
const responseType = reader.readUInt8();
|
|
62
|
+
if (responseType === sshAgentFailure) {
|
|
63
|
+
throw new Error('ssh-agent refused to list identities.');
|
|
64
|
+
}
|
|
65
|
+
if (responseType !== sshAgentIdentitiesAnswer) {
|
|
66
|
+
throw new Error(`Unexpected ssh-agent response type ${responseType}.`);
|
|
67
|
+
}
|
|
68
|
+
const count = reader.readUInt32BE();
|
|
69
|
+
if (count > maxAgentIdentities) {
|
|
70
|
+
throw new Error(`Refusing oversized ssh-agent identity list with ${count} identities.`);
|
|
71
|
+
}
|
|
72
|
+
const identities = [];
|
|
73
|
+
for (let i = 0; i < count; i++) {
|
|
74
|
+
const keyBlob = reader.readSshStringBuffer();
|
|
75
|
+
const comment = reader.readSshStringUtf8();
|
|
76
|
+
const parsedKeyBlob = tryParseSupportedKeyBlob(keyBlob);
|
|
77
|
+
if (!parsedKeyBlob)
|
|
78
|
+
continue;
|
|
79
|
+
const fingerprint = fingerprintSha256(keyBlob);
|
|
80
|
+
const authorizedKey = formatAuthorizedKey(parsedKeyBlob.type, keyBlob, comment);
|
|
81
|
+
identities.push({
|
|
82
|
+
type: parsedKeyBlob.type,
|
|
83
|
+
keyBlob,
|
|
84
|
+
publicKeyBytes: parsedKeyBlob.publicKeyBytes,
|
|
85
|
+
comment,
|
|
86
|
+
fingerprint,
|
|
87
|
+
authorizedKey,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
return identities;
|
|
91
|
+
}
|
|
92
|
+
async sign(keyBlobArg, dataArg) {
|
|
93
|
+
const payload = Buffer.concat([
|
|
94
|
+
Buffer.from([sshAgentSignRequest]),
|
|
95
|
+
sshString(keyBlobArg),
|
|
96
|
+
sshString(dataArg),
|
|
97
|
+
uint32(0),
|
|
98
|
+
]);
|
|
99
|
+
const response = await this.request(payload);
|
|
100
|
+
const reader = new BinaryReader(response);
|
|
101
|
+
const responseType = reader.readUInt8();
|
|
102
|
+
if (responseType === sshAgentFailure) {
|
|
103
|
+
throw new Error('ssh-agent refused to sign. The key may be locked, constrained, or missing.');
|
|
104
|
+
}
|
|
105
|
+
if (responseType !== sshAgentSignResponse) {
|
|
106
|
+
throw new Error(`Unexpected ssh-agent response type ${responseType}.`);
|
|
107
|
+
}
|
|
108
|
+
const signatureBlob = reader.readSshStringBuffer();
|
|
109
|
+
const signatureReader = new BinaryReader(signatureBlob);
|
|
110
|
+
const algorithm = signatureReader.readSshStringUtf8();
|
|
111
|
+
const signature = signatureReader.readSshStringBuffer();
|
|
112
|
+
if (signatureReader.remainingBytes !== 0) {
|
|
113
|
+
throw new Error('Malformed ssh-agent signature blob.');
|
|
114
|
+
}
|
|
115
|
+
return {
|
|
116
|
+
algorithm,
|
|
117
|
+
signature,
|
|
118
|
+
signatureBlob,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
async request(payloadArg) {
|
|
122
|
+
if (!this.socketPath) {
|
|
123
|
+
throw new Error('SSH_AUTH_SOCK is not set. Start ssh-agent and add the matching SSH key.');
|
|
124
|
+
}
|
|
125
|
+
return await new Promise((resolve, reject) => {
|
|
126
|
+
const socket = net.createConnection({ path: this.socketPath });
|
|
127
|
+
const chunks = [];
|
|
128
|
+
let finished = false;
|
|
129
|
+
let timeoutRef;
|
|
130
|
+
const cleanup = () => {
|
|
131
|
+
if (timeoutRef)
|
|
132
|
+
clearTimeout(timeoutRef);
|
|
133
|
+
};
|
|
134
|
+
const fail = (errorArg) => {
|
|
135
|
+
if (finished)
|
|
136
|
+
return;
|
|
137
|
+
finished = true;
|
|
138
|
+
cleanup();
|
|
139
|
+
socket.destroy();
|
|
140
|
+
reject(errorArg);
|
|
141
|
+
};
|
|
142
|
+
timeoutRef = setTimeout(() => {
|
|
143
|
+
fail(new Error(`ssh-agent request timed out after ${defaultAgentTimeoutMs}ms.`));
|
|
144
|
+
}, defaultAgentTimeoutMs);
|
|
145
|
+
timeoutRef.unref?.();
|
|
146
|
+
socket.on('connect', () => {
|
|
147
|
+
socket.write(Buffer.concat([uint32(payloadArg.length), payloadArg]));
|
|
148
|
+
});
|
|
149
|
+
socket.on('error', fail);
|
|
150
|
+
socket.on('close', () => {
|
|
151
|
+
if (!finished) {
|
|
152
|
+
fail(new Error('ssh-agent closed the connection before sending a complete response.'));
|
|
153
|
+
}
|
|
154
|
+
});
|
|
155
|
+
socket.on('data', (chunkArg) => {
|
|
156
|
+
if (finished)
|
|
157
|
+
return;
|
|
158
|
+
chunks.push(Buffer.from(chunkArg));
|
|
159
|
+
const buffer = Buffer.concat(chunks);
|
|
160
|
+
if (buffer.length < 4)
|
|
161
|
+
return;
|
|
162
|
+
const responseLength = buffer.readUInt32BE(0);
|
|
163
|
+
if (responseLength > maxAgentResponseBytes) {
|
|
164
|
+
fail(new Error('Refusing oversized ssh-agent response.'));
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
if (buffer.length < 4 + responseLength)
|
|
168
|
+
return;
|
|
169
|
+
finished = true;
|
|
170
|
+
cleanup();
|
|
171
|
+
socket.destroy();
|
|
172
|
+
resolve(buffer.subarray(4, 4 + responseLength));
|
|
173
|
+
});
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
export class SmartconfigSshAgentSecrets {
|
|
178
|
+
static async encryptString(valueArg, optionsArg = {}) {
|
|
179
|
+
const publicKey = await resolvePublicKey(optionsArg);
|
|
180
|
+
const agent = new SshAgentClient(optionsArg.agentSocket);
|
|
181
|
+
const identity = await findIdentity(agent, publicKey);
|
|
182
|
+
const salt = randomBytes(32);
|
|
183
|
+
const challenge = makeChallenge(publicKey, salt);
|
|
184
|
+
const signature = await agent.sign(identity.keyBlob, challenge);
|
|
185
|
+
assertEd25519Signature(signature);
|
|
186
|
+
assertSignatureMatchesPublicKey(publicKey, challenge, signature.signature);
|
|
187
|
+
const kek = deriveKek(signature.signature, salt, publicKey);
|
|
188
|
+
const aad = makeAad(publicKey, salt);
|
|
189
|
+
const box = encryptAes256Gcm(kek, Buffer.from(valueArg, 'utf8'), aad);
|
|
190
|
+
return {
|
|
191
|
+
__smartconfigSecret: secretFormat,
|
|
192
|
+
keyHint: {
|
|
193
|
+
format: 'openssh-authorized-key-v1',
|
|
194
|
+
authorizedKey: publicKey.authorizedKey,
|
|
195
|
+
fingerprint: publicKey.fingerprint,
|
|
196
|
+
},
|
|
197
|
+
payload: {
|
|
198
|
+
encoding: aadEncoding,
|
|
199
|
+
},
|
|
200
|
+
kdf: {
|
|
201
|
+
name: 'HKDF-SHA256',
|
|
202
|
+
salt: toBase64(salt),
|
|
203
|
+
},
|
|
204
|
+
box,
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
static async decryptString(encryptedValueArg, optionsArg = {}) {
|
|
208
|
+
const buffer = await this.decryptBuffer(encryptedValueArg, optionsArg);
|
|
209
|
+
return buffer.toString('utf8');
|
|
210
|
+
}
|
|
211
|
+
static async decryptBuffer(encryptedValueArg, optionsArg = {}) {
|
|
212
|
+
const normalized = normalizeEncryptedValue(encryptedValueArg);
|
|
213
|
+
const publicKey = parseOpenSshPublicKeyLine(normalized.keyHint.authorizedKey);
|
|
214
|
+
if (publicKey.fingerprint !== normalized.keyHint.fingerprint) {
|
|
215
|
+
throw new Error('Encrypted value public key does not match its fingerprint.');
|
|
216
|
+
}
|
|
217
|
+
const salt = fromBase64(normalized.kdf.salt, 'kdf.salt', 32);
|
|
218
|
+
const agent = new SshAgentClient(optionsArg.agentSocket);
|
|
219
|
+
const identity = await findIdentity(agent, publicKey);
|
|
220
|
+
const challenge = makeChallenge(publicKey, salt);
|
|
221
|
+
const signature = await agent.sign(identity.keyBlob, challenge);
|
|
222
|
+
assertEd25519Signature(signature);
|
|
223
|
+
assertSignatureMatchesPublicKey(publicKey, challenge, signature.signature);
|
|
224
|
+
const kek = deriveKek(signature.signature, salt, publicKey);
|
|
225
|
+
return decryptAes256Gcm(kek, normalized.box, makeAad(publicKey, salt));
|
|
226
|
+
}
|
|
227
|
+
static isEncryptedValue(valueArg) {
|
|
228
|
+
return Boolean(valueArg
|
|
229
|
+
&& typeof valueArg === 'object'
|
|
230
|
+
&& valueArg.__smartconfigSecret === secretFormat);
|
|
231
|
+
}
|
|
232
|
+
static async writeKey(kvStoreArg, keyArg, valueArg, optionsArg = {}) {
|
|
233
|
+
const encryptedValue = await this.encryptString(valueArg, optionsArg);
|
|
234
|
+
await kvStoreArg.writeKey(keyArg, encryptedValue);
|
|
235
|
+
return encryptedValue;
|
|
236
|
+
}
|
|
237
|
+
static async readKey(kvStoreArg, keyArg, optionsArg = {}) {
|
|
238
|
+
const value = await kvStoreArg.readKey(keyArg);
|
|
239
|
+
if (!this.isEncryptedValue(value)) {
|
|
240
|
+
throw new Error(`Key "${keyArg}" does not contain a smartconfig ssh-agent encrypted value.`);
|
|
241
|
+
}
|
|
242
|
+
return await this.decryptString(value, optionsArg);
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
async function resolvePublicKey(optionsArg) {
|
|
246
|
+
if (optionsArg.authorizedKey) {
|
|
247
|
+
return parseOpenSshPublicKeyLine(optionsArg.authorizedKey);
|
|
248
|
+
}
|
|
249
|
+
const authorizedKeyPath = optionsArg.authorizedKeyPath ?? '~/.ssh/id_ed25519.pub';
|
|
250
|
+
const content = await fs.readFile(expandHome(authorizedKeyPath), 'utf8');
|
|
251
|
+
return parseOpenSshPublicKeyLine(content);
|
|
252
|
+
}
|
|
253
|
+
async function findIdentity(agentArg, publicKeyArg) {
|
|
254
|
+
const identities = await agentArg.listIdentities();
|
|
255
|
+
const identity = identities.find((candidate) => candidate.fingerprint === publicKeyArg.fingerprint && candidate.keyBlob.equals(publicKeyArg.keyBlob));
|
|
256
|
+
if (!identity) {
|
|
257
|
+
throw new Error(`Required SSH key ${publicKeyArg.fingerprint} is not loaded in ssh-agent.`);
|
|
258
|
+
}
|
|
259
|
+
return identity;
|
|
260
|
+
}
|
|
261
|
+
function normalizeEncryptedValue(valueArg) {
|
|
262
|
+
if (!SmartconfigSshAgentSecrets.isEncryptedValue(valueArg)) {
|
|
263
|
+
throw new Error('Value is not a smartconfig ssh-agent encrypted value.');
|
|
264
|
+
}
|
|
265
|
+
if (valueArg.keyHint?.format !== 'openssh-authorized-key-v1') {
|
|
266
|
+
throw new Error('Encrypted value uses an unsupported key hint format.');
|
|
267
|
+
}
|
|
268
|
+
if (typeof valueArg.keyHint.authorizedKey !== 'string' || !valueArg.keyHint.authorizedKey) {
|
|
269
|
+
throw new Error('Encrypted value is missing an authorized key hint.');
|
|
270
|
+
}
|
|
271
|
+
if (typeof valueArg.keyHint.fingerprint !== 'string' || !valueArg.keyHint.fingerprint.startsWith('SHA256:')) {
|
|
272
|
+
throw new Error('Encrypted value is missing a supported SSH key fingerprint.');
|
|
273
|
+
}
|
|
274
|
+
if (valueArg.payload?.encoding !== aadEncoding) {
|
|
275
|
+
throw new Error('Encrypted value uses an unsupported payload encoding.');
|
|
276
|
+
}
|
|
277
|
+
if (valueArg.kdf?.name !== 'HKDF-SHA256') {
|
|
278
|
+
throw new Error('Encrypted value uses an unsupported KDF.');
|
|
279
|
+
}
|
|
280
|
+
if (valueArg.box?.alg !== 'AES-256-GCM') {
|
|
281
|
+
throw new Error('Encrypted value uses an unsupported encryption algorithm.');
|
|
282
|
+
}
|
|
283
|
+
return valueArg;
|
|
284
|
+
}
|
|
285
|
+
function parseOpenSshPublicKeyLine(lineOrFileArg) {
|
|
286
|
+
const line = lineOrFileArg
|
|
287
|
+
.split(/\r?\n/)
|
|
288
|
+
.map((candidate) => candidate.trim())
|
|
289
|
+
.find((candidate) => candidate && !candidate.startsWith('#'));
|
|
290
|
+
if (!line) {
|
|
291
|
+
throw new Error('No OpenSSH authorized key line found.');
|
|
292
|
+
}
|
|
293
|
+
const tokens = line.split(/\s+/);
|
|
294
|
+
const keyIndex = tokens.findIndex((token) => token === 'ssh-ed25519');
|
|
295
|
+
if (keyIndex === -1 || !tokens[keyIndex + 1]) {
|
|
296
|
+
throw new Error('Only ssh-ed25519 authorized key hints are supported.');
|
|
297
|
+
}
|
|
298
|
+
const keyBlob = fromBase64(tokens[keyIndex + 1], 'authorizedKey.keyBlob');
|
|
299
|
+
const parsedKeyBlob = parseSupportedKeyBlob(keyBlob);
|
|
300
|
+
if (parsedKeyBlob.type !== tokens[keyIndex]) {
|
|
301
|
+
throw new Error(`SSH public key type mismatch: line says ${tokens[keyIndex]}, blob says ${parsedKeyBlob.type}.`);
|
|
302
|
+
}
|
|
303
|
+
const comment = tokens.slice(keyIndex + 2).join(' ');
|
|
304
|
+
const fingerprint = fingerprintSha256(keyBlob);
|
|
305
|
+
return {
|
|
306
|
+
type: parsedKeyBlob.type,
|
|
307
|
+
keyBlob,
|
|
308
|
+
publicKeyBytes: parsedKeyBlob.publicKeyBytes,
|
|
309
|
+
comment,
|
|
310
|
+
fingerprint,
|
|
311
|
+
authorizedKey: formatAuthorizedKey(parsedKeyBlob.type, keyBlob, comment),
|
|
312
|
+
};
|
|
313
|
+
}
|
|
314
|
+
function parseSupportedKeyBlob(keyBlobArg) {
|
|
315
|
+
const reader = new BinaryReader(keyBlobArg);
|
|
316
|
+
const type = reader.readSshStringUtf8();
|
|
317
|
+
if (type !== 'ssh-ed25519') {
|
|
318
|
+
throw new Error(`Unsupported SSH key type: ${type}.`);
|
|
319
|
+
}
|
|
320
|
+
const publicKeyBytes = reader.readSshStringBuffer();
|
|
321
|
+
if (publicKeyBytes.length !== 32) {
|
|
322
|
+
throw new Error(`Expected 32-byte Ed25519 public key, got ${publicKeyBytes.length} bytes.`);
|
|
323
|
+
}
|
|
324
|
+
if (reader.remainingBytes !== 0) {
|
|
325
|
+
throw new Error('Malformed ssh-ed25519 public key blob.');
|
|
326
|
+
}
|
|
327
|
+
return { type, publicKeyBytes };
|
|
328
|
+
}
|
|
329
|
+
function tryParseSupportedKeyBlob(keyBlobArg) {
|
|
330
|
+
try {
|
|
331
|
+
return parseSupportedKeyBlob(keyBlobArg);
|
|
332
|
+
}
|
|
333
|
+
catch (error) {
|
|
334
|
+
if (error.message.startsWith('Unsupported SSH key type:')) {
|
|
335
|
+
return undefined;
|
|
336
|
+
}
|
|
337
|
+
throw error;
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
function assertEd25519Signature(signatureArg) {
|
|
341
|
+
if (signatureArg.algorithm !== 'ssh-ed25519') {
|
|
342
|
+
throw new Error(`Expected ssh-ed25519 signature, got ${signatureArg.algorithm}.`);
|
|
343
|
+
}
|
|
344
|
+
if (signatureArg.signature.length !== 64) {
|
|
345
|
+
throw new Error(`Expected 64-byte Ed25519 signature, got ${signatureArg.signature.length} bytes.`);
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
function assertSignatureMatchesPublicKey(publicKeyArg, challengeArg, signatureArg) {
|
|
349
|
+
const spkiPrefix = Buffer.from('302a300506032b6570032100', 'hex');
|
|
350
|
+
const keyObject = createPublicKey({
|
|
351
|
+
key: Buffer.concat([spkiPrefix, publicKeyArg.publicKeyBytes]),
|
|
352
|
+
format: 'der',
|
|
353
|
+
type: 'spki',
|
|
354
|
+
});
|
|
355
|
+
const valid = verify(null, challengeArg, keyObject, signatureArg);
|
|
356
|
+
if (!valid) {
|
|
357
|
+
throw new Error('ssh-agent signature does not match the encrypted value key hint.');
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
function makeChallenge(publicKeyArg, saltArg) {
|
|
361
|
+
return Buffer.concat([
|
|
362
|
+
Buffer.from('smartconfig:ssh-agent-sign-v1:kek\n', 'utf8'),
|
|
363
|
+
sshString(publicKeyArg.fingerprint),
|
|
364
|
+
sshString(publicKeyArg.authorizedKey),
|
|
365
|
+
sshString(saltArg),
|
|
366
|
+
]);
|
|
367
|
+
}
|
|
368
|
+
function deriveKek(signatureArg, saltArg, publicKeyArg) {
|
|
369
|
+
const info = Buffer.concat([
|
|
370
|
+
Buffer.from('smartconfig:ssh-agent-sign-v1:hkdf-info\n', 'utf8'),
|
|
371
|
+
sshString(publicKeyArg.fingerprint),
|
|
372
|
+
sshString(publicKeyArg.authorizedKey),
|
|
373
|
+
]);
|
|
374
|
+
return Buffer.from(hkdfSync('sha256', signatureArg, saltArg, info, 32));
|
|
375
|
+
}
|
|
376
|
+
function makeAad(publicKeyArg, saltArg) {
|
|
377
|
+
return Buffer.from(JSON.stringify({
|
|
378
|
+
format: secretFormat,
|
|
379
|
+
keyHint: {
|
|
380
|
+
format: 'openssh-authorized-key-v1',
|
|
381
|
+
authorizedKey: publicKeyArg.authorizedKey,
|
|
382
|
+
fingerprint: publicKeyArg.fingerprint,
|
|
383
|
+
},
|
|
384
|
+
payload: {
|
|
385
|
+
encoding: aadEncoding,
|
|
386
|
+
},
|
|
387
|
+
kdf: {
|
|
388
|
+
name: 'HKDF-SHA256',
|
|
389
|
+
salt: toBase64(saltArg),
|
|
390
|
+
},
|
|
391
|
+
}), 'utf8');
|
|
392
|
+
}
|
|
393
|
+
function encryptAes256Gcm(keyArg, plaintextArg, aadArg) {
|
|
394
|
+
const nonce = randomBytes(12);
|
|
395
|
+
const cipher = createCipheriv('aes-256-gcm', keyArg, nonce);
|
|
396
|
+
cipher.setAAD(aadArg);
|
|
397
|
+
const ciphertext = Buffer.concat([cipher.update(plaintextArg), cipher.final()]);
|
|
398
|
+
const tag = cipher.getAuthTag();
|
|
399
|
+
return {
|
|
400
|
+
alg: 'AES-256-GCM',
|
|
401
|
+
nonce: toBase64(nonce),
|
|
402
|
+
ciphertext: toBase64(ciphertext),
|
|
403
|
+
tag: toBase64(tag),
|
|
404
|
+
};
|
|
405
|
+
}
|
|
406
|
+
function decryptAes256Gcm(keyArg, boxArg, aadArg) {
|
|
407
|
+
if (boxArg.alg !== 'AES-256-GCM') {
|
|
408
|
+
throw new Error(`Unsupported encryption algorithm: ${boxArg.alg}.`);
|
|
409
|
+
}
|
|
410
|
+
const nonce = fromBase64(boxArg.nonce, 'box.nonce', 12);
|
|
411
|
+
const ciphertext = fromBase64(boxArg.ciphertext, 'box.ciphertext');
|
|
412
|
+
const tag = fromBase64(boxArg.tag, 'box.tag', 16);
|
|
413
|
+
const decipher = createDecipheriv('aes-256-gcm', keyArg, nonce);
|
|
414
|
+
decipher.setAAD(aadArg);
|
|
415
|
+
decipher.setAuthTag(tag);
|
|
416
|
+
return Buffer.concat([decipher.update(ciphertext), decipher.final()]);
|
|
417
|
+
}
|
|
418
|
+
function formatAuthorizedKey(typeArg, keyBlobArg, commentArg) {
|
|
419
|
+
return `${typeArg} ${keyBlobArg.toString('base64')}${commentArg ? ` ${commentArg}` : ''}`;
|
|
420
|
+
}
|
|
421
|
+
function fingerprintSha256(keyBlobArg) {
|
|
422
|
+
return `SHA256:${createHash('sha256').update(keyBlobArg).digest('base64').replace(/=+$/g, '')}`;
|
|
423
|
+
}
|
|
424
|
+
function sshString(valueArg) {
|
|
425
|
+
const buffer = Buffer.isBuffer(valueArg) ? valueArg : Buffer.from(valueArg, 'utf8');
|
|
426
|
+
return Buffer.concat([uint32(buffer.length), buffer]);
|
|
427
|
+
}
|
|
428
|
+
function uint32(valueArg) {
|
|
429
|
+
const buffer = Buffer.alloc(4);
|
|
430
|
+
buffer.writeUInt32BE(valueArg, 0);
|
|
431
|
+
return buffer;
|
|
432
|
+
}
|
|
433
|
+
function toBase64(valueArg) {
|
|
434
|
+
return valueArg.toString('base64');
|
|
435
|
+
}
|
|
436
|
+
function fromBase64(valueArg, fieldNameArg, expectedLengthArg) {
|
|
437
|
+
if (typeof valueArg !== 'string' || !valueArg || valueArg.length % 4 === 1 || !/^[A-Za-z0-9+/]+={0,2}$/.test(valueArg)) {
|
|
438
|
+
throw new Error(`${fieldNameArg} must be a base64 string.`);
|
|
439
|
+
}
|
|
440
|
+
const buffer = Buffer.from(valueArg, 'base64');
|
|
441
|
+
if (expectedLengthArg !== undefined && buffer.length !== expectedLengthArg) {
|
|
442
|
+
throw new Error(`${fieldNameArg} must decode to ${expectedLengthArg} bytes.`);
|
|
443
|
+
}
|
|
444
|
+
return buffer;
|
|
445
|
+
}
|
|
446
|
+
function expandHome(pathArg) {
|
|
447
|
+
if (pathArg === '~')
|
|
448
|
+
return homedir();
|
|
449
|
+
if (pathArg.startsWith('~/'))
|
|
450
|
+
return join(homedir(), pathArg.slice(2));
|
|
451
|
+
return pathArg;
|
|
452
|
+
}
|
|
453
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartconfig.sshagentsecret.js","sourceRoot":"","sources":["../../ts/sshagent/smartconfig.sshagentsecret.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartconfig",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A comprehensive configuration management library providing key-value storage, environment variable mapping, and tool configuration.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
7
7
|
"typings": "dist_ts/index.d.ts",
|
|
8
|
-
"
|
|
9
|
-
"
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
"exports": {
|
|
9
|
+
".": {
|
|
10
|
+
"types": "./dist_ts/index.d.ts",
|
|
11
|
+
"import": "./dist_ts/index.js",
|
|
12
|
+
"default": "./dist_ts/index.js"
|
|
13
|
+
},
|
|
14
|
+
"./sshagent": {
|
|
15
|
+
"types": "./dist_ts/sshagent/index.d.ts",
|
|
16
|
+
"import": "./dist_ts/sshagent/index.js",
|
|
17
|
+
"default": "./dist_ts/sshagent/index.js"
|
|
18
|
+
},
|
|
19
|
+
"./dist_ts/*": "./dist_ts/*",
|
|
20
|
+
"./ts/*": "./ts/*",
|
|
21
|
+
"./package.json": "./package.json"
|
|
12
22
|
},
|
|
13
23
|
"repository": {
|
|
14
24
|
"type": "git",
|
|
@@ -22,20 +32,21 @@
|
|
|
22
32
|
"homepage": "https://code.foss.global/push.rocks/smartconfig#readme",
|
|
23
33
|
"dependencies": {
|
|
24
34
|
"@push.rocks/qenv": "^6.1.3",
|
|
25
|
-
"@push.rocks/
|
|
26
|
-
"@push.rocks/smartjson": "^
|
|
27
|
-
"@push.rocks/smartlog": "^3.
|
|
35
|
+
"@push.rocks/smartfs": "^1.5.1",
|
|
36
|
+
"@push.rocks/smartjson": "^6.0.1",
|
|
37
|
+
"@push.rocks/smartlog": "^3.2.2",
|
|
28
38
|
"@push.rocks/smartpath": "^6.0.0",
|
|
29
39
|
"@push.rocks/smartpromise": "^4.2.3",
|
|
30
40
|
"@push.rocks/smartrx": "^3.0.10",
|
|
31
|
-
"@push.rocks/taskbuffer": "^
|
|
32
|
-
"@tsclass/tsclass": "^9.
|
|
41
|
+
"@push.rocks/taskbuffer": "^8.0.2",
|
|
42
|
+
"@tsclass/tsclass": "^9.5.1"
|
|
33
43
|
},
|
|
34
44
|
"devDependencies": {
|
|
35
|
-
"@git.zone/tsbuild": "^
|
|
36
|
-
"@git.zone/tsrun": "^
|
|
37
|
-
"@git.zone/tstest": "^
|
|
38
|
-
"@types/
|
|
45
|
+
"@git.zone/tsbuild": "^4.4.0",
|
|
46
|
+
"@git.zone/tsrun": "^2.0.2",
|
|
47
|
+
"@git.zone/tstest": "^3.6.3",
|
|
48
|
+
"@types/lodash.clonedeep": "^4.5.9",
|
|
49
|
+
"@types/node": "^25.6.0"
|
|
39
50
|
},
|
|
40
51
|
"files": [
|
|
41
52
|
"ts/**/*",
|
|
@@ -47,6 +58,7 @@
|
|
|
47
58
|
"assets/**/*",
|
|
48
59
|
"cli.js",
|
|
49
60
|
".smartconfig.json",
|
|
61
|
+
"license",
|
|
50
62
|
"readme.md"
|
|
51
63
|
],
|
|
52
64
|
"browserslist": [
|
|
@@ -70,8 +82,9 @@
|
|
|
70
82
|
"workflow improvement",
|
|
71
83
|
"persistent storage"
|
|
72
84
|
],
|
|
73
|
-
"
|
|
74
|
-
|
|
75
|
-
"
|
|
85
|
+
"scripts": {
|
|
86
|
+
"test": "(tstest test/ --verbose --logfile --timeout 20)",
|
|
87
|
+
"build": "(tsbuild --web)",
|
|
88
|
+
"buildDocs": "tsdoc"
|
|
76
89
|
}
|
|
77
|
-
}
|
|
90
|
+
}
|
package/readme.md
CHANGED
|
@@ -133,6 +133,61 @@ kv.changeSubject.subscribe((data) => console.log('changed:', data));
|
|
|
133
133
|
|
|
134
134
|
---
|
|
135
135
|
|
|
136
|
+
### SSH-Agent Encrypted Single Values
|
|
137
|
+
|
|
138
|
+
For Node.js CLI tools, individual `KeyValueStore` values can be stored as encrypted JSON envelopes and unlocked later through a matching SSH key loaded in `ssh-agent`. This API is intentionally exposed from the Node-only subpath `@push.rocks/smartconfig/sshagent` so browser bundles do not pull in `node:net`, `node:fs`, or `node:crypto`.
|
|
139
|
+
|
|
140
|
+
```typescript
|
|
141
|
+
import { KeyValueStore } from '@push.rocks/smartconfig';
|
|
142
|
+
import { SmartconfigSshAgentSecrets } from '@push.rocks/smartconfig/sshagent';
|
|
143
|
+
|
|
144
|
+
const kv = new KeyValueStore({
|
|
145
|
+
typeArg: 'userHomeDir',
|
|
146
|
+
identityArg: 'my-tool',
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
await SmartconfigSshAgentSecrets.writeKey(kv, 'apiToken', 'secret-token', {
|
|
150
|
+
authorizedKeyPath: '~/.ssh/id_ed25519.pub',
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
const apiToken = await SmartconfigSshAgentSecrets.readKey(kv, 'apiToken');
|
|
154
|
+
```
|
|
155
|
+
|
|
156
|
+
The stored value is a single self-describing object. Other keys in the same config can remain plain JSON values.
|
|
157
|
+
|
|
158
|
+
```json
|
|
159
|
+
{
|
|
160
|
+
"apiUrl": "https://api.example.test",
|
|
161
|
+
"apiToken": {
|
|
162
|
+
"__smartconfigSecret": "ssh-agent-sign-v1",
|
|
163
|
+
"keyHint": {
|
|
164
|
+
"format": "openssh-authorized-key-v1",
|
|
165
|
+
"authorizedKey": "ssh-ed25519 AAAAC3... user@host",
|
|
166
|
+
"fingerprint": "SHA256:..."
|
|
167
|
+
},
|
|
168
|
+
"payload": {
|
|
169
|
+
"encoding": "utf8"
|
|
170
|
+
},
|
|
171
|
+
"kdf": {
|
|
172
|
+
"name": "HKDF-SHA256",
|
|
173
|
+
"salt": "..."
|
|
174
|
+
},
|
|
175
|
+
"box": {
|
|
176
|
+
"alg": "AES-256-GCM",
|
|
177
|
+
"nonce": "...",
|
|
178
|
+
"ciphertext": "...",
|
|
179
|
+
"tag": "..."
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
```
|
|
184
|
+
|
|
185
|
+
The encrypted value includes an OpenSSH authorized-key-style hint. Smartconfig uses the hint's public key blob and `SHA256:` fingerprint to find the matching identity in `ssh-agent`; the key comment is not trusted for matching.
|
|
186
|
+
|
|
187
|
+
This is ssh-agent-signature-derived encryption, not public-key encryption. Encryption and decryption both require the matching `ssh-ed25519` key to be available through `ssh-agent`. Anyone who can access your `SSH_AUTH_SOCK` can ask the agent to sign the unlock challenge, so this protects config values at rest on disk, not an already-compromised unlocked session.
|
|
188
|
+
|
|
189
|
+
---
|
|
190
|
+
|
|
136
191
|
### 3. `AppData<T>` — Environment Variable Mapping 🌟
|
|
137
192
|
|
|
138
193
|
The flagship class. Maps environment variables (or hardcoded values) into a typed config object with automatic type conversions, nested object support, and smart storage path selection.
|
|
@@ -302,7 +357,7 @@ console.log(`Model: ${settings.model}, Cache: ${settings.cache.enabled}`);
|
|
|
302
357
|
|
|
303
358
|
## License and Legal Information
|
|
304
359
|
|
|
305
|
-
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [
|
|
360
|
+
This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license](./license) file.
|
|
306
361
|
|
|
307
362
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
|
308
363
|
|
package/ts/00_commitinfo_data.ts
CHANGED