layerbase 1.5.1 → 2.0.1
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 +19 -2
- package/dist/cli.js +17 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/clone.js +3 -2
- package/dist/commands/clone.js.map +1 -1
- package/dist/commands/cloud-branch.js +2 -2
- package/dist/commands/cloud-branch.js.map +1 -1
- package/dist/commands/cloud-write.js +2 -2
- package/dist/commands/cloud-write.js.map +1 -1
- package/dist/commands/connect.js +3 -2
- package/dist/commands/connect.js.map +1 -1
- package/dist/commands/connection-string.js +6 -0
- package/dist/commands/connection-string.js.map +1 -1
- package/dist/commands/interactive.js +2 -1
- package/dist/commands/interactive.js.map +1 -1
- package/dist/commands/ls.js +5 -2
- package/dist/commands/ls.js.map +1 -1
- package/dist/commands/promote.js +2 -2
- package/dist/commands/promote.js.map +1 -1
- package/dist/lib/cli-output.js +29 -4
- package/dist/lib/cli-output.js.map +1 -1
- package/dist/lib/format.js +13 -3
- package/dist/lib/format.js.map +1 -1
- package/dist/lib/redact.js +103 -0
- package/dist/lib/redact.js.map +1 -1
- package/dist/lib/run-spindb.js +6 -1
- package/dist/lib/run-spindb.js.map +1 -1
- package/package.json +1 -1
- package/skills/layerbase/SKILL.md +14 -1
package/README.md
CHANGED
|
@@ -94,12 +94,24 @@ These are the only verbs layerbase owns; everything else is spindb.
|
|
|
94
94
|
`<db>` accepts a cloud database id or its name. Add `--print` to
|
|
95
95
|
`cloud connect` to show the connection details instead of launching a client.
|
|
96
96
|
|
|
97
|
+
**Connection strings print redacted.** Anywhere the CLI prints one - `cloud ls
|
|
98
|
+
--json`, `cloud create`, `cloud branch`, `promote`, error messages - the
|
|
99
|
+
password is replaced with `****` (`postgresql://shop:****@host:5432/shop`), so a
|
|
100
|
+
transcript, a CI log or a support paste carries no working credential. Pass
|
|
101
|
+
`--show-secrets` (alias `--reveal`) to print them in full. The same masking
|
|
102
|
+
covers the discrete credential fields the API returns beside a connection
|
|
103
|
+
string (`password`, `restToken`, `psPassword`). The one exception is
|
|
104
|
+
`cloud connection-string` (alias `url`), the deliberate escape hatch for piping
|
|
105
|
+
a credential into an app: it always prints in full.
|
|
106
|
+
|
|
97
107
|
`cloud ls` lists databases **and their branches** in one table. When the account
|
|
98
108
|
has branches, a `PARENT` column names each branch's parent database (`-` on a
|
|
99
109
|
primary) and a footer splits the rows, because branches do not count toward your
|
|
100
110
|
plan's database limit: never read the row count as your database count. In
|
|
101
111
|
`--json`, a branch is any row with `parentId` set (`parentName` names its
|
|
102
|
-
parent); rows are passed through from the API
|
|
112
|
+
parent); rows are passed through from the API with the connection-string
|
|
113
|
+
password and the discrete credential fields (`password`, `restToken`,
|
|
114
|
+
`psPassword`) masked as `****` (`--show-secrets` keeps the real values).
|
|
103
115
|
`lbase cloud` with no subcommand prints the cloud help. Cloud mutation commands
|
|
104
116
|
(`create`, `delete`, `start`, `stop`, `branch`) run against the cloud API and
|
|
105
117
|
need an API key (see [Headless auth](#headless-auth-ci-and-agents)); every one
|
|
@@ -280,7 +292,9 @@ env:
|
|
|
280
292
|
steps:
|
|
281
293
|
- run: npm i -g layerbase
|
|
282
294
|
- run: |
|
|
283
|
-
|
|
295
|
+
# --show-secrets: without it connectionString comes back with the
|
|
296
|
+
# password masked (****) and is not connectable.
|
|
297
|
+
DB=$(lbase cloud create "ci-$GITHUB_RUN_ID" --engine postgresql --ttl 2h --json --show-secrets)
|
|
284
298
|
echo "DATABASE_URL=$(echo "$DB" | jq -r .connectionString)" >> "$GITHUB_ENV"
|
|
285
299
|
- run: npm test
|
|
286
300
|
- if: always()
|
|
@@ -345,6 +359,9 @@ deleted on exit. The password is never an argv value.
|
|
|
345
359
|
| Redis / Valkey | `REDISCLI_AUTH` environment variable |
|
|
346
360
|
| Other engines | `layerbase cloud connection-string` / `--print` |
|
|
347
361
|
|
|
362
|
+
Everything the CLI PRINTS is redacted by default for the same reason: see
|
|
363
|
+
[Connection strings print redacted](#cloud-account) above.
|
|
364
|
+
|
|
348
365
|
Connecting requires the engine's native client (`psql`, `mysql`, `redis-cli`)
|
|
349
366
|
on your `PATH`.
|
|
350
367
|
|
package/dist/cli.js
CHANGED
|
@@ -10,6 +10,7 @@ import { runSpindb } from './lib/run-spindb.js';
|
|
|
10
10
|
import { registeredCommandNames } from './lib/commands.js';
|
|
11
11
|
import { getVersion } from './lib/version.js';
|
|
12
12
|
import { configureCloudAuth } from './lib/cloud-api.js';
|
|
13
|
+
import { setRevealSecrets } from './lib/cli-output.js';
|
|
13
14
|
import { runWhoami } from './commands/whoami-run.js';
|
|
14
15
|
import { runKeyLogin } from './commands/key-login.js';
|
|
15
16
|
import { runCreate, runDestroy, runStart, runStop, } from './commands/cloud-write.js';
|
|
@@ -51,6 +52,11 @@ const UNIFIED_HELP = `
|
|
|
51
52
|
browser: calls go straight to the cloud API. "layerbase login --api-key
|
|
52
53
|
<key>" saves it. Create a key at https://layerbase.com/cloud/settings.
|
|
53
54
|
|
|
55
|
+
Secrets
|
|
56
|
+
Connection strings and passwords print redacted (user:****@host). Pass
|
|
57
|
+
--show-secrets (alias --reveal) to print them in full. "cloud
|
|
58
|
+
connection-string" is the deliberate escape hatch and always prints in full.
|
|
59
|
+
|
|
54
60
|
Notes
|
|
55
61
|
bare = spindb, cloud = "lbase cloud <verb>"
|
|
56
62
|
"lbase --help" / "--version" show this help / the layerbase version.
|
|
@@ -86,6 +92,10 @@ const CLOUD_HELP = `
|
|
|
86
92
|
|
|
87
93
|
"<db>" accepts a cloud database id or its name. Set LAYERBASE_API_KEY (or pass
|
|
88
94
|
--api-key) to run these headlessly with no browser login.
|
|
95
|
+
|
|
96
|
+
Connection strings print with the password redacted (user:****@host). Pass
|
|
97
|
+
--show-secrets (alias --reveal) to print them in full. "cloud
|
|
98
|
+
connection-string" is the deliberate escape hatch and always prints in full.
|
|
89
99
|
`;
|
|
90
100
|
const MIGRATE_HELP = `
|
|
91
101
|
layerbase migrate - import an external database INTO a cloud database
|
|
@@ -341,11 +351,18 @@ const cli = meow(UNIFIED_HELP, {
|
|
|
341
351
|
token: { type: 'string' },
|
|
342
352
|
url: { type: 'string' },
|
|
343
353
|
dbPassword: { type: 'string' },
|
|
354
|
+
// Print connection strings with their password instead of the default
|
|
355
|
+
// `****` (issue #53). `--reveal` is the short alias.
|
|
356
|
+
showSecrets: { type: 'boolean', default: false },
|
|
357
|
+
reveal: { type: 'boolean', default: false },
|
|
344
358
|
},
|
|
345
359
|
});
|
|
346
360
|
// The --api-key flag wins over LAYERBASE_API_KEY and the stored key, and
|
|
347
361
|
// --api-url over the stored host. Set once before any cloud command runs.
|
|
348
362
|
configureCloudAuth({ apiKey: cli.flags.apiKey, apiUrl: cli.flags.apiUrl });
|
|
363
|
+
// Redaction is the default for everything printed from here on; this is the
|
|
364
|
+
// single opt-out, set before any command runs (see lib/cli-output).
|
|
365
|
+
setRevealSecrets(Boolean(cli.flags.showSecrets || cli.flags.reveal));
|
|
349
366
|
const EXEC_COMMANDS = new Set(['psql', 'redis-cli', 'mysql']);
|
|
350
367
|
const [command = '', ...rest] = cli.input;
|
|
351
368
|
if (command === 'help') {
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EACL,SAAS,EACT,UAAU,EACV,QAAQ,EACR,OAAO,GACR,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAG/C,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;AAE5B,MAAM,YAAY,GAAG;cACP,OAAO
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/clone.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getConnectionInfo } from '../lib/cloud-api.js';
|
|
2
2
|
import { buildConnectionString } from '../lib/format.js';
|
|
3
3
|
import { runSpindb, spindbExists } from '../lib/run-spindb.js';
|
|
4
|
+
import { forOutput } from '../lib/cli-output.js';
|
|
4
5
|
// spindb reads the remote connection string from this env var (--from-env), so
|
|
5
6
|
// the password is never on argv / in shell history.
|
|
6
7
|
const CLONE_ENV = 'LAYERBASE_CLONE_URL';
|
|
@@ -16,7 +17,7 @@ export async function runClone(options) {
|
|
|
16
17
|
info = await getConnectionInfo(dbRef);
|
|
17
18
|
}
|
|
18
19
|
catch (error) {
|
|
19
|
-
process.stderr.write(`${error.message}\n`);
|
|
20
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
20
21
|
return 1;
|
|
21
22
|
}
|
|
22
23
|
let connectionString;
|
|
@@ -24,7 +25,7 @@ export async function runClone(options) {
|
|
|
24
25
|
connectionString = buildConnectionString(info);
|
|
25
26
|
}
|
|
26
27
|
catch (error) {
|
|
27
|
-
process.stderr.write(`${error.message}\n`);
|
|
28
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
28
29
|
return 1;
|
|
29
30
|
}
|
|
30
31
|
const localName = options.localName ?? info.database ?? dbRef;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/commands/clone.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/commands/clone.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createBranch, deleteBranch, listBranches, resetBranch, resolveDatabaseId, } from '../lib/cloud-api.js';
|
|
2
|
-
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
2
|
+
import { forOutput, reportError, writeJson } from '../lib/cli-output.js';
|
|
3
3
|
const BRANCH_USAGE = 'Usage:\n' +
|
|
4
4
|
' layerbase cloud branch <db> <branch-name> Create/reuse a branch\n' +
|
|
5
5
|
' layerbase cloud branch reset <db> <name> Re-fork a branch from parent\n' +
|
|
@@ -8,7 +8,7 @@ const BRANCH_USAGE = 'Usage:\n' +
|
|
|
8
8
|
function printBranch(branch) {
|
|
9
9
|
process.stdout.write(`${branch.name} (${branch.status})\n`);
|
|
10
10
|
if (branch.connectionString) {
|
|
11
|
-
process.stdout.write(`${branch.connectionString}\n`);
|
|
11
|
+
process.stdout.write(`${forOutput(branch.connectionString)}\n`);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
async function runBranchCreate(db, name, json, action) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-branch.js","sourceRoot":"","sources":["../../src/commands/cloud-branch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,iBAAiB,GAClB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"cloud-branch.js","sourceRoot":"","sources":["../../src/commands/cloud-branch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createDatabase, destroyDatabase, resolveDatabaseId, startDatabase, stopDatabase, } from '../lib/cloud-api.js';
|
|
2
2
|
import { parseTtlToHours } from '../lib/duration.js';
|
|
3
|
-
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
3
|
+
import { forOutput, reportError, writeJson } from '../lib/cli-output.js';
|
|
4
4
|
import { confirm } from '../lib/confirm.js';
|
|
5
5
|
function expiresAtOf(result) {
|
|
6
6
|
return result.expiresAt ?? result.expires_at ?? null;
|
|
@@ -58,7 +58,7 @@ export async function runCreate(options) {
|
|
|
58
58
|
process.stdout.write(`Expires: ${expiresAt}\n`);
|
|
59
59
|
}
|
|
60
60
|
if (result.connectionString) {
|
|
61
|
-
process.stdout.write(`\n${result.connectionString}\n`);
|
|
61
|
+
process.stdout.write(`\n${forOutput(result.connectionString)}\n`);
|
|
62
62
|
}
|
|
63
63
|
return 0;
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-write.js","sourceRoot":"","sources":["../../src/commands/cloud-write.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,YAAY,GACb,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"cloud-write.js","sourceRoot":"","sources":["../../src/commands/cloud-write.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/connect.js
CHANGED
|
@@ -5,6 +5,7 @@ import { getConnectionInfo } from '../lib/cloud-api.js';
|
|
|
5
5
|
import { buildLaunchPlan } from '../lib/engines.js';
|
|
6
6
|
import { runClient } from '../lib/launch.js';
|
|
7
7
|
import { printConnectionInfo } from '../lib/format.js';
|
|
8
|
+
import { forOutput } from '../lib/cli-output.js';
|
|
8
9
|
// Resolve a database and hand the TTY to its native client. Returns the client's
|
|
9
10
|
// exit code (or 1 on a resolve/launch error) WITHOUT exiting the process, so it
|
|
10
11
|
// is reusable from both the CLI path and the interactive menu. Ink renders only
|
|
@@ -19,7 +20,7 @@ export async function connectToDatabase(options) {
|
|
|
19
20
|
}
|
|
20
21
|
catch (error) {
|
|
21
22
|
spinner.unmount();
|
|
22
|
-
process.stderr.write(`${error.message}\n`);
|
|
23
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
23
24
|
return 1;
|
|
24
25
|
}
|
|
25
26
|
spinner.unmount();
|
|
@@ -32,7 +33,7 @@ export async function connectToDatabase(options) {
|
|
|
32
33
|
plan = buildLaunchPlan({ info, command });
|
|
33
34
|
}
|
|
34
35
|
catch (error) {
|
|
35
|
-
process.stderr.write(`${error.message}\n`);
|
|
36
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
36
37
|
return 1;
|
|
37
38
|
}
|
|
38
39
|
return runClient(plan);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAQ5C,iFAAiF;AACjF,gFAAgF;AAChF,gFAAgF;AAChF,+EAA+E;AAC/E,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAIvC;IACC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAEzC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAC,UAAU,IAAC,KAAK,EAAE,aAAa,KAAK,KAAK,GAAI,CAAC,CAAA;IACtE,IAAI,IAAI,CAAA;IACR,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAA;IACvC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,OAAO,EAAE,CAAA;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAE,KAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChE,OAAO,CAAC,CAAA;IACV,CAAC;IACD,OAAO,CAAC,OAAO,EAAE,CAAA;IAEjB,IAAI,KAAK,EAAE,CAAC;QACV,mBAAmB,CAAC,IAAI,CAAC,CAAA;QACzB,OAAO,CAAC,CAAA;IACV,CAAC;IAED,IAAI,IAAI,CAAA;IACR,IAAI,CAAC;QACH,IAAI,GAAG,eAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAE,KAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAChE,OAAO,CAAC,CAAA;IACV,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,CAAC,CAAA;AACxB,CAAC;AAED,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAoB;IAChD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;IAClC,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAE7B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,OAAO,SAAS,CAAC,CAAA;QAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IAC5E,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACpB,CAAC"}
|
|
@@ -6,6 +6,12 @@ import { reportError } from '../lib/cli-output.js';
|
|
|
6
6
|
// Opt-in escape hatch: prints the full connection string (with password) to
|
|
7
7
|
// stdout for piping into an app. With --json it prints { connectionString }.
|
|
8
8
|
// The secure path is `layerbase connect`.
|
|
9
|
+
//
|
|
10
|
+
// This is the ONE surface exempt from the default redaction added for issue
|
|
11
|
+
// #53: the user typed the command whose entire contract is "hand me the
|
|
12
|
+
// credential", and `printConnectionInfo` points them here for exactly that.
|
|
13
|
+
// Everything else redacts, which is why this writes stdout directly instead of
|
|
14
|
+
// going through writeJson - do not "tidy" it onto the shared writer.
|
|
9
15
|
export function ConnectionString({ dbRef, json, }) {
|
|
10
16
|
const { exit } = useApp();
|
|
11
17
|
const [state, setState] = useState({ kind: 'loading' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-string.js","sourceRoot":"","sources":["../../src/commands/connection-string.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAI9C,4EAA4E;AAC5E,6EAA6E;AAC7E,0CAA0C;AAC1C,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,IAAI,GAIL;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAA;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,UAAU,6BAA6B;YAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,QAAQ,GAAG,WAAW,CAC5B,IAAI,KAAK,CAAC,+CAA+C,CAAC,EAC1D,IAAI,CACL,CAAA;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC1B,OAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAA;gBAC3C,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBACpD,IAAI,IAAI,EAAE,CAAC;oBACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC,IAAI,CAAC,CAAA;gBACnE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,IAAI,CAAC,CAAA;gBAC/C,CAAC;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAC3C,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,6BAA6B,EAAE,CAAA;IACjC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,EAAE,CAAA;QACR,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
1
|
+
{"version":3,"file":"connection-string.js","sourceRoot":"","sources":["../../src/commands/connection-string.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAI9C,4EAA4E;AAC5E,6EAA6E;AAC7E,0CAA0C;AAC1C,EAAE;AACF,4EAA4E;AAC5E,wEAAwE;AACxE,4EAA4E;AAC5E,+EAA+E;AAC/E,qEAAqE;AACrE,MAAM,UAAU,gBAAgB,CAAC,EAC/B,KAAK,EACL,IAAI,GAIL;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAA;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAE9D,SAAS,CAAC,GAAG,EAAE;QACb,KAAK,UAAU,6BAA6B;YAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,QAAQ,GAAG,WAAW,CAC5B,IAAI,KAAK,CAAC,+CAA+C,CAAC,EAC1D,IAAI,CACL,CAAA;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC1B,OAAM;YACR,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAA;gBAC3C,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAA;gBACpD,IAAI,IAAI,EAAE,CAAC;oBACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC,IAAI,CAAC,CAAA;gBACnE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,gBAAgB,IAAI,CAAC,CAAA;gBAC/C,CAAC;gBACD,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAC3C,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,6BAA6B,EAAE,CAAA;IACjC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,IAAI,EAAE,CAAA;QACR,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAA;IAEjB,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -13,6 +13,7 @@ import { runSpindb } from '../lib/run-spindb.js';
|
|
|
13
13
|
import { connectToDatabase } from '../commands/connect.js';
|
|
14
14
|
import { runClone } from '../commands/clone.js';
|
|
15
15
|
import { App } from '../ui/app.js';
|
|
16
|
+
import { forOutput } from '../lib/cli-output.js';
|
|
16
17
|
const ACCENT_ANSI = '\x1b[38;2;124;156;255m';
|
|
17
18
|
const DIM = '\x1b[2m';
|
|
18
19
|
const RESET = '\x1b[0m';
|
|
@@ -75,7 +76,7 @@ async function selectDatabase() {
|
|
|
75
76
|
}
|
|
76
77
|
catch (error) {
|
|
77
78
|
spinner.unmount();
|
|
78
|
-
process.stderr.write(`${error.message}\n`);
|
|
79
|
+
process.stderr.write(`${forOutput(error.message)}\n`);
|
|
79
80
|
return null;
|
|
80
81
|
}
|
|
81
82
|
spinner.unmount();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/commands/interactive.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/commands/interactive.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/ls.js
CHANGED
|
@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
|
|
|
3
3
|
import { Box, Text, useApp } from 'ink';
|
|
4
4
|
import Spinner from 'ink-spinner';
|
|
5
5
|
import { listDatabases } from '../lib/cloud-api.js';
|
|
6
|
-
import { reportError } from '../lib/cli-output.js';
|
|
6
|
+
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
7
7
|
import { hasBranches, parentLabel, summaryLine } from '../lib/database-list.js';
|
|
8
8
|
const STATUS_COLOR = {
|
|
9
9
|
running: 'green',
|
|
@@ -45,7 +45,10 @@ export function List({ json }) {
|
|
|
45
45
|
try {
|
|
46
46
|
const databases = await listDatabases();
|
|
47
47
|
if (json) {
|
|
48
|
-
|
|
48
|
+
// writeJson, not a raw stringify: the cloud list carries each
|
|
49
|
+
// database's connection string, password and all, and this is the
|
|
50
|
+
// output issue #53 was filed about.
|
|
51
|
+
writeJson(databases);
|
|
49
52
|
}
|
|
50
53
|
setState({ kind: 'ready', databases });
|
|
51
54
|
}
|
package/dist/commands/ls.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/commands/ls.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,OAAO,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/commands/ls.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/promote.js
CHANGED
|
@@ -4,7 +4,7 @@ import { join, resolve } from 'node:path';
|
|
|
4
4
|
import { CloudApiError, createDatabase, getConnectionInfo, listDatabases, listEngines, webAppBaseUrl, } from '../lib/cloud-api.js';
|
|
5
5
|
import { captureSpindb, parseLastJson } from '../lib/run-spindb.js';
|
|
6
6
|
import { confirm, decideConfirmation } from '../lib/confirm.js';
|
|
7
|
-
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
7
|
+
import { forOutput, reportError, writeJson } from '../lib/cli-output.js';
|
|
8
8
|
import { formatBytes, uploadAndImport } from '../commands/import.js';
|
|
9
9
|
import { writeEnvAssignment } from '../lib/env-file.js';
|
|
10
10
|
import { classifySource, deriveDatabaseName, describeSource, mapTargetEngine, parseSqliteTarget, probePath, sourceEngineVersion, } from '../lib/promote-source.js';
|
|
@@ -361,7 +361,7 @@ export async function runPromote(options) {
|
|
|
361
361
|
process.stdout.write(`\nPromoted ${describeSource(source)} into "${created.name}" ` +
|
|
362
362
|
`(${formatBytes(imported.bytesUploaded)}).\n\n`);
|
|
363
363
|
if (connectionString)
|
|
364
|
-
process.stdout.write(`${connectionString}\n\n`);
|
|
364
|
+
process.stdout.write(`${forOutput(connectionString)}\n\n`);
|
|
365
365
|
process.stdout.write(`Dashboard: ${url}\n`);
|
|
366
366
|
process.stdout.write(`${WHAT_HAPPENS_NEXT}\n`);
|
|
367
367
|
if (envAction) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../src/commands/promote.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../src/commands/promote.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/cli-output.js
CHANGED
|
@@ -1,19 +1,39 @@
|
|
|
1
1
|
import { CloudApiError, exitCodeForStatus } from '../lib/cloud-api.js';
|
|
2
|
+
import { redactConnectionUri, redactJsonSecrets } from '../lib/redact.js';
|
|
3
|
+
// Whether the user asked for secrets in the clear (`--show-secrets` / `--reveal`).
|
|
4
|
+
// Set ONCE from cli.tsx right after the flags are parsed, before any command
|
|
5
|
+
// runs. A module-level switch rather than a prop threaded through every command
|
|
6
|
+
// on purpose: this is the output boundary, and the security property we want is
|
|
7
|
+
// "a surface that forgets to opt in is redacted", not "a surface that forgets to
|
|
8
|
+
// opt in leaks".
|
|
9
|
+
let revealSecrets = false;
|
|
10
|
+
export function setRevealSecrets(reveal) {
|
|
11
|
+
revealSecrets = reveal;
|
|
12
|
+
}
|
|
13
|
+
export function secretsRevealed() {
|
|
14
|
+
return revealSecrets;
|
|
15
|
+
}
|
|
16
|
+
// A connection string on its way to stdout: verbatim when the user asked for it,
|
|
17
|
+
// password-redacted otherwise.
|
|
18
|
+
export function forOutput(value) {
|
|
19
|
+
return revealSecrets ? value : redactConnectionUri(value);
|
|
20
|
+
}
|
|
2
21
|
// Render an error for a scriptable command: a JSON object on stdout when --json,
|
|
3
22
|
// otherwise a human line on stderr. Returns the exit code the caller should use
|
|
4
23
|
// (script-friendly per exitCodeForStatus for cloud errors, 1 otherwise).
|
|
5
24
|
export function reportError(error, json) {
|
|
6
25
|
if (error instanceof CloudApiError) {
|
|
7
26
|
const { status, code, message } = error.info;
|
|
27
|
+
const safe = forOutput(message);
|
|
8
28
|
if (json) {
|
|
9
|
-
process.stdout.write(`${JSON.stringify({ ok: false, error:
|
|
29
|
+
process.stdout.write(`${JSON.stringify({ ok: false, error: safe, code, status })}\n`);
|
|
10
30
|
}
|
|
11
31
|
else {
|
|
12
|
-
process.stderr.write(`${
|
|
32
|
+
process.stderr.write(`${safe}\n`);
|
|
13
33
|
}
|
|
14
34
|
return exitCodeForStatus(status);
|
|
15
35
|
}
|
|
16
|
-
const message = error instanceof Error ? error.message : String(error);
|
|
36
|
+
const message = forOutput(error instanceof Error ? error.message : String(error));
|
|
17
37
|
if (json) {
|
|
18
38
|
process.stdout.write(`${JSON.stringify({ ok: false, error: message })}\n`);
|
|
19
39
|
}
|
|
@@ -22,7 +42,12 @@ export function reportError(error, json) {
|
|
|
22
42
|
}
|
|
23
43
|
return 1;
|
|
24
44
|
}
|
|
45
|
+
// Every --json payload carrying database credentials goes through here, and
|
|
46
|
+
// every one of them is redacted unless --show-secrets was passed (issue #53):
|
|
47
|
+
// the connection string, and the discrete `password` / `restToken` /
|
|
48
|
+
// `psPassword` fields the cloud returns alongside it.
|
|
25
49
|
export function writeJson(value) {
|
|
26
|
-
|
|
50
|
+
const payload = revealSecrets ? value : redactJsonSecrets(value);
|
|
51
|
+
process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
|
|
27
52
|
}
|
|
28
53
|
//# sourceMappingURL=cli-output.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-output.js","sourceRoot":"","sources":["../../src/lib/cli-output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"cli-output.js","sourceRoot":"","sources":["../../src/lib/cli-output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAErE,mFAAmF;AACnF,6EAA6E;AAC7E,gFAAgF;AAChF,gFAAgF;AAChF,iFAAiF;AACjF,iBAAiB;AACjB,IAAI,aAAa,GAAG,KAAK,CAAA;AAEzB,MAAM,UAAU,gBAAgB,CAAC,MAAe;IAC9C,aAAa,GAAG,MAAM,CAAA;AACxB,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,aAAa,CAAA;AACtB,CAAC;AAED,iFAAiF;AACjF,+BAA+B;AAC/B,MAAM,UAAU,SAAS,CAAC,KAAa;IACrC,OAAO,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;AAC3D,CAAC;AAED,iFAAiF;AACjF,gFAAgF;AAChF,yEAAyE;AACzE,MAAM,UAAU,WAAW,CAAC,KAAc,EAAE,IAAa;IACvD,IAAI,KAAK,YAAY,aAAa,EAAE,CAAC;QACnC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;QAC5C,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;QAC/B,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,CAChE,CAAA;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAA;QACnC,CAAC;QACD,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,MAAM,OAAO,GAAG,SAAS,CACvB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAA;IACD,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,CAAA;IAC5E,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,4EAA4E;AAC5E,8EAA8E;AAC9E,qEAAqE;AACrE,sDAAsD;AACtD,MAAM,UAAU,SAAS,CAAC,KAAc;IACtC,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAChE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;AAC/D,CAAC"}
|
package/dist/lib/format.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { secretsRevealed } from '../lib/cli-output.js';
|
|
2
|
+
import { REDACTED_PASSWORD } from '../lib/redact.js';
|
|
1
3
|
const SCHEME_BY_ENGINE = {
|
|
2
4
|
postgresql: 'postgresql',
|
|
3
5
|
cockroachdb: 'postgresql',
|
|
@@ -21,16 +23,24 @@ export function buildConnectionString(info) {
|
|
|
21
23
|
const path = info.database ? `/${info.database}` : '';
|
|
22
24
|
return `${scheme}://${auth}@${info.host}:${info.port}${path}`;
|
|
23
25
|
}
|
|
24
|
-
// Prints connection details for `--print`. The password is masked
|
|
25
|
-
// `layerbase connection-string <db>`
|
|
26
|
+
// Prints connection details for `--print`. The password is masked unless
|
|
27
|
+
// --show-secrets / --reveal was passed; `layerbase cloud connection-string <db>`
|
|
28
|
+
// remains the escape hatch that always reveals it.
|
|
29
|
+
//
|
|
30
|
+
// The mask is the same REDACTED_PASSWORD every other surface uses. It used to
|
|
31
|
+
// be its own eight-asterisk string, which meant the CLI showed a customer two
|
|
32
|
+
// different maskings of the same secret and ignored the flag here.
|
|
26
33
|
export function printConnectionInfo(info) {
|
|
34
|
+
const password = secretsRevealed()
|
|
35
|
+
? info.password
|
|
36
|
+
: `${REDACTED_PASSWORD} (hidden, --show-secrets to reveal)`;
|
|
27
37
|
const lines = [
|
|
28
38
|
`engine ${info.engine}`,
|
|
29
39
|
`host ${info.host}`,
|
|
30
40
|
`port ${info.port}`,
|
|
31
41
|
`database ${info.database}`,
|
|
32
42
|
`username ${info.username}`,
|
|
33
|
-
`password ${
|
|
43
|
+
`password ${password}`,
|
|
34
44
|
`tls ${info.tls === false ? 'off' : 'on'}`,
|
|
35
45
|
];
|
|
36
46
|
process.stdout.write(`${lines.join('\n')}\n`);
|
package/dist/lib/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/lib/format.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/lib/format.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAEhD,MAAM,gBAAgB,GAA2B;IAC/C,UAAU,EAAE,YAAY;IACxB,WAAW,EAAE,YAAY;IACzB,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,OAAO;IACf,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,SAAS;CACpB,CAAA;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAoB;IACxD,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,OAAO,IAAI,CAAC,GAAG,CAAA;IACjB,CAAC;IAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;IAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACb,gDAAgD,IAAI,CAAC,MAAM,KAAK;YAC9D,uDAAuD,CAC1D,CAAA;IACH,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,kBAAkB,CACrE,IAAI,CAAC,QAAQ,CACd,EAAE,CAAA;IACH,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACrD,OAAO,GAAG,MAAM,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,EAAE,CAAA;AAC/D,CAAC;AAED,yEAAyE;AACzE,iFAAiF;AACjF,mDAAmD;AACnD,EAAE;AACF,8EAA8E;AAC9E,8EAA8E;AAC9E,mEAAmE;AACnE,MAAM,UAAU,mBAAmB,CAAC,IAAoB;IACtD,MAAM,QAAQ,GAAG,eAAe,EAAE;QAChC,CAAC,CAAC,IAAI,CAAC,QAAQ;QACf,CAAC,CAAC,GAAG,iBAAiB,qCAAqC,CAAA;IAC7D,MAAM,KAAK,GAAG;QACZ,aAAa,IAAI,CAAC,MAAM,EAAE;QAC1B,aAAa,IAAI,CAAC,IAAI,EAAE;QACxB,aAAa,IAAI,CAAC,IAAI,EAAE;QACxB,aAAa,IAAI,CAAC,QAAQ,EAAE;QAC5B,aAAa,IAAI,CAAC,QAAQ,EAAE;QAC5B,aAAa,QAAQ,EAAE;QACvB,aAAa,IAAI,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE;KACjD,CAAA;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC"}
|
package/dist/lib/redact.js
CHANGED
|
@@ -20,4 +20,107 @@ export function redactSecrets(text, secrets) {
|
|
|
20
20
|
.replace(/\b(?:postgres(?:ql)?|mysql|rediss?|libsql):\/\/\S+/gi, '[redacted connection string]')
|
|
21
21
|
.replace(/Bearer\s+[A-Za-z0-9._-]+/gi, 'Bearer [redacted]');
|
|
22
22
|
}
|
|
23
|
+
// ─── Connection-string passwords ───────────────────────────────────
|
|
24
|
+
//
|
|
25
|
+
// Issue #53: `cloud ls --json` printed every database's connection string with
|
|
26
|
+
// the live password in it, so any transcript, CI log or support paste carried
|
|
27
|
+
// working credentials. Redaction is now the DEFAULT for everything the CLI
|
|
28
|
+
// prints; `--show-secrets` (alias `--reveal`) opts back in.
|
|
29
|
+
//
|
|
30
|
+
// The one deliberate exception is `cloud connection-string` (alias `url`),
|
|
31
|
+
// whose entire contract is "hand me the credential to pipe somewhere" - it is
|
|
32
|
+
// the escape hatch `printConnectionInfo` already points users at, and it stays
|
|
33
|
+
// verbatim.
|
|
34
|
+
export const REDACTED_PASSWORD = '****';
|
|
35
|
+
// `scheme://user:password@host` for every engine the CLI touches, and anything
|
|
36
|
+
// else URI-shaped. The password is the only part replaced: the scheme, user,
|
|
37
|
+
// host, port, path and query all survive, so a redacted string still tells you
|
|
38
|
+
// which database on which box a script was pointed at.
|
|
39
|
+
//
|
|
40
|
+
// Deliberately NOT `new URL()`: a connection string with an unencoded password
|
|
41
|
+
// (which the cloud's generated passwords avoid but a pasted source string may
|
|
42
|
+
// not) throws there, and a redactor that throws on the messy input is a
|
|
43
|
+
// redactor that leaks it.
|
|
44
|
+
// The password is matched GREEDILY up to the LAST `@` that is followed by
|
|
45
|
+
// something host-shaped, which is how a real URI parser resolves the ambiguity
|
|
46
|
+
// of an unencoded `@` inside a password. Stopping at the first `@` instead
|
|
47
|
+
// leaves the tail of such a password in the clear, which is the one case where
|
|
48
|
+
// getting this wrong actually leaks.
|
|
49
|
+
// The password class excludes whitespace, double quotes and angle brackets,
|
|
50
|
+
// the delimiters a connection string is USUALLY found next to. Commas and
|
|
51
|
+
// apostrophes are NOT excluded: a pasted source password may contain either,
|
|
52
|
+
// and a class that refused them made the whole URI fail to match, which
|
|
53
|
+
// printed it in the clear with no sign the redactor had skipped it. Instead the
|
|
54
|
+
// password stops where a NEW `scheme://` begins right after a comma or
|
|
55
|
+
// apostrophe, so two URIs on one comma-separated line still redact separately
|
|
56
|
+
// instead of collapsing into a single match that takes the first host and the
|
|
57
|
+
// second scheme with it. `+` (not `*`) means `user:@host` - a URI with no
|
|
58
|
+
// password at all - is left alone instead of getting a mask that claims a
|
|
59
|
+
// password exists.
|
|
60
|
+
const URI_CREDENTIALS = /([a-z][a-z0-9+.-]*:\/\/)([^:/?#@\s]*):((?:(?!(?<=[,'])[a-z][a-z0-9+.-]*:\/\/)[^\s"<>])+)@(?=[^\s@]*(?:[/?#]|\s|$))/gi;
|
|
61
|
+
// Query-string credentials. Not just `password`: a Redis REST endpoint carries
|
|
62
|
+
// `?token=`, and several migrate sources take `?api_key=`.
|
|
63
|
+
const QUERY_PASSWORD = /([?&](?:password|pwd|token|api_?key|auth_?token|secret)=)([^&#\s"']+)/gi;
|
|
64
|
+
export function redactConnectionUri(value) {
|
|
65
|
+
return value
|
|
66
|
+
.replace(URI_CREDENTIALS, (_match, scheme, user) => `${scheme}${user}:${REDACTED_PASSWORD}@`)
|
|
67
|
+
.replace(QUERY_PASSWORD, (_match, key) => `${key}${REDACTED_PASSWORD}`);
|
|
68
|
+
}
|
|
69
|
+
// Keys whose VALUE is a credential in its own right, not a URI. The cloud
|
|
70
|
+
// returns the same password through several of these: `restToken` on
|
|
71
|
+
// Redis/Valkey and `psPassword` on MySQL/MariaDB are literally `db.password`
|
|
72
|
+
// (layerbase-cloud src/api/databases/shared.ts), and `cloud create` / `cloud
|
|
73
|
+
// branch` return a top-level `password` as well. Redacting only URI-shaped
|
|
74
|
+
// strings left those in the clear, so `cloud ls --json` printed a masked
|
|
75
|
+
// connectionString directly above a usable password - worse than not masking at
|
|
76
|
+
// all, because it reads as safe.
|
|
77
|
+
//
|
|
78
|
+
// Compared after lowercasing and dropping `_`/`-`, so `api_key`, `apiKey` and
|
|
79
|
+
// `API-KEY` are one entry.
|
|
80
|
+
const SECRET_KEYS = new Set([
|
|
81
|
+
'password',
|
|
82
|
+
'pwd',
|
|
83
|
+
'pspassword',
|
|
84
|
+
'resttoken',
|
|
85
|
+
'token',
|
|
86
|
+
'authtoken',
|
|
87
|
+
'accesstoken',
|
|
88
|
+
'apikey',
|
|
89
|
+
'apisecret',
|
|
90
|
+
'secret',
|
|
91
|
+
'sourcekey',
|
|
92
|
+
'sourcesecret',
|
|
93
|
+
]);
|
|
94
|
+
function isSecretKey(key) {
|
|
95
|
+
return SECRET_KEYS.has(key.toLowerCase().replace(/[_-]/g, ''));
|
|
96
|
+
}
|
|
97
|
+
// Walk a value about to be serialized as JSON and redact both the URI-shaped
|
|
98
|
+
// strings and the discrete credential fields in it, at any depth. Structure,
|
|
99
|
+
// key order and types are untouched, so a script that reads
|
|
100
|
+
// `.connectionString` or `.password` still finds the field - it just gets a
|
|
101
|
+
// value it cannot authenticate with.
|
|
102
|
+
export function redactJsonSecrets(value) {
|
|
103
|
+
if (typeof value === 'string') {
|
|
104
|
+
return redactConnectionUri(value);
|
|
105
|
+
}
|
|
106
|
+
if (Array.isArray(value)) {
|
|
107
|
+
return value.map((item) => redactJsonSecrets(item));
|
|
108
|
+
}
|
|
109
|
+
if (value !== null && typeof value === 'object') {
|
|
110
|
+
const out = {};
|
|
111
|
+
for (const [key, item] of Object.entries(value)) {
|
|
112
|
+
// The EMPTY string is left exactly as it is. The cloud sends
|
|
113
|
+
// `password: ''` on a row whose credentials are deliberately withheld
|
|
114
|
+
// (an admin without a support grant), and masking that would invent a
|
|
115
|
+
// password the caller was never given.
|
|
116
|
+
if (isSecretKey(key) && typeof item === 'string' && item !== '') {
|
|
117
|
+
out[key] = REDACTED_PASSWORD;
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
out[key] = redactJsonSecrets(item);
|
|
121
|
+
}
|
|
122
|
+
return out;
|
|
123
|
+
}
|
|
124
|
+
return value;
|
|
125
|
+
}
|
|
23
126
|
//# sourceMappingURL=redact.js.map
|
package/dist/lib/redact.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/lib/redact.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+EAA+E;AAC/E,+EAA+E;AAC/E,6EAA6E;AAC7E,gFAAgF;AAChF,4BAA4B;AAE5B,wEAAwE;AACxE,2EAA2E;AAC3E,+EAA+E;AAC/E,qEAAqE;AACrE,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,OAAiB;IAC3D,IAAI,GAAG,GAAG,IAAI,CAAA;IACd,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;QAC7B,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,SAAQ;QAChC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IAC7C,CAAC;IACD,OAAO,GAAG;SACP,OAAO,CACN,sDAAsD,EACtD,8BAA8B,CAC/B;SACA,OAAO,CAAC,4BAA4B,EAAE,mBAAmB,CAAC,CAAA;AAC/D,CAAC"}
|
|
1
|
+
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/lib/redact.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/run-spindb.js
CHANGED
|
@@ -63,6 +63,11 @@ function quoteWindowsArgument(value) {
|
|
|
63
63
|
const escaped = value.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\*)$/, '$1$1');
|
|
64
64
|
return `"${escaped}"`;
|
|
65
65
|
}
|
|
66
|
+
// spindb titles its interactive menu from SPINDB_BRAND (0.69.6+; older versions
|
|
67
|
+
// ignore it), so a session entered through `layerbase` reads as Layerbase.
|
|
68
|
+
export function spindbChildEnv(extra = {}) {
|
|
69
|
+
return { ...process.env, SPINDB_BRAND: 'Layerbase', ...extra };
|
|
70
|
+
}
|
|
66
71
|
function spawnSpindb(args, opts = {}) {
|
|
67
72
|
const { command, baseArgs } = spindbInvocation();
|
|
68
73
|
return new Promise((resolve) => {
|
|
@@ -81,7 +86,7 @@ function spawnSpindb(args, opts = {}) {
|
|
|
81
86
|
});
|
|
82
87
|
const child = spawn(invocation.command, invocation.args, {
|
|
83
88
|
stdio: opts.quiet ? 'ignore' : 'inherit',
|
|
84
|
-
env: opts.env
|
|
89
|
+
env: spindbChildEnv(opts.env),
|
|
85
90
|
windowsVerbatimArguments: invocation.windowsVerbatimArguments,
|
|
86
91
|
});
|
|
87
92
|
child.on('error', (error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-spindb.js","sourceRoot":"","sources":["../../src/lib/run-spindb.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-spindb.js","sourceRoot":"","sources":["../../src/lib/run-spindb.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -180,8 +180,15 @@ up like this:
|
|
|
180
180
|
`POST /v1/databases` with a `ttlHours` field). TTL is capped at 72 hours. A
|
|
181
181
|
transient database still counts against your plan's database limit while it
|
|
182
182
|
is alive, and self-destructs at expiry.
|
|
183
|
-
5. Seed via the
|
|
183
|
+
5. Seed via the connection string, run tests, then delete explicitly
|
|
184
184
|
(`layerbase cloud delete <name>`), letting the TTL be the safety net.
|
|
185
|
+
Connection strings and passwords print REDACTED by default
|
|
186
|
+
(`postgres://user:****@host:5432/db`), so a transcript or CI log carries no
|
|
187
|
+
working credential. To get a usable one, either add `--show-secrets` (alias
|
|
188
|
+
`--reveal`) to the create call, or ask for it on its own with
|
|
189
|
+
`layerbase cloud connection-string <name>`, which always prints in full.
|
|
190
|
+
Prefer the second: it keeps the credential out of the create output you may
|
|
191
|
+
be logging.
|
|
185
192
|
|
|
186
193
|
Prefer branch-per-PR where the engine supports branching: branch from a seeded
|
|
187
194
|
parent for an instant seeded copy, reset between runs, and delete on teardown.
|
|
@@ -205,6 +212,12 @@ Example GitHub Actions step:
|
|
|
205
212
|
run: |
|
|
206
213
|
npm i -g layerbase
|
|
207
214
|
layerbase cloud create ci-$GITHUB_RUN_ID --engine postgresql --ttl 2h --json
|
|
215
|
+
# The create output above is safe to log: its password is redacted. Fetch
|
|
216
|
+
# the real connection string separately and mask it, so it never lands in
|
|
217
|
+
# the run log.
|
|
218
|
+
DATABASE_URL="$(layerbase cloud connection-string ci-$GITHUB_RUN_ID)"
|
|
219
|
+
echo "::add-mask::$DATABASE_URL"
|
|
220
|
+
echo "DATABASE_URL=$DATABASE_URL" >> "$GITHUB_ENV"
|
|
208
221
|
```
|
|
209
222
|
|
|
210
223
|
## 5. Hostable apps
|