sigild 0.0.6 → 0.0.8
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/README.md +31 -18
- package/dist/src/audit/log.d.ts +1 -1
- package/dist/src/audit/log.js +1 -1
- package/dist/src/bin/sigil-mcp.js +1 -0
- package/dist/src/bin/sigil-mcp.js.map +1 -1
- package/dist/src/cli/main.d.ts.map +1 -1
- package/dist/src/cli/main.js +55 -1
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/portal.d.ts +30 -1
- package/dist/src/cli/portal.d.ts.map +1 -1
- package/dist/src/cli/portal.js +74 -23
- package/dist/src/cli/portal.js.map +1 -1
- package/dist/src/control/protocol.d.ts +1 -1
- package/dist/src/control/server.d.ts +10 -0
- package/dist/src/control/server.d.ts.map +1 -1
- package/dist/src/control/server.js +54 -1
- package/dist/src/control/server.js.map +1 -1
- package/dist/src/daemon/handles.d.ts +2 -2
- package/dist/src/daemon/handles.d.ts.map +1 -1
- package/dist/src/daemon/handles.js +9 -3
- package/dist/src/daemon/handles.js.map +1 -1
- package/dist/src/eth/index.d.ts +1 -1
- package/dist/src/eth/index.d.ts.map +1 -1
- package/dist/src/eth/index.js +1 -1
- package/dist/src/eth/index.js.map +1 -1
- package/dist/src/eth/secp.d.ts +6 -0
- package/dist/src/eth/secp.d.ts.map +1 -1
- package/dist/src/eth/secp.js +14 -2
- package/dist/src/eth/secp.js.map +1 -1
- package/dist/src/hooks/command-scanner.d.ts.map +1 -1
- package/dist/src/hooks/command-scanner.js +57 -13
- package/dist/src/hooks/command-scanner.js.map +1 -1
- package/dist/src/hooks/glob.js +1 -1
- package/dist/src/hooks/glob.js.map +1 -1
- package/dist/src/hooks/path-blocker.d.ts.map +1 -1
- package/dist/src/hooks/path-blocker.js +1 -8
- package/dist/src/hooks/path-blocker.js.map +1 -1
- package/dist/src/mcp/tools.js +2 -2
- package/dist/src/qr/encode.d.ts +36 -0
- package/dist/src/qr/encode.d.ts.map +1 -0
- package/dist/src/qr/encode.js +44 -0
- package/dist/src/qr/encode.js.map +1 -0
- package/dist/src/qr/index.d.ts +3 -0
- package/dist/src/qr/index.d.ts.map +1 -0
- package/dist/src/qr/index.js +3 -0
- package/dist/src/qr/index.js.map +1 -0
- package/dist/src/qr/render.d.ts +34 -0
- package/dist/src/qr/render.d.ts.map +1 -0
- package/dist/src/qr/render.js +43 -0
- package/dist/src/qr/render.js.map +1 -0
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
|
|
9
9
|
## What it is
|
|
10
10
|
|
|
11
|
-
One MCP server process, four bins,
|
|
11
|
+
One MCP server process, four bins, five runtime deps (all pinned, zero transitive):
|
|
12
12
|
|
|
13
|
-
1. **`sigil-mcp`** — the only thing that runs. Claude Code spawns it per session via your `mcpServers` config; it dies when Claude exits. Holds unlocked keys in process memory (zeroized on shutdown, `sigil lock`, or unlock-failure; mlock against swap is planned). Keys at rest are encrypted with XChaCha20-Poly1305 and an Argon2id-derived key. Signs over stdio using a DIY MCP wire protocol (~200 lines, no SDK dep). Claude never sees key material — only opaque handles like `
|
|
13
|
+
1. **`sigil-mcp`** — the only thing that runs. Claude Code spawns it per session via your `mcpServers` config; it dies when Claude exits. Holds unlocked keys in process memory (zeroized on shutdown, `sigil lock`, or unlock-failure; mlock against swap is planned). Keys at rest are encrypted with XChaCha20-Poly1305 and an Argon2id-derived key. Signs over stdio using a DIY MCP wire protocol (~200 lines, no SDK dep). Claude never sees key material — only opaque handles like `evm:executor`.
|
|
14
14
|
2. **`sigil`** — control CLI. `init`, `status`, `portal add`/`list`/`remove`, `unlock`, `lock`.
|
|
15
15
|
3. **`sigil-hook-pre` / `sigil-hook-post`** — Claude Code hook binaries that block reads of common key paths and redact key-shaped strings from tool output.
|
|
16
16
|
|
|
@@ -40,15 +40,19 @@ Requires Node 22+.
|
|
|
40
40
|
# 1. Wire sigil into Claude Code (project-scoped). Pass --user to do it globally.
|
|
41
41
|
sigil init
|
|
42
42
|
|
|
43
|
-
#
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
#
|
|
47
|
-
# ~/.sigil/keys/eth:bot.sigil AND ~/.sigil/policy/eth:bot.toml (permissive)
|
|
43
|
+
# 2a. Generate a fresh key inside sigil (no plaintext ever hits disk):
|
|
44
|
+
sigil portal new evm:bot
|
|
45
|
+
# → prompts for a passphrase, mints a fresh secp256k1 key, prints the
|
|
46
|
+
# address, writes ~/.sigil/keys/evm:bot.sigil + permissive policy.
|
|
48
47
|
#
|
|
49
|
-
#
|
|
50
|
-
#
|
|
51
|
-
|
|
48
|
+
# 2b. OR import an existing private key from a file:
|
|
49
|
+
# Accepts either 32 raw bytes or 64 hex chars (with optional 0x prefix).
|
|
50
|
+
sigil portal add evm:bot --key-file ./private.hex
|
|
51
|
+
# → same as above but seeded from the file. Source file is deleted by
|
|
52
|
+
# default (pass --no-remove-source to keep it).
|
|
53
|
+
#
|
|
54
|
+
# Either form: pass --strict to start with a locked-down policy template
|
|
55
|
+
# you fill in before any sign succeeds.
|
|
52
56
|
|
|
53
57
|
# 3. Open Claude Code. It spawns sigil-mcp automatically via your MCP config.
|
|
54
58
|
# sigil-mcp boots locked — the first sign attempt will return DAEMON_LOCKED.
|
|
@@ -77,14 +81,22 @@ sigil init [--user]
|
|
|
77
81
|
Idempotent — preserves your unrelated settings, and on upgrade
|
|
78
82
|
migrates any stale mcpServers.sigil entry out of settings.json.
|
|
79
83
|
|
|
84
|
+
sigil portal new <handle> [--strict]
|
|
85
|
+
Generate a fresh secp256k1 key inside sigil, encrypt with your
|
|
86
|
+
passphrase, write it to ~/.sigil/keys/<handle>.sigil (mode 0600).
|
|
87
|
+
No plaintext key ever lands on disk. Use this when you want a clean
|
|
88
|
+
hot wallet for a bot (vs importing an existing key from a file).
|
|
89
|
+
Also writes ~/.sigil/policy/<handle>.toml — permissive by default,
|
|
90
|
+
or --strict for a locked-down template.
|
|
91
|
+
|
|
80
92
|
sigil portal add <handle> --key-file <path> [--no-remove-source] [--strict]
|
|
81
|
-
|
|
82
|
-
~/.sigil/keys/<handle>.sigil (mode 0600). Handle
|
|
83
|
-
<kind>:<name> where kind is "eth". The source key file
|
|
84
|
-
by default — pass --no-remove-source to keep it.
|
|
93
|
+
Import an existing private key. Encrypts it with your passphrase
|
|
94
|
+
and stores at ~/.sigil/keys/<handle>.sigil (mode 0600). Handle
|
|
95
|
+
format is <kind>:<name> where kind is "eth". The source key file
|
|
96
|
+
is deleted by default — pass --no-remove-source to keep it.
|
|
85
97
|
Also writes ~/.sigil/policy/<handle>.toml — permissive by default
|
|
86
|
-
(signs anything), or
|
|
87
|
-
|
|
98
|
+
(signs anything), or --strict for a locked-down template you fill
|
|
99
|
+
in before signs succeed.
|
|
88
100
|
|
|
89
101
|
sigil policy show <handle>
|
|
90
102
|
Print the current policy file for a portal. Validates schema; exits
|
|
@@ -157,11 +169,12 @@ What's deferred to follow-up PRs (still in [#3](https://github.com/cdrn/sigil/is
|
|
|
157
169
|
Key-management libraries die from supply chain compromise, not from clever attacks on the code. Given the npm ecosystem in 2026 (Mini Shai-Hulud, Axios, pgserve, TanStack), `sigil` commits to:
|
|
158
170
|
|
|
159
171
|
- **Zero install scripts.** No `postinstall`, `preinstall`, `prepare`. CI-enforced (planned: a CI guard that fails if any dep adds one).
|
|
160
|
-
- **
|
|
172
|
+
- **Five runtime deps, all version-pinned** (no caret ranges), all zero-transitive — the entire `npm ls --omit dev` tree is exactly these five packages:
|
|
161
173
|
- [`@noble/ciphers`](https://github.com/paulmillr/noble-ciphers) for XChaCha20-Poly1305
|
|
162
174
|
- [`@noble/hashes`](https://github.com/paulmillr/noble-hashes) for Argon2id, keccak256, sha2, HMAC
|
|
163
175
|
- [`@noble/secp256k1`](https://github.com/paulmillr/noble-secp256k1) for ECDSA
|
|
164
|
-
|
|
176
|
+
- [`@iarna/toml`](https://github.com/iarna/iarna-toml) for parsing per-portal policy TOML files
|
|
177
|
+
- [`qrcode-generator`](https://github.com/kazuhikoarase/qrcode-generator) for `sigil portal qr` rendering
|
|
165
178
|
- **No MCP SDK.** The official `@modelcontextprotocol/sdk` pulls 92 transitive deps (ajv, hono, cors, cross-spawn, etc) — unacceptable surface. We implement the MCP wire protocol directly in ~200 lines.
|
|
166
179
|
- **No Bun.** Plain Node only. Bun is currently being weaponized by Mini Shai-Hulud as an evasion layer; we will not give that pattern any cover.
|
|
167
180
|
- **Provenance attestations on every npm publish.** Starting v0.0.4, releases are built by [a GitHub Actions workflow](./.github/workflows/release.yml) under OIDC trusted-publisher auth, signed with a Sigstore attestation. No long-lived npm token; tampered or out-of-band publishes fail signature verification.
|
package/dist/src/audit/log.d.ts
CHANGED
|
@@ -70,7 +70,7 @@ export declare function readHead(path: string): ChainHead;
|
|
|
70
70
|
*
|
|
71
71
|
* Typical use:
|
|
72
72
|
* const w = new AuditWriter('/path/to/audit.log');
|
|
73
|
-
* w.append({ kind: 'eth_sign_message', portal: '
|
|
73
|
+
* w.append({ kind: 'eth_sign_message', portal: 'evm:bot', payload, decision: 'allow', sig });
|
|
74
74
|
* w.close();
|
|
75
75
|
*
|
|
76
76
|
* The seq and prev_hash fields are managed by the writer; callers supply
|
package/dist/src/audit/log.js
CHANGED
|
@@ -175,7 +175,7 @@ export function readHead(path) {
|
|
|
175
175
|
*
|
|
176
176
|
* Typical use:
|
|
177
177
|
* const w = new AuditWriter('/path/to/audit.log');
|
|
178
|
-
* w.append({ kind: 'eth_sign_message', portal: '
|
|
178
|
+
* w.append({ kind: 'eth_sign_message', portal: 'evm:bot', payload, decision: 'allow', sig });
|
|
179
179
|
* w.close();
|
|
180
180
|
*
|
|
181
181
|
* The seq and prev_hash fields are managed by the writer; callers supply
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sigil-mcp.js","sourceRoot":"","sources":["../../../src/bin/sigil-mcp.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sigil-mcp.js","sourceRoot":"","sources":["../../../src/bin/sigil-mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/cli/main.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../src/cli/main.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAqCpD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAC5C,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,iEAAiE;IACjE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAqN/D"}
|
package/dist/src/cli/main.js
CHANGED
|
@@ -5,7 +5,8 @@ import { installInto } from '../hooks/install.js';
|
|
|
5
5
|
import { parsePolicy } from '../policy/index.js';
|
|
6
6
|
import { ArgsError, parseSubcommand } from './args.js';
|
|
7
7
|
import { resolvePaths } from './paths.js';
|
|
8
|
-
import {
|
|
8
|
+
import { encode as encodeQr, renderTerminal } from '../qr/index.js';
|
|
9
|
+
import { policyInit, portalAdd, portalAddress, portalListFromDisk, portalNew, portalRemove } from './portal.js';
|
|
9
10
|
import { status } from './status.js';
|
|
10
11
|
import { formatResult, lock, unlock } from './unlock.js';
|
|
11
12
|
const USAGE = `sigil — local signing control for Claude Code
|
|
@@ -13,8 +14,10 @@ const USAGE = `sigil — local signing control for Claude Code
|
|
|
13
14
|
Usage:
|
|
14
15
|
sigil init [--user]
|
|
15
16
|
sigil status
|
|
17
|
+
sigil portal new <handle> [--strict]
|
|
16
18
|
sigil portal add <handle> --key-file <path> [--no-remove-source] [--strict]
|
|
17
19
|
sigil portal list
|
|
20
|
+
sigil portal qr <handle>
|
|
18
21
|
sigil portal remove <handle>
|
|
19
22
|
sigil policy show <handle>
|
|
20
23
|
sigil policy init <handle> [--strict]
|
|
@@ -88,6 +91,11 @@ export async function runCli(opts) {
|
|
|
88
91
|
}
|
|
89
92
|
if (head === 'portal') {
|
|
90
93
|
const sub = parseSubcommand(rest, {
|
|
94
|
+
new: {
|
|
95
|
+
options: {
|
|
96
|
+
'strict': { type: 'boolean' },
|
|
97
|
+
},
|
|
98
|
+
},
|
|
91
99
|
add: {
|
|
92
100
|
options: {
|
|
93
101
|
'key-file': { type: 'string' },
|
|
@@ -96,8 +104,33 @@ export async function runCli(opts) {
|
|
|
96
104
|
},
|
|
97
105
|
},
|
|
98
106
|
list: { options: {} },
|
|
107
|
+
qr: { options: {} },
|
|
99
108
|
remove: { options: {} },
|
|
100
109
|
});
|
|
110
|
+
if (sub.command === 'new') {
|
|
111
|
+
const handle = sub.positionals[0];
|
|
112
|
+
if (!handle)
|
|
113
|
+
throw new ArgsError('portal new: missing handle');
|
|
114
|
+
const policyMode = sub.options['strict'] === true ? 'strict' : 'permissive';
|
|
115
|
+
const passphrase = await askPassphrase();
|
|
116
|
+
try {
|
|
117
|
+
const { address, keyfilePath, policyPath } = portalNew(paths, {
|
|
118
|
+
handle,
|
|
119
|
+
passphrase,
|
|
120
|
+
policyMode,
|
|
121
|
+
...(opts.kdfParams ? { kdfParams: opts.kdfParams } : {}),
|
|
122
|
+
});
|
|
123
|
+
out.write(`generated ${handle} (${address}) → ${keyfilePath}\n`);
|
|
124
|
+
out.write(`policy: ${policyMode} → ${policyPath}\n`);
|
|
125
|
+
if (policyMode === 'strict') {
|
|
126
|
+
out.write(`note: strict policy denies everything until you edit ${policyPath}\n`);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
finally {
|
|
130
|
+
passphrase.fill(0);
|
|
131
|
+
}
|
|
132
|
+
return { code: 0 };
|
|
133
|
+
}
|
|
101
134
|
if (sub.command === 'add') {
|
|
102
135
|
const handle = sub.positionals[0];
|
|
103
136
|
const keyFile = sub.options['key-file'];
|
|
@@ -145,6 +178,27 @@ export async function runCli(opts) {
|
|
|
145
178
|
}
|
|
146
179
|
return { code: 0 };
|
|
147
180
|
}
|
|
181
|
+
if (sub.command === 'qr') {
|
|
182
|
+
const handle = sub.positionals[0];
|
|
183
|
+
if (!handle)
|
|
184
|
+
throw new ArgsError('portal qr: missing handle');
|
|
185
|
+
const passphrase = await askPassphrase();
|
|
186
|
+
let address;
|
|
187
|
+
try {
|
|
188
|
+
address = portalAddress(paths, handle, passphrase);
|
|
189
|
+
}
|
|
190
|
+
finally {
|
|
191
|
+
passphrase.fill(0);
|
|
192
|
+
}
|
|
193
|
+
// Byte mode preserves the address as-is. The earlier alphanumeric
|
|
194
|
+
// encoding uppercased everything, which broke wallets that validate
|
|
195
|
+
// EIP-55 (those reject "0X..." and all-uppercase as invalid).
|
|
196
|
+
const matrix = encodeQr(address);
|
|
197
|
+
out.write(`${handle} — ${address}\n\n`);
|
|
198
|
+
out.write(renderTerminal(matrix));
|
|
199
|
+
out.write(`\n${handle} — ${address}\n`);
|
|
200
|
+
return { code: 0 };
|
|
201
|
+
}
|
|
148
202
|
if (sub.command === 'remove') {
|
|
149
203
|
const handle = sub.positionals[0];
|
|
150
204
|
if (!handle)
|
package/dist/src/cli/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/cli/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAkB,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/cli/main.ts"],"names":[],"mappings":"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"}
|
package/dist/src/cli/portal.d.ts
CHANGED
|
@@ -39,9 +39,28 @@ export declare function portalAdd(paths: SigilPaths, opts: PortalAddOpts): {
|
|
|
39
39
|
keyfilePath: string;
|
|
40
40
|
policyPath: string;
|
|
41
41
|
};
|
|
42
|
+
export interface PortalNewOpts {
|
|
43
|
+
handle: string;
|
|
44
|
+
passphrase: Buffer;
|
|
45
|
+
/** See PortalAddOpts.kdfParams — same test-only knob. */
|
|
46
|
+
kdfParams?: KdfParams;
|
|
47
|
+
/** See PortalAddOpts.policyMode. */
|
|
48
|
+
policyMode?: PolicyMode;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Mint a fresh secp256k1 key inside sigil, encrypt with the passphrase,
|
|
52
|
+
* write the keyfile + policy file. No plaintext key ever lands on disk.
|
|
53
|
+
* The randomness goes through @noble's randomSecretKey() which is uniform
|
|
54
|
+
* over the valid scalar range.
|
|
55
|
+
*/
|
|
56
|
+
export declare function portalNew(paths: SigilPaths, opts: PortalNewOpts): {
|
|
57
|
+
address: string;
|
|
58
|
+
keyfilePath: string;
|
|
59
|
+
policyPath: string;
|
|
60
|
+
};
|
|
42
61
|
export interface PortalInfo {
|
|
43
62
|
handle: string;
|
|
44
|
-
kind: '
|
|
63
|
+
kind: 'evm';
|
|
45
64
|
address: string;
|
|
46
65
|
}
|
|
47
66
|
/**
|
|
@@ -50,6 +69,16 @@ export interface PortalInfo {
|
|
|
50
69
|
* Returns an empty list if the directory doesn't exist.
|
|
51
70
|
*/
|
|
52
71
|
export declare function portalListFromDisk(paths: SigilPaths, passphrase: Buffer): PortalInfo[];
|
|
72
|
+
/**
|
|
73
|
+
* Resolve a single portal's address by decrypting its keyfile, deriving
|
|
74
|
+
* the address, then disposing the secret. Throws if the handle is malformed
|
|
75
|
+
* or the keyfile is missing / can't be decrypted with this passphrase.
|
|
76
|
+
*
|
|
77
|
+
* Used by `sigil portal qr` — same trust model as `portal list`, just
|
|
78
|
+
* scoped to one handle so we don't decrypt the whole keychain to render
|
|
79
|
+
* a single QR.
|
|
80
|
+
*/
|
|
81
|
+
export declare function portalAddress(paths: SigilPaths, handle: string, passphrase: Buffer): string;
|
|
53
82
|
export interface PortalRemoveResult {
|
|
54
83
|
removed: boolean;
|
|
55
84
|
path: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../src/cli/portal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAW,YAAY,EAAa,MAAM,oBAAoB,CAAC;AAGtF,OAAO,EAAE,KAAK,UAAU,EAAkB,MAAM,oBAAoB,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,aAAa,GAClB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../src/cli/portal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAW,YAAY,EAAa,MAAM,oBAAoB,CAAC;AAGtF,OAAO,EAAE,KAAK,UAAU,EAAkB,MAAM,oBAAoB,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB;;;;OAIG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,aAAa,GAClB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAe9D;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,oCAAoC;IACpC,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CACvB,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,aAAa,GAClB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAS9D;AA+CD,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,UAAU,EAAE,CAgBtF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAa3F;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,GACf;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,UAAU,CAAA;CAAE,CAa1C;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,kBAAkB,CAalF;AAqBD,OAAO,EAAE,YAAY,EAAE,CAAC"}
|
package/dist/src/cli/portal.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { existsSync, mkdirSync, readdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
3
|
import { sealKey, SecretBuffer, unsealKey } from '../crypto/index.js';
|
|
4
|
-
import { addressFromPrivateKey } from '../eth/index.js';
|
|
4
|
+
import { addressFromPrivateKey, randomSecretKey } from '../eth/index.js';
|
|
5
5
|
import { HandleTable } from '../daemon/handles.js';
|
|
6
6
|
import { policyTemplate } from '../policy/index.js';
|
|
7
7
|
/**
|
|
@@ -14,39 +14,66 @@ import { policyTemplate } from '../policy/index.js';
|
|
|
14
14
|
* - 64 hex characters (optionally 0x-prefixed, optionally with trailing whitespace)
|
|
15
15
|
*/
|
|
16
16
|
export function portalAdd(paths, opts) {
|
|
17
|
-
|
|
17
|
+
const raw = readFileSync(opts.keyFile);
|
|
18
|
+
const priv = normalizePrivateKey(raw);
|
|
19
|
+
const result = provisionPortal(paths, {
|
|
20
|
+
handle: opts.handle,
|
|
21
|
+
priv,
|
|
22
|
+
passphrase: opts.passphrase,
|
|
23
|
+
policyMode: opts.policyMode ?? 'permissive',
|
|
24
|
+
...(opts.kdfParams ? { kdfParams: opts.kdfParams } : {}),
|
|
25
|
+
});
|
|
26
|
+
if (opts.removeSource !== false) {
|
|
27
|
+
try {
|
|
28
|
+
unlinkSync(opts.keyFile);
|
|
29
|
+
}
|
|
30
|
+
catch { /* best-effort cleanup; file may already be gone */ }
|
|
31
|
+
}
|
|
32
|
+
return result;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Mint a fresh secp256k1 key inside sigil, encrypt with the passphrase,
|
|
36
|
+
* write the keyfile + policy file. No plaintext key ever lands on disk.
|
|
37
|
+
* The randomness goes through @noble's randomSecretKey() which is uniform
|
|
38
|
+
* over the valid scalar range.
|
|
39
|
+
*/
|
|
40
|
+
export function portalNew(paths, opts) {
|
|
41
|
+
const priv = randomSecretKey();
|
|
42
|
+
return provisionPortal(paths, {
|
|
43
|
+
handle: opts.handle,
|
|
44
|
+
priv,
|
|
45
|
+
passphrase: opts.passphrase,
|
|
46
|
+
policyMode: opts.policyMode ?? 'permissive',
|
|
47
|
+
...(opts.kdfParams ? { kdfParams: opts.kdfParams } : {}),
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
function provisionPortal(paths, args) {
|
|
51
|
+
HandleTable.parseHandle(args.handle); // validates format
|
|
18
52
|
mkdirSync(paths.keysDir, { recursive: true, mode: 0o700 });
|
|
19
53
|
mkdirSync(paths.policyDir, { recursive: true, mode: 0o700 });
|
|
20
|
-
const destPath = join(paths.keysDir, `${
|
|
54
|
+
const destPath = join(paths.keysDir, `${args.handle}.sigil`);
|
|
21
55
|
if (existsSync(destPath)) {
|
|
22
|
-
|
|
56
|
+
args.priv.fill(0);
|
|
57
|
+
throw new Error(`portal "${args.handle}" already exists at ${destPath}; remove it first`);
|
|
23
58
|
}
|
|
24
|
-
const policyPath = join(paths.policyDir, `${
|
|
59
|
+
const policyPath = join(paths.policyDir, `${args.handle}.toml`);
|
|
25
60
|
if (existsSync(policyPath)) {
|
|
26
|
-
|
|
61
|
+
args.priv.fill(0);
|
|
62
|
+
throw new Error(`policy file for "${args.handle}" already exists at ${policyPath}; remove it first`);
|
|
27
63
|
}
|
|
28
|
-
const raw = readFileSync(opts.keyFile);
|
|
29
|
-
const priv = normalizePrivateKey(raw);
|
|
30
64
|
let address;
|
|
31
65
|
try {
|
|
32
|
-
address = addressFromPrivateKey(priv);
|
|
33
|
-
const sealed =
|
|
34
|
-
? sealKey(priv,
|
|
35
|
-
: sealKey(priv,
|
|
66
|
+
address = addressFromPrivateKey(args.priv);
|
|
67
|
+
const sealed = args.kdfParams
|
|
68
|
+
? sealKey(args.priv, args.passphrase, args.kdfParams)
|
|
69
|
+
: sealKey(args.priv, args.passphrase);
|
|
36
70
|
writeFileSync(destPath, sealed, { mode: 0o600 });
|
|
37
71
|
}
|
|
38
72
|
finally {
|
|
39
|
-
priv.fill(0);
|
|
40
|
-
}
|
|
41
|
-
// Write the policy file alongside the keyfile. Mode 0o600 — it's not secret
|
|
42
|
-
// per se, but it does describe what this key can sign, which is sensitive.
|
|
43
|
-
writeFileSync(policyPath, policyTemplate(opts.policyMode ?? 'permissive'), { mode: 0o600 });
|
|
44
|
-
if (opts.removeSource !== false) {
|
|
45
|
-
try {
|
|
46
|
-
unlinkSync(opts.keyFile);
|
|
47
|
-
}
|
|
48
|
-
catch { /* best-effort cleanup; file may already be gone */ }
|
|
73
|
+
args.priv.fill(0);
|
|
49
74
|
}
|
|
75
|
+
// Mode 0o600 — the policy file describes what this key can sign, which is sensitive.
|
|
76
|
+
writeFileSync(policyPath, policyTemplate(args.policyMode), { mode: 0o600 });
|
|
50
77
|
return { address, keyfilePath: destPath, policyPath };
|
|
51
78
|
}
|
|
52
79
|
/**
|
|
@@ -66,7 +93,7 @@ export function portalListFromDisk(paths, passphrase) {
|
|
|
66
93
|
const blob = readFileSync(join(paths.keysDir, filename));
|
|
67
94
|
const sb = unsealKey(blob, passphrase);
|
|
68
95
|
try {
|
|
69
|
-
out.push({ handle, kind: '
|
|
96
|
+
out.push({ handle, kind: 'evm', address: addressFromPrivateKey(sb.bytes()) });
|
|
70
97
|
}
|
|
71
98
|
finally {
|
|
72
99
|
sb.dispose();
|
|
@@ -74,6 +101,30 @@ export function portalListFromDisk(paths, passphrase) {
|
|
|
74
101
|
}
|
|
75
102
|
return out;
|
|
76
103
|
}
|
|
104
|
+
/**
|
|
105
|
+
* Resolve a single portal's address by decrypting its keyfile, deriving
|
|
106
|
+
* the address, then disposing the secret. Throws if the handle is malformed
|
|
107
|
+
* or the keyfile is missing / can't be decrypted with this passphrase.
|
|
108
|
+
*
|
|
109
|
+
* Used by `sigil portal qr` — same trust model as `portal list`, just
|
|
110
|
+
* scoped to one handle so we don't decrypt the whole keychain to render
|
|
111
|
+
* a single QR.
|
|
112
|
+
*/
|
|
113
|
+
export function portalAddress(paths, handle, passphrase) {
|
|
114
|
+
HandleTable.parseHandle(handle);
|
|
115
|
+
const keyfilePath = join(paths.keysDir, `${handle}.sigil`);
|
|
116
|
+
if (!existsSync(keyfilePath)) {
|
|
117
|
+
throw new Error(`portal "${handle}" not found at ${keyfilePath}`);
|
|
118
|
+
}
|
|
119
|
+
const blob = readFileSync(keyfilePath);
|
|
120
|
+
const sb = unsealKey(blob, passphrase);
|
|
121
|
+
try {
|
|
122
|
+
return addressFromPrivateKey(sb.bytes());
|
|
123
|
+
}
|
|
124
|
+
finally {
|
|
125
|
+
sb.dispose();
|
|
126
|
+
}
|
|
127
|
+
}
|
|
77
128
|
/**
|
|
78
129
|
* Provision a policy file for an existing portal whose keyfile is on disk
|
|
79
130
|
* but whose policy got lost (older sigil versions, manual deletion, etc).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portal.js","sourceRoot":"","sources":["../../../src/cli/portal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAY,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAChH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAkB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"portal.js","sourceRoot":"","sources":["../../../src/cli/portal.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,12 @@ export interface ControlServerOpts {
|
|
|
4
4
|
socketPath: string;
|
|
5
5
|
/** Directory of encrypted keyfiles to load on unlock. */
|
|
6
6
|
keysDir: string;
|
|
7
|
+
/**
|
|
8
|
+
* Directory of per-portal policy TOMLs. Used to migrate legacy `eth:*.toml`
|
|
9
|
+
* filenames alongside the matching `eth:*.sigil` keyfiles when the handle
|
|
10
|
+
* prefix is renamed.
|
|
11
|
+
*/
|
|
12
|
+
policyDir: string;
|
|
7
13
|
/** Live HandleTable shared with the MCP server. */
|
|
8
14
|
handles: HandleTable;
|
|
9
15
|
/** Optional log sink — defaults to no-op. */
|
|
@@ -32,6 +38,10 @@ export type ControlLogEvent = {
|
|
|
32
38
|
} | {
|
|
33
39
|
kind: 'bind_error';
|
|
34
40
|
error: string;
|
|
41
|
+
} | {
|
|
42
|
+
kind: 'legacy_handle_migrated';
|
|
43
|
+
from: string;
|
|
44
|
+
to: string;
|
|
35
45
|
};
|
|
36
46
|
export interface ControlServerHandle {
|
|
37
47
|
/** Returns when the server socket is closed (and the file unlinked). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/control/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/control/server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmB,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAWpE,MAAM,WAAW,iBAAiB;IAChC,oCAAoC;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,mDAAmD;IACnD,OAAO,EAAE,WAAW,CAAC;IACrB,6CAA6C;IAC7C,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IACzC,4CAA4C;IAC5C,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,wBAAwB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjE,MAAM,WAAW,mBAAmB;IAClC,wEAAwE;IACxE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,2DAA2D;IAC3D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA8B9F"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { chmodSync, existsSync, unlinkSync } from 'node:fs';
|
|
1
|
+
import { chmodSync, existsSync, readdirSync, renameSync, unlinkSync } from 'node:fs';
|
|
2
2
|
import { createConnection, createServer } from 'node:net';
|
|
3
|
+
import { join } from 'node:path';
|
|
3
4
|
import { HandleLoadError } from '../daemon/handles.js';
|
|
4
5
|
import { CONTROL_SOCKET_VERSION, parseControlRequest, } from './protocol.js';
|
|
5
6
|
/**
|
|
@@ -165,6 +166,18 @@ function doUnlock(passphraseB64, opts, pid) {
|
|
|
165
166
|
catch {
|
|
166
167
|
return { ok: false, code: 'INVALID_REQUEST', error: 'passphraseB64 is not valid base64' };
|
|
167
168
|
}
|
|
169
|
+
// One-shot, idempotent migration of legacy "eth:" handle prefixes to "evm:".
|
|
170
|
+
// Pre-0.0.8 sigil named EVM-family keyfiles "eth:<name>.sigil" + matching
|
|
171
|
+
// policy "eth:<name>.toml". Same secp256k1 key, same address — the prefix
|
|
172
|
+
// is purely cosmetic, so we rename in place before loadFromDir runs (it
|
|
173
|
+
// expects the new prefix). Safe to run on every unlock: no-op if there's
|
|
174
|
+
// nothing matching the old pattern.
|
|
175
|
+
try {
|
|
176
|
+
migrateLegacyEthPrefix(opts.keysDir, opts.policyDir, (from, to) => opts.onLog?.({ kind: 'legacy_handle_migrated', from, to }));
|
|
177
|
+
}
|
|
178
|
+
catch (err) {
|
|
179
|
+
return { ok: false, code: 'INTERNAL', error: `legacy-handle migration failed: ${err.message}` };
|
|
180
|
+
}
|
|
168
181
|
try {
|
|
169
182
|
opts.handles.loadFromDir(opts.keysDir, passphrase);
|
|
170
183
|
}
|
|
@@ -184,6 +197,46 @@ function doUnlock(passphraseB64, opts, pid) {
|
|
|
184
197
|
}
|
|
185
198
|
return statusResponse(opts.handles, pid);
|
|
186
199
|
}
|
|
200
|
+
/**
|
|
201
|
+
* Rename any pre-0.0.8 `eth:<name>.sigil` keyfiles to `evm:<name>.sigil`,
|
|
202
|
+
* plus the matching `eth:<name>.toml` policy file if present. The encrypted
|
|
203
|
+
* bytes are unchanged — same key, same address, same passphrase, same KDF
|
|
204
|
+
* params. Idempotent; safe to call on every unlock.
|
|
205
|
+
*
|
|
206
|
+
* Refuses to clobber an existing target (e.g. someone manually created both
|
|
207
|
+
* `eth:foo.sigil` and `evm:foo.sigil`). On any per-file failure, throws and
|
|
208
|
+
* lets the caller surface a clear error rather than silently half-migrating.
|
|
209
|
+
*/
|
|
210
|
+
function migrateLegacyEthPrefix(keysDir, policyDir, onMigrated) {
|
|
211
|
+
if (!existsSync(keysDir))
|
|
212
|
+
return;
|
|
213
|
+
for (const filename of readdirSync(keysDir)) {
|
|
214
|
+
if (!filename.startsWith('eth:') || !filename.endsWith('.sigil'))
|
|
215
|
+
continue;
|
|
216
|
+
const newName = 'evm:' + filename.slice('eth:'.length);
|
|
217
|
+
const oldKey = join(keysDir, filename);
|
|
218
|
+
const newKey = join(keysDir, newName);
|
|
219
|
+
if (existsSync(newKey)) {
|
|
220
|
+
throw new Error(`cannot migrate ${filename}: ${newName} already exists at ${newKey}; resolve manually before unlocking`);
|
|
221
|
+
}
|
|
222
|
+
renameSync(oldKey, newKey);
|
|
223
|
+
onMigrated(filename, newName);
|
|
224
|
+
// Rename the matching policy file if it exists. Missing policy is fine —
|
|
225
|
+
// `policy init` can re-provision later, and the keyfile migration is the
|
|
226
|
+
// load-blocking half.
|
|
227
|
+
const policyBase = filename.slice(0, -'.sigil'.length);
|
|
228
|
+
const oldPolicy = join(policyDir, policyBase + '.toml');
|
|
229
|
+
if (existsSync(oldPolicy)) {
|
|
230
|
+
const newPolicyBase = 'evm:' + policyBase.slice('eth:'.length);
|
|
231
|
+
const newPolicy = join(policyDir, newPolicyBase + '.toml');
|
|
232
|
+
if (existsSync(newPolicy)) {
|
|
233
|
+
throw new Error(`cannot migrate ${policyBase}.toml: ${newPolicyBase}.toml already exists at ${newPolicy}`);
|
|
234
|
+
}
|
|
235
|
+
renameSync(oldPolicy, newPolicy);
|
|
236
|
+
onMigrated(policyBase + '.toml', newPolicyBase + '.toml');
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
187
240
|
function statusResponse(handles, pid) {
|
|
188
241
|
const portals = handles.isUnlocked()
|
|
189
242
|
? handles.list().map((p) => ({ handle: p.handle, kind: p.kind, address: p.address }))
|