@botiverse/hands-cli 0.5.26 → 0.5.27
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/dist/commands/login.js +76 -65
- package/dist/commands/login.js.map +1 -1
- package/dist/lib/config.js +5 -1
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/secret_input.d.ts +38 -0
- package/dist/lib/secret_input.js +96 -0
- package/dist/lib/secret_input.js.map +1 -0
- package/package.json +1 -1
package/dist/commands/login.js
CHANGED
|
@@ -13,47 +13,24 @@
|
|
|
13
13
|
* Raft OAuth still uses a browser redirect, while Hands turns the successful
|
|
14
14
|
* login into a copyable signed JWT for the CLI.
|
|
15
15
|
*/
|
|
16
|
-
import { createInterface } from "node:readline/promises";
|
|
17
|
-
import { stdin, stdout } from "node:process";
|
|
18
16
|
import { rmSync } from "node:fs";
|
|
19
|
-
import {
|
|
17
|
+
import { getApiBase, setApiBase } from "../lib/api.js";
|
|
20
18
|
import { clearConfig, saveConfig, getConfig, configPath } from "../lib/config.js";
|
|
21
19
|
import { admitAgent, agentAuthPath, HANDS_SERVICE } from "../lib/agent_env.js";
|
|
22
20
|
import { runAgentLogin } from "../lib/agent_auth.js";
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}
|
|
37
|
-
else if (ch === "\u0003") {
|
|
38
|
-
// Ctrl+C
|
|
39
|
-
process.stdout.write("\n");
|
|
40
|
-
rl.close();
|
|
41
|
-
reject(new Error("cancelled"));
|
|
42
|
-
}
|
|
43
|
-
else if (ch === "\u007f" || ch === "\b") {
|
|
44
|
-
// Backspace
|
|
45
|
-
if (input.length > 0) {
|
|
46
|
-
input = input.slice(0, -1);
|
|
47
|
-
process.stdout.write("\b \b");
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
51
|
-
input += ch;
|
|
52
|
-
process.stdout.write("*");
|
|
53
|
-
}
|
|
54
|
-
};
|
|
55
|
-
process.stdin.on("data", onData);
|
|
56
|
-
});
|
|
21
|
+
import { normalizeToken, promptSecret } from "../lib/secret_input.js";
|
|
22
|
+
/** POST /api/auth/logout with the given bearer; true when the server confirmed. */
|
|
23
|
+
async function revokeSession(apiBase, token) {
|
|
24
|
+
try {
|
|
25
|
+
const res = await fetch(new URL("/api/auth/logout", apiBase), {
|
|
26
|
+
method: "POST",
|
|
27
|
+
headers: { accept: "application/json", authorization: `Bearer ${token}` },
|
|
28
|
+
});
|
|
29
|
+
return res.ok;
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
57
34
|
}
|
|
58
35
|
export function registerLoginCommands(program) {
|
|
59
36
|
const cmd = program
|
|
@@ -109,44 +86,67 @@ export function registerLoginCommands(program) {
|
|
|
109
86
|
console.log(` 2. Sign in with Raft. You'll land on the Hands CLI callback page.`);
|
|
110
87
|
console.log(` 3. Copy the JWT shown there and paste it below.`);
|
|
111
88
|
console.log("");
|
|
112
|
-
let
|
|
113
|
-
if (!
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
89
|
+
let raw = opts.token;
|
|
90
|
+
if (!raw) {
|
|
91
|
+
try {
|
|
92
|
+
raw = await promptSecret("Hands JWT (input is hidden): ");
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
console.error("Cancelled.");
|
|
96
|
+
process.exit(130);
|
|
118
97
|
}
|
|
119
98
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
console.log(` API base: ${apiBase}`);
|
|
125
|
-
// Verify the token works by calling /api/auth/me.
|
|
126
|
-
try {
|
|
127
|
-
await apiRequest("/api/auth/me");
|
|
128
|
-
console.log(`✔ Token verified — you're logged in.`);
|
|
129
|
-
console.log("");
|
|
130
|
-
console.log("Next steps:");
|
|
131
|
-
console.log(" hands whoami confirm who you are");
|
|
132
|
-
console.log(" hands apps list see your apps");
|
|
133
|
-
console.log(" hands feedback list <app> --kind crash newest crash tickets");
|
|
134
|
-
console.log(" hands --help all commands + recipes");
|
|
135
|
-
console.log("");
|
|
136
|
-
console.log("Docs: https://hands.build/docs/cli-reference");
|
|
99
|
+
const normalized = normalizeToken(raw);
|
|
100
|
+
if ("error" in normalized) {
|
|
101
|
+
console.error(`✘ ${normalized.error}`);
|
|
102
|
+
process.exit(1);
|
|
137
103
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
104
|
+
const token = normalized.token;
|
|
105
|
+
// Verify BEFORE persisting: a rejected or unreachable token must not
|
|
106
|
+
// replace a working saved login.
|
|
107
|
+
setApiBase(apiBase);
|
|
108
|
+
try {
|
|
109
|
+
const res = await fetch(new URL("/api/auth/me", apiBase), {
|
|
110
|
+
headers: { accept: "application/json", authorization: `Bearer ${token}` },
|
|
111
|
+
});
|
|
112
|
+
if (res.status === 401) {
|
|
113
|
+
console.error("✘ Token rejected (401): expired or not a Hands login token. Nothing was saved.");
|
|
114
|
+
process.exit(1);
|
|
115
|
+
}
|
|
116
|
+
if (!res.ok) {
|
|
117
|
+
console.error(`✘ Could not verify the token (HTTP ${res.status}). Nothing was saved; try again.`);
|
|
141
118
|
process.exit(1);
|
|
142
119
|
}
|
|
143
|
-
throw e;
|
|
144
120
|
}
|
|
121
|
+
catch (e) {
|
|
122
|
+
const cause = e instanceof Error && e.cause instanceof Error ? `: ${e.cause.message}` : "";
|
|
123
|
+
console.error(`✘ Could not reach ${apiBase} to verify the token${cause}. Nothing was saved.`);
|
|
124
|
+
process.exit(1);
|
|
125
|
+
}
|
|
126
|
+
// Replacing an older human login: revoke it (best-effort) so re-login
|
|
127
|
+
// actually retires the previous session instead of leaving it live.
|
|
128
|
+
const previous = getConfig();
|
|
129
|
+
const previousToken = previous.authToken ?? previous.sessionCookie;
|
|
130
|
+
if (previousToken && previousToken !== token) {
|
|
131
|
+
await revokeSession(previous.apiBase ?? apiBase, previousToken);
|
|
132
|
+
}
|
|
133
|
+
clearConfig();
|
|
134
|
+
saveConfig({ apiBase, authToken: token });
|
|
135
|
+
console.log(`✔ Token verified — you're logged in. Saved to ${configPath()}`);
|
|
136
|
+
console.log(` API base: ${apiBase}`);
|
|
137
|
+
console.log("");
|
|
138
|
+
console.log("Next steps:");
|
|
139
|
+
console.log(" hands whoami confirm who you are");
|
|
140
|
+
console.log(" hands apps list see your apps");
|
|
141
|
+
console.log(" hands feedback list <app> --kind crash newest crash tickets");
|
|
142
|
+
console.log(" hands --help all commands + recipes");
|
|
143
|
+
console.log("");
|
|
144
|
+
console.log("Docs: https://hands.build/docs/cli-reference");
|
|
145
145
|
});
|
|
146
146
|
program
|
|
147
147
|
.command("logout")
|
|
148
148
|
.description("Clear the saved Hands token (agent store in an agent, else human config).")
|
|
149
|
-
.action(() => {
|
|
149
|
+
.action(async () => {
|
|
150
150
|
const admission = admitAgent();
|
|
151
151
|
if (admission.kind === "agent") {
|
|
152
152
|
// Clear the per-agent store only; never touch the human config.
|
|
@@ -170,8 +170,19 @@ export function registerLoginCommands(program) {
|
|
|
170
170
|
console.log("Not logged in (no saved Hands token).");
|
|
171
171
|
return;
|
|
172
172
|
}
|
|
173
|
+
// Revoke server-side first so a copied/leaked token stops working too;
|
|
174
|
+
// clearing only the local file would leave the session alive for 14 days.
|
|
175
|
+
const saved = cfg.authToken ?? cfg.sessionCookie;
|
|
176
|
+
const revoked = await revokeSession(cfg.apiBase ?? getApiBase(), saved);
|
|
173
177
|
clearConfig();
|
|
174
178
|
console.log(`✔ Logged out (token cleared from ${configPath()}).`);
|
|
179
|
+
if (revoked) {
|
|
180
|
+
console.log(" Session revoked on the server.");
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
console.error(" ⚠ Could not revoke the session on the server (offline?). The token stays valid until it expires;" +
|
|
184
|
+
" revoke it with: curl -X POST <api>/api/auth/logout -H \"Authorization: Bearer <token>\"");
|
|
185
|
+
}
|
|
175
186
|
});
|
|
176
187
|
}
|
|
177
188
|
// Keep the command module side-effect free when imported by tests.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtE,mFAAmF;AACnF,KAAK,UAAU,aAAa,CAAC,OAAe,EAAE,KAAa;IACzD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE;YAC5D,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;SAC1E,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,EAAE,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,MAAM,GAAG,GAAG,OAAO;SAChB,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,qCAAqC,CAAC;SAClD,MAAM,CACL,eAAe,EACf,0DAA0D,CAC3D;SACA,MAAM,CACL,aAAa,EACb,0DAA0D,CAC3D;SACA,MAAM,CAAC,aAAa,EAAE,qDAAqD,EAAE,KAAK,CAAC;SACnF,MAAM,CACL,KAAK,EAAE,IAIN,EAAE,EAAE;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;QAE/B,yEAAyE;QACzE,sEAAsE;QACtE,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC/B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,iEAAiE;gBACjE,OAAO,CAAC,KAAK,CAAC,oGAAoG,CAAC,CAAC;gBACpH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,+FAA+F,CAAC,CAAC;gBAC7G,OAAO;YACT,CAAC;YACD,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,qCAAqC;YAC1D,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnD,OAAO,CAAC,GAAG,CAAC,mCAAmC,aAAa,IAAI,CAAC,CAAC;gBAClE,OAAO,CAAC,GAAG,CAAC,kEAAkE,aAAa,YAAY,CAAC,CAAC;gBACzG,OAAO,CAAC,GAAG,CAAC,0BAA0B,OAAO,CAAC,iBAAiB,kCAAkC,CAAC,CAAC;gBACnG,OAAO,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC;YACpF,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACrF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,OAAO;QACT,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACrC,2EAA2E;YAC3E,OAAO,CAAC,KAAK,CAAC,iDAAiD,SAAS,CAAC,MAAM,+EAA+E,CAAC,CAAC;YAChK,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,OAAO,6BAA6B,kBAAkB,CAAC,eAAe,CAAC,EAAE,CAAC;QAE9F,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,QAAQ,QAAQ,EAAE,CAAC,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,qEAAqE,CAAC,CAAC;QACnF,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhB,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC;QACrB,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAI,CAAC;gBACH,GAAG,GAAG,MAAM,YAAY,CAAC,+BAA+B,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QACD,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,KAAK,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;YACvC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;QAE/B,qEAAqE;QACrE,iCAAiC;QACjC,UAAU,CAAC,OAAO,CAAC,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,EAAE;gBACxD,OAAO,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;aAC1E,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;gBAChG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,sCAAsC,GAAG,CAAC,MAAM,kCAAkC,CAAC,CAAC;gBAClG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3F,OAAO,CAAC,KAAK,CAAC,qBAAqB,OAAO,uBAAuB,KAAK,sBAAsB,CAAC,CAAC;YAC9F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,sEAAsE;QACtE,oEAAoE;QACpE,MAAM,QAAQ,GAAG,SAAS,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,aAAa,CAAC;QACnE,IAAI,aAAa,IAAI,aAAa,KAAK,KAAK,EAAE,CAAC;YAC7C,MAAM,aAAa,CAAC,QAAQ,CAAC,OAAO,IAAI,OAAO,EAAE,aAAa,CAAC,CAAC;QAClE,CAAC;QACD,WAAW,EAAE,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,iDAAiD,UAAU,EAAE,EAAE,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,eAAe,OAAO,EAAE,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;QACvE,OAAO,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;QAChF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;IAC9D,CAAC,CACF,CAAC;IAEJ,OAAO;SACJ,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,2EAA2E,CAAC;SACxF,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;QAC/B,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC/B,gEAAgE;YAChE,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC;gBACH,MAAM,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9B,OAAO,CAAC,GAAG,CAAC,gCAAgC,IAAI,IAAI,CAAC,CAAC;YACxD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,OAAO;QACT,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,CAAC,iDAAiD,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC;YACrF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,GAAG,GAAG,SAAS,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QACD,uEAAuE;QACvE,0EAA0E;QAC1E,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,aAAc,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,OAAO,IAAI,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;QACxE,WAAW,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,oCAAoC,UAAU,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CACX,oGAAoG;gBAClG,0FAA0F,CAC7F,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC;AAED,mEAAmE"}
|
package/dist/lib/config.js
CHANGED
|
@@ -77,7 +77,11 @@ export function clearConfig() {
|
|
|
77
77
|
const next = { ...current };
|
|
78
78
|
delete next.authToken;
|
|
79
79
|
delete next.sessionCookie;
|
|
80
|
-
saveConfig(
|
|
80
|
+
// Write the file directly: saveConfig() merges over the current config, which
|
|
81
|
+
// would put the deleted credentials straight back (logout used to be a no-op).
|
|
82
|
+
const path = configPath();
|
|
83
|
+
mkdirSync(dirname(path), { recursive: true });
|
|
84
|
+
writeFileSync(path, JSON.stringify(next, null, 2) + "\n", { mode: 0o600 });
|
|
81
85
|
}
|
|
82
86
|
export function resolveApiBase() {
|
|
83
87
|
const cliFlag = readEnv("CLI_API");
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Hidden secret entry for `hands login`.
|
|
3
|
+
*
|
|
4
|
+
* The previous prompt opened a readline interface on stdin with terminal:true,
|
|
5
|
+
* so readline echoed every pasted character in clear text, while our own data
|
|
6
|
+
* handler appended one '*' per data *chunk* (a paste arrives as a few chunks),
|
|
7
|
+
* and only a chunk that was exactly "\r"/"\n" ended input — so newlines or
|
|
8
|
+
* bracketed-paste markers inside a paste chunk were stored in the token and
|
|
9
|
+
* later made fetch() throw "invalid authorization header" (surfaced as
|
|
10
|
+
* "fetch failed").
|
|
11
|
+
*
|
|
12
|
+
* This module: raw mode with no readline (nothing is echoed), processes input
|
|
13
|
+
* per character, strips bracketed-paste markers and control characters, ends on
|
|
14
|
+
* the first Enter, and leaves validation to `normalizeToken`.
|
|
15
|
+
*/
|
|
16
|
+
export type SecretKeyResult = {
|
|
17
|
+
kind: "continue";
|
|
18
|
+
value: string;
|
|
19
|
+
} | {
|
|
20
|
+
kind: "done";
|
|
21
|
+
value: string;
|
|
22
|
+
} | {
|
|
23
|
+
kind: "cancel";
|
|
24
|
+
};
|
|
25
|
+
/** Pure reducer: feed one data chunk, get the new buffer and whether input ended. */
|
|
26
|
+
export declare function feedSecretChunk(buffer: string, chunk: string): SecretKeyResult;
|
|
27
|
+
/**
|
|
28
|
+
* Trim and validate a pasted Hands JWT. Returns the clean token or an error
|
|
29
|
+
* message. Only characters legal in a compact JWS (base64url + two dots) pass,
|
|
30
|
+
* so a mangled paste is rejected before it is saved or sent.
|
|
31
|
+
*/
|
|
32
|
+
export declare function normalizeToken(raw: string): {
|
|
33
|
+
token: string;
|
|
34
|
+
} | {
|
|
35
|
+
error: string;
|
|
36
|
+
};
|
|
37
|
+
/** Prompt for a secret without echoing it. Falls back to reading a line from piped stdin. */
|
|
38
|
+
export declare function promptSecret(message: string): Promise<string>;
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Hidden secret entry for `hands login`.
|
|
3
|
+
*
|
|
4
|
+
* The previous prompt opened a readline interface on stdin with terminal:true,
|
|
5
|
+
* so readline echoed every pasted character in clear text, while our own data
|
|
6
|
+
* handler appended one '*' per data *chunk* (a paste arrives as a few chunks),
|
|
7
|
+
* and only a chunk that was exactly "\r"/"\n" ended input — so newlines or
|
|
8
|
+
* bracketed-paste markers inside a paste chunk were stored in the token and
|
|
9
|
+
* later made fetch() throw "invalid authorization header" (surfaced as
|
|
10
|
+
* "fetch failed").
|
|
11
|
+
*
|
|
12
|
+
* This module: raw mode with no readline (nothing is echoed), processes input
|
|
13
|
+
* per character, strips bracketed-paste markers and control characters, ends on
|
|
14
|
+
* the first Enter, and leaves validation to `normalizeToken`.
|
|
15
|
+
*/
|
|
16
|
+
const PASTE_START = "\u001b[200~";
|
|
17
|
+
const PASTE_END = "\u001b[201~";
|
|
18
|
+
/** Pure reducer: feed one data chunk, get the new buffer and whether input ended. */
|
|
19
|
+
export function feedSecretChunk(buffer, chunk) {
|
|
20
|
+
let value = buffer;
|
|
21
|
+
const text = chunk.split(PASTE_START).join("").split(PASTE_END).join("");
|
|
22
|
+
for (const ch of text) {
|
|
23
|
+
if (ch === "\u0003")
|
|
24
|
+
return { kind: "cancel" };
|
|
25
|
+
if (ch === "\r" || ch === "\n" || ch === "\u0004")
|
|
26
|
+
return { kind: "done", value };
|
|
27
|
+
if (ch === "\u007f" || ch === "\b") {
|
|
28
|
+
value = value.slice(0, -1);
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
const code = ch.codePointAt(0) ?? 0;
|
|
32
|
+
if (code < 0x20 || code === 0x7f)
|
|
33
|
+
continue; // other control chars (incl. stray ESC)
|
|
34
|
+
value += ch;
|
|
35
|
+
}
|
|
36
|
+
return { kind: "continue", value };
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Trim and validate a pasted Hands JWT. Returns the clean token or an error
|
|
40
|
+
* message. Only characters legal in a compact JWS (base64url + two dots) pass,
|
|
41
|
+
* so a mangled paste is rejected before it is saved or sent.
|
|
42
|
+
*/
|
|
43
|
+
export function normalizeToken(raw) {
|
|
44
|
+
const token = raw.replace(/\s+/g, "");
|
|
45
|
+
if (token.length === 0)
|
|
46
|
+
return { error: "No token entered." };
|
|
47
|
+
if (!/^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$/.test(token)) {
|
|
48
|
+
return {
|
|
49
|
+
error: "That doesn't look like a Hands JWT (expected three base64url parts separated by dots). " +
|
|
50
|
+
"Copy it again from the browser callback page, or pass it with --token.",
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
return { token };
|
|
54
|
+
}
|
|
55
|
+
/** Prompt for a secret without echoing it. Falls back to reading a line from piped stdin. */
|
|
56
|
+
export async function promptSecret(message) {
|
|
57
|
+
const input = process.stdin;
|
|
58
|
+
process.stdout.write(message);
|
|
59
|
+
if (!input.isTTY) {
|
|
60
|
+
// Piped: `printf %s "$JWT" | hands login`. Read everything, first line wins.
|
|
61
|
+
const chunks = [];
|
|
62
|
+
for await (const chunk of input)
|
|
63
|
+
chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
|
|
64
|
+
process.stdout.write("\n");
|
|
65
|
+
return Buffer.concat(chunks).toString("utf8").split(/\r?\n/)[0] ?? "";
|
|
66
|
+
}
|
|
67
|
+
return new Promise((resolve, reject) => {
|
|
68
|
+
let buffer = "";
|
|
69
|
+
const wasRaw = input.isRaw;
|
|
70
|
+
input.setRawMode(true);
|
|
71
|
+
input.setEncoding("utf8");
|
|
72
|
+
input.resume();
|
|
73
|
+
const finish = () => {
|
|
74
|
+
input.removeListener("data", onData);
|
|
75
|
+
input.setRawMode(wasRaw);
|
|
76
|
+
input.pause();
|
|
77
|
+
process.stdout.write("\n");
|
|
78
|
+
};
|
|
79
|
+
const onData = (chunk) => {
|
|
80
|
+
const result = feedSecretChunk(buffer, chunk.toString());
|
|
81
|
+
if (result.kind === "cancel") {
|
|
82
|
+
finish();
|
|
83
|
+
reject(new Error("cancelled"));
|
|
84
|
+
}
|
|
85
|
+
else if (result.kind === "done") {
|
|
86
|
+
finish();
|
|
87
|
+
resolve(result.value);
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
buffer = result.value;
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
input.on("data", onData);
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
//# sourceMappingURL=secret_input.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"secret_input.js","sourceRoot":"","sources":["../../src/lib/secret_input.ts"],"names":[],"mappings":"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"}
|