@camstack/develop 0.1.11 → 0.1.13
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/hub/admin-token-store.d.ts +10 -6
- package/dist/hub/admin-token-store.d.ts.map +1 -1
- package/dist/hub/admin-token-store.js +18 -18
- package/dist/hub/credentials.d.ts +11 -6
- package/dist/hub/credentials.d.ts.map +1 -1
- package/dist/hub/credentials.js +48 -26
- package/dist/hub/session-store.d.ts +2 -0
- package/dist/hub/session-store.d.ts.map +1 -1
- package/dist/hub/session-store.js +4 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/package.json +1 -1
|
@@ -40,14 +40,18 @@ export declare function readPreviousAdminToken(serverUrl: string, dir?: string):
|
|
|
40
40
|
*/
|
|
41
41
|
export declare function adminTokenStatus(serverUrl: string, env?: Readonly<Record<string, string | undefined>>, dir?: string, now?: number): AdminTokenStatus;
|
|
42
42
|
/** The checkout-local invocation: build the CLI once, then run its entry. */
|
|
43
|
-
export declare const
|
|
43
|
+
export declare const REPO_LOCAL_LOGIN = "npx nx run camstack:build && node packages/cli/dist/cli.js login";
|
|
44
|
+
/** @deprecated Use {@link sessionLoginCommand}. */
|
|
45
|
+
export declare const REPO_LOCAL_LOGIN_ADMIN = "npx nx run camstack:build && node packages/cli/dist/cli.js login";
|
|
44
46
|
/**
|
|
45
|
-
* The exact command that
|
|
46
|
-
*
|
|
47
|
+
* The exact command that refreshes the CLI session: `camstack login` when the
|
|
48
|
+
* binary is on PATH, otherwise the checkout-local form.
|
|
47
49
|
*/
|
|
50
|
+
export declare function sessionLoginCommand(env?: Readonly<Record<string, string | undefined>>): string;
|
|
51
|
+
/** @deprecated Use {@link sessionLoginCommand}. */
|
|
48
52
|
export declare function adminLoginCommand(env?: Readonly<Record<string, string | undefined>>): string;
|
|
49
|
-
/** The hub answered 401/403 to an admin credential
|
|
53
|
+
/** The hub answered 401/403 to an admin-tier credential. */
|
|
50
54
|
export declare function adminRejectedHint(command?: string): string;
|
|
51
|
-
/** Why
|
|
52
|
-
export declare function adminCredentialHint(
|
|
55
|
+
/** Why admin-tier ops are blocked locally; `null` when the credential is already admin. */
|
|
56
|
+
export declare function adminCredentialHint(_status: AdminTokenStatus, command?: string): string | null;
|
|
53
57
|
//# sourceMappingURL=admin-token-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-token-store.d.ts","sourceRoot":"","sources":["../../src/hub/admin-token-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"admin-token-store.d.ts","sourceRoot":"","sources":["../../src/hub/admin-token-store.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAC3B;AAED,0EAA0E;AAC1E,MAAM,MAAM,gBAAgB,GACxB;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAE9D,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,MAA4B,GAChC,MAAM,CAER;AAmBD,2EAA2E;AAC3E,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,cAAc,EACpB,GAAG,GAAE,MAA4B,GAChC,MAAM,CAMR;AAiBD;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GACtF;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAElE,kGAAkG;AAClG,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,MAA4B,GAChC,kBAAkB,CAepB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,EAC/D,GAAG,GAAE,MAA4B,EACjC,GAAG,GAAE,MAAmB,GACvB,gBAAgB,CAQlB;AAgBD,6EAA6E;AAC7E,eAAO,MAAM,gBAAgB,qEACuC,CAAA;AAEpE,mDAAmD;AACnD,eAAO,MAAM,sBAAsB,qEAAmB,CAAA;AAEtD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,CAER;AAED,mDAAmD;AACnD,wBAAgB,iBAAiB,CAC/B,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,CAER;AAED,4DAA4D;AAC5D,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,MAA8B,GAAG,MAAM,CAEjF;AAED,2FAA2F;AAC3F,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,MAA8B,GACtC,MAAM,GAAG,IAAI,CAEf"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
4
|
-
* reads, no new decision.
|
|
2
|
+
* Legacy `csa_` admin token files (D816): still discoverable for hub URL hints,
|
|
3
|
+
* but no longer auto-loaded by the credential chain — use `camstack login`.
|
|
5
4
|
*
|
|
6
5
|
* Two files, both 0600, beside the session cache:
|
|
7
6
|
* - `<host>.admin-token` the bare `csa_` token (what the chain reads)
|
|
@@ -116,24 +115,25 @@ function onPath(name, pathEnv) {
|
|
|
116
115
|
});
|
|
117
116
|
}
|
|
118
117
|
/** The checkout-local invocation: build the CLI once, then run its entry. */
|
|
119
|
-
export const
|
|
118
|
+
export const REPO_LOCAL_LOGIN = 'npx nx run camstack:build && node packages/cli/dist/cli.js login';
|
|
119
|
+
/** @deprecated Use {@link sessionLoginCommand}. */
|
|
120
|
+
export const REPO_LOCAL_LOGIN_ADMIN = REPO_LOCAL_LOGIN;
|
|
120
121
|
/**
|
|
121
|
-
* The exact command that
|
|
122
|
-
*
|
|
122
|
+
* The exact command that refreshes the CLI session: `camstack login` when the
|
|
123
|
+
* binary is on PATH, otherwise the checkout-local form.
|
|
123
124
|
*/
|
|
125
|
+
export function sessionLoginCommand(env = process.env) {
|
|
126
|
+
return onPath('camstack', env['PATH']) ? 'camstack login' : REPO_LOCAL_LOGIN;
|
|
127
|
+
}
|
|
128
|
+
/** @deprecated Use {@link sessionLoginCommand}. */
|
|
124
129
|
export function adminLoginCommand(env = process.env) {
|
|
125
|
-
return
|
|
130
|
+
return sessionLoginCommand(env);
|
|
126
131
|
}
|
|
127
|
-
/** The hub answered 401/403 to an admin credential
|
|
128
|
-
export function adminRejectedHint(command =
|
|
129
|
-
return `the hub rejected
|
|
132
|
+
/** The hub answered 401/403 to an admin-tier credential. */
|
|
133
|
+
export function adminRejectedHint(command = sessionLoginCommand()) {
|
|
134
|
+
return `the hub rejected this credential (revoked or expired). Run \`${command}\` in a terminal with an admin account.`;
|
|
130
135
|
}
|
|
131
|
-
/** Why
|
|
132
|
-
export function adminCredentialHint(
|
|
133
|
-
|
|
134
|
-
return null;
|
|
135
|
-
const why = status.state === 'expired'
|
|
136
|
-
? `the admin token expired at ${new Date(status.expiresAt).toISOString()}`
|
|
137
|
-
: 'there is no admin token for this hub';
|
|
138
|
-
return `${why}. Run \`${command}\` in a terminal (it asks for your password; the MCP never does).`;
|
|
136
|
+
/** Why admin-tier ops are blocked locally; `null` when the credential is already admin. */
|
|
137
|
+
export function adminCredentialHint(_status, command = sessionLoginCommand()) {
|
|
138
|
+
return `this credential is not admin-scoped. Run \`${command}\` with an admin account (the MCP never handles a password).`;
|
|
139
139
|
}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
export type CredentialSource = 'flag' | 'token-file' | 'admin-token' | 'env' | 'session';
|
|
2
|
-
/** What a credential may reach
|
|
2
|
+
/** What a credential may reach locally before the hub validates every call. */
|
|
3
3
|
export type CredentialTier = 'admin' | 'protected';
|
|
4
4
|
export declare const ADMIN_TOKEN_PREFIX = "csa_";
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
export interface CredentialTierOptions {
|
|
6
|
+
/** When the token came from a cached session file that recorded admin role. */
|
|
7
|
+
readonly sessionIsAdmin?: boolean;
|
|
8
|
+
}
|
|
9
|
+
/** Decode a JWT payload for a local tier hint — no signature check. */
|
|
10
|
+
export declare function jwtPayloadIsAdmin(token: string): boolean;
|
|
11
|
+
/** The tier a token buys locally; the hub still decides on every call. */
|
|
12
|
+
export declare function credentialTier(token: string, opts?: CredentialTierOptions): CredentialTier;
|
|
7
13
|
export interface ResolvedCredentials {
|
|
8
14
|
readonly server: string | undefined;
|
|
9
15
|
readonly token: string;
|
|
10
16
|
readonly source: CredentialSource;
|
|
11
|
-
/** `admin` only for a `csa_` admin token; every other credential is `protected`. */
|
|
12
17
|
readonly tier: CredentialTier;
|
|
13
18
|
/** A non-fatal note for stderr (e.g. a world-readable token file). */
|
|
14
19
|
readonly warning?: string;
|
|
@@ -16,13 +21,13 @@ export interface ResolvedCredentials {
|
|
|
16
21
|
export interface CachedSessionLike {
|
|
17
22
|
readonly server: string;
|
|
18
23
|
readonly token: string;
|
|
24
|
+
/** Copied from `camstack login` when the hub reported an admin user. */
|
|
25
|
+
readonly isAdmin?: boolean;
|
|
19
26
|
}
|
|
20
27
|
export interface CredentialInputs {
|
|
21
28
|
readonly server?: string;
|
|
22
29
|
readonly token?: string;
|
|
23
30
|
readonly tokenFile?: string;
|
|
24
|
-
/** An owner-only file holding a `csa_` admin token (D816); resolved after `tokenFile`. */
|
|
25
|
-
readonly adminTokenFile?: string;
|
|
26
31
|
readonly env?: Readonly<Record<string, string | undefined>>;
|
|
27
32
|
/** The session lookup — `loadSession` from `auth.ts`, injectable for tests. */
|
|
28
33
|
readonly loadSession: (server?: string) => CachedSessionLike | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/hub/credentials.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/hub/credentials.ts"],"names":[],"mappings":"AA2BA,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,YAAY,GAAG,aAAa,GAAG,KAAK,GAAG,SAAS,CAAA;AAExF,+EAA+E;AAC/E,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,WAAW,CAAA;AAElD,eAAO,MAAM,kBAAkB,SAAS,CAAA;AAGxC,MAAM,WAAW,qBAAqB;IACpC,+EAA+E;IAC/E,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAClC;AAED,uEAAuE;AACvE,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAYxD;AAED,0EAA0E;AAC1E,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,qBAAqB,GAAG,cAAc,CAK1F;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IACnC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACjC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;IAC7B,sEAAsE;IACtE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,wEAAwE;IACxE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAA;IAC3D,+EAA+E;IAC/E,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,iBAAiB,GAAG,IAAI,CAAA;CACpE;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED,6FAA6F;AAC7F,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,MAAM,EAAE,MAAM,GAAG,SAAS;CAWvC;AAID;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAkBjE;AAmCD,2FAA2F;AAC3F,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,mBAAmB,CAchF;AAgCD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAGxF;AAED,qFAAqF;AACrF,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,GAAG,SAAS,GACnC,MAAM,CAGR"}
|
package/dist/hub/credentials.js
CHANGED
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Credential resolution shared by every hub-talking tool: the CLI commands
|
|
3
3
|
* (`deploy`, `deploy-server`, `dev`, `watch`), `scripts/hub/hub.mjs` and the
|
|
4
|
-
* private operator MCP (`@camstack/mcp-dev`). One chain, no copy (D835
|
|
5
|
-
* of D816).
|
|
4
|
+
* private operator MCP (`@camstack/mcp-dev`). One chain, no copy (D835).
|
|
6
5
|
*
|
|
7
|
-
* `camstack login` caches
|
|
8
|
-
*
|
|
9
|
-
*
|
|
6
|
+
* `camstack login` caches the login JWT in `~/.camstack/<host>.json` (0600);
|
|
7
|
+
* every command picks that session up on its own, so a terminal that ran
|
|
8
|
+
* `login` once needs no further flags.
|
|
10
9
|
*
|
|
11
10
|
* Token precedence (first hit wins):
|
|
12
11
|
* 1. `--token <token>` — explicit one-off
|
|
13
12
|
* 2. `--token-file <path>` — a file the operator handed to a script/CI:
|
|
14
13
|
* a bare token, or a session file in the
|
|
15
14
|
* `~/.camstack/<host>.json` format
|
|
16
|
-
* 3.
|
|
17
|
-
* owner-only file (`adminTokenFile`)
|
|
18
|
-
* 4. `$CAMSTACK_TOKEN` — still read by the CLI; ops tools pass an env
|
|
15
|
+
* 3. `$CAMSTACK_TOKEN` — still read by the CLI; ops tools pass an env
|
|
19
16
|
* without it (no secret through the environment)
|
|
20
|
-
*
|
|
17
|
+
* 4. the cached session — `camstack login`
|
|
21
18
|
*
|
|
22
19
|
* A password is never an input: nothing here logs in.
|
|
23
20
|
*
|
|
@@ -28,9 +25,33 @@
|
|
|
28
25
|
import * as fs from 'node:fs';
|
|
29
26
|
import { normalizeHubAddress } from './hub-address.js';
|
|
30
27
|
export const ADMIN_TOKEN_PREFIX = 'csa_';
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
28
|
+
const SCOPED_TOKEN_PREFIX = 'cst_';
|
|
29
|
+
/** Decode a JWT payload for a local tier hint — no signature check. */
|
|
30
|
+
export function jwtPayloadIsAdmin(token) {
|
|
31
|
+
const parts = token.split('.');
|
|
32
|
+
if (parts.length < 2)
|
|
33
|
+
return false;
|
|
34
|
+
try {
|
|
35
|
+
const raw = parts[1].replace(/-/g, '+').replace(/_/g, '/');
|
|
36
|
+
const padded = raw.padEnd(raw.length + ((4 - (raw.length % 4)) % 4), '=');
|
|
37
|
+
const json = JSON.parse(Buffer.from(padded, 'base64').toString('utf8'));
|
|
38
|
+
if (json === null || typeof json !== 'object')
|
|
39
|
+
return false;
|
|
40
|
+
return Reflect.get(json, 'isAdmin') === true;
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
/** The tier a token buys locally; the hub still decides on every call. */
|
|
47
|
+
export function credentialTier(token, opts) {
|
|
48
|
+
if (token.startsWith(ADMIN_TOKEN_PREFIX))
|
|
49
|
+
return 'admin';
|
|
50
|
+
if (token.startsWith(SCOPED_TOKEN_PREFIX))
|
|
51
|
+
return 'protected';
|
|
52
|
+
if (opts?.sessionIsAdmin === true)
|
|
53
|
+
return 'admin';
|
|
54
|
+
return jwtPayloadIsAdmin(token) ? 'admin' : 'protected';
|
|
34
55
|
}
|
|
35
56
|
/** No token could be resolved from any source. The message tells the operator what to do. */
|
|
36
57
|
export class MissingCredentialsError extends Error {
|
|
@@ -100,38 +121,39 @@ function parseSessionJson(content, filePath) {
|
|
|
100
121
|
export function resolveCredentials(inputs) {
|
|
101
122
|
const env = inputs.env ?? process.env;
|
|
102
123
|
const file = inputs.tokenFile ? readTokenFile(inputs.tokenFile) : null;
|
|
103
|
-
// Key the session lookup on the hub actually targeted: with no explicit
|
|
104
|
-
// server, `loadSession` falls back to the NEWEST session file, which may
|
|
105
|
-
// belong to a different hub than $CAMSTACK_SERVER.
|
|
106
124
|
const typed = inputs.server ?? env['CAMSTACK_SERVER'];
|
|
107
125
|
const targeted = typed ? normalizeHubAddress(typed) : file?.server;
|
|
108
126
|
const session = inputs.loadSession(targeted);
|
|
109
127
|
const server = targeted ?? session?.server;
|
|
110
|
-
const
|
|
111
|
-
const picked = pickToken(inputs.token, file, adminFile, env['CAMSTACK_TOKEN'], session);
|
|
128
|
+
const picked = pickToken(inputs.token, file, env['CAMSTACK_TOKEN'], session);
|
|
112
129
|
if (!picked)
|
|
113
130
|
throw new MissingCredentialsError(server);
|
|
114
|
-
const warning =
|
|
115
|
-
const tier = credentialTier(picked.token
|
|
131
|
+
const warning = file?.warning;
|
|
132
|
+
const tier = credentialTier(picked.token, {
|
|
133
|
+
...(picked.sessionIsAdmin === true ? { sessionIsAdmin: true } : {}),
|
|
134
|
+
});
|
|
116
135
|
return warning ? { server, ...picked, tier, warning } : { server, ...picked, tier };
|
|
117
136
|
}
|
|
118
|
-
function pickToken(flag, file,
|
|
137
|
+
function pickToken(flag, file, envToken, session) {
|
|
119
138
|
if (flag)
|
|
120
139
|
return { token: flag, source: 'flag' };
|
|
121
140
|
if (file)
|
|
122
141
|
return { token: file.token, source: 'token-file' };
|
|
123
|
-
if (adminFile)
|
|
124
|
-
return { token: adminFile.token, source: 'admin-token' };
|
|
125
142
|
if (envToken)
|
|
126
143
|
return { token: envToken, source: 'env' };
|
|
127
|
-
if (session)
|
|
128
|
-
return {
|
|
144
|
+
if (session) {
|
|
145
|
+
return {
|
|
146
|
+
token: session.token,
|
|
147
|
+
source: 'session',
|
|
148
|
+
...(session.isAdmin === true ? { sessionIsAdmin: true } : {}),
|
|
149
|
+
};
|
|
150
|
+
}
|
|
129
151
|
return null;
|
|
130
152
|
}
|
|
131
153
|
const REJECTION_ADVICE = {
|
|
132
|
-
session: 'The hub rejected the cached session
|
|
154
|
+
session: 'The hub rejected the cached session (revoked or expired). Run `camstack login` again.',
|
|
133
155
|
'token-file': 'The hub rejected the token from the token file (revoked, expired or lacking scope) — ask the operator who issued it for a new one.',
|
|
134
|
-
'admin-token': 'The hub rejected the admin token (revoked, expired, or its creator is no longer an admin) —
|
|
156
|
+
'admin-token': 'The hub rejected the admin token (revoked, expired, or its creator is no longer an admin) — pass a fresh token with --token or --token-file.',
|
|
135
157
|
env: 'The hub rejected $CAMSTACK_TOKEN (revoked, expired or lacking scope).',
|
|
136
158
|
flag: 'The hub rejected the --token value (revoked, expired or lacking scope).',
|
|
137
159
|
};
|
|
@@ -8,6 +8,8 @@ export interface SessionFile {
|
|
|
8
8
|
target: string;
|
|
9
9
|
}[];
|
|
10
10
|
readonly createdAt: number;
|
|
11
|
+
/** Whether the logged-in user is a hub administrator (JWT sessions). */
|
|
12
|
+
readonly isAdmin?: boolean;
|
|
11
13
|
/** Last time a command used this session (`touchSession`); absent on older files. */
|
|
12
14
|
readonly lastUsedAt?: number;
|
|
13
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/hub/session-store.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,qFAAqF;IACrF,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED,+EAA+E;AAC/E,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAKvD;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,GAAE,MAA4B,GAAG,MAAM,CAEjG;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,MAA4B,GAChC,MAAM,CAER;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,EAC/D,GAAG,GAAE,MAA4B,GAChC,MAAM,GAAG,SAAS,CAMpB;AAeD,4EAA4E;AAC5E,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAE3D;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,GAAE,MAA4B,GAAG,SAAS,WAAW,EAAE,CAEtF;AAoCD;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,WAAW,GAAG,IAAI,CAYpB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/hub/session-store.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC5D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;IAC1B,qFAAqF;IACrF,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED,+EAA+E;AAC/E,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,0EAA0E;AAC1E,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAKvD;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,GAAE,MAA4B,GAAG,MAAM,CAEjG;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,MAA4B,GAChC,MAAM,CAER;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,EAC/D,GAAG,GAAE,MAA4B,GAChC,MAAM,GAAG,SAAS,CAMpB;AAeD,4EAA4E;AAC5E,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAE3D;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,GAAE,MAA4B,GAAG,SAAS,WAAW,EAAE,CAEtF;AAoCD;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,WAAW,GAAG,IAAI,CAYpB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAWlE;AAED,wBAAgB,WAAW,CACzB,SAAS,CAAC,EAAE,MAAM,EAClB,GAAG,GAAE,MAA4B,GAChC,WAAW,GAAG,IAAI,CASpB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,GAAG,GAAE,MAA4B,GAAG,MAAM,CAK3F;AAED,+EAA+E;AAC/E,wBAAgB,YAAY,CAC1B,SAAS,EAAE,MAAM,EACjB,GAAG,GAAE,MAA4B,EACjC,GAAG,GAAE,MAAmB,GACvB,IAAI,CAQN;AAED,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,GAAE,MAA4B,GAAG,OAAO,CAK1F"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* The `camstack login` session cache — `~/.camstack/<host>.json` (0600), one
|
|
3
3
|
* file per hub. Moved here from the CLI so every hub-talking tool (CLI,
|
|
4
4
|
* `scripts/hub/hub.mjs`, the operator MCP) reads the SAME cache through the
|
|
5
|
-
* SAME code. The cache holds
|
|
6
|
-
*
|
|
5
|
+
* SAME code. The cache holds the login JWT from `camstack login` (or a legacy
|
|
6
|
+
* `cst_` scoped token), never a password.
|
|
7
7
|
*/
|
|
8
8
|
import * as fs from 'node:fs';
|
|
9
9
|
import * as os from 'node:os';
|
|
@@ -136,6 +136,8 @@ export function isSessionFile(value) {
|
|
|
136
136
|
return false;
|
|
137
137
|
if (!Array.isArray(v.scopes))
|
|
138
138
|
return false;
|
|
139
|
+
if (v.isAdmin !== undefined && typeof v.isAdmin !== 'boolean')
|
|
140
|
+
return false;
|
|
139
141
|
return true;
|
|
140
142
|
}
|
|
141
143
|
export function loadSession(serverUrl, dir = defaultSessionDir()) {
|
package/dist/index.d.ts
CHANGED
|
@@ -12,11 +12,11 @@ export { scaffoldAddon } from './scaffold/addon.js';
|
|
|
12
12
|
export { scaffoldCapStub } from './scaffold/cap-stub.js';
|
|
13
13
|
export { extendAddon } from './scaffold/extend.js';
|
|
14
14
|
export { listSkills, readSkill, resolveSkillsDir } from './skills.js';
|
|
15
|
-
export { ADMIN_TOKEN_PREFIX, authRejectedHint, credentialTier, MissingCredentialsError, readTokenFile, resolveCredentials, withAuthHint, } from './hub/credentials.js';
|
|
15
|
+
export { ADMIN_TOKEN_PREFIX, authRejectedHint, credentialTier, jwtPayloadIsAdmin, MissingCredentialsError, readTokenFile, resolveCredentials, withAuthHint, } from './hub/credentials.js';
|
|
16
16
|
export type { CachedSessionLike, CredentialInputs, CredentialSource, CredentialTier, ResolvedCredentials, TokenFileContents, } from './hub/credentials.js';
|
|
17
17
|
export { adminTokenFileForServer, clearSession, defaultSession, defaultSessionDir, findAdminTokenFile, isSessionFile, listSessions, loadSession, saveSession, sessionFileForServer, sessionRecency, slugForServer, touchSession, } from './hub/session-store.js';
|
|
18
18
|
export type { SessionFile } from './hub/session-store.js';
|
|
19
|
-
export { adminCredentialHint, adminLoginCommand, adminRejectedHint, adminTokenMetaFileForServer, adminTokenStatus, readPreviousAdminToken, REPO_LOCAL_LOGIN_ADMIN, saveAdminToken, } from './hub/admin-token-store.js';
|
|
19
|
+
export { adminCredentialHint, adminLoginCommand, adminRejectedHint, adminTokenMetaFileForServer, adminTokenStatus, readPreviousAdminToken, REPO_LOCAL_LOGIN, REPO_LOCAL_LOGIN_ADMIN, saveAdminToken, sessionLoginCommand, } from './hub/admin-token-store.js';
|
|
20
20
|
export type { AdminTokenMeta, AdminTokenStatus, PreviousAdminToken, } from './hub/admin-token-store.js';
|
|
21
21
|
export { DEFAULT_HUB_PORT, HubAddressError, normalizeHubAddress, validateHubAddress, } from './hub/hub-address.js';
|
|
22
22
|
export { resolveHubUrl } from './hub/hub-url.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAElE,YAAY,EACV,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,SAAS,EACT,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,GACf,MAAM,YAAY,CAAA;AAEnB,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EACL,WAAW,EACX,eAAe,EACf,WAAW,EACX,UAAU,GACX,MAAM,aAAa,CAAA;AAEpB,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,GACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAE7E,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAIrE,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACvB,aAAa,EACb,kBAAkB,EAClB,YAAY,GACb,MAAM,sBAAsB,CAAA;AAC7B,YAAY,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,uBAAuB,EACvB,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,YAAY,EACZ,WAAW,EACX,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,aAAa,EACb,YAAY,GACb,MAAM,wBAAwB,CAAA;AAC/B,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,2BAA2B,EAC3B,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -13,9 +13,9 @@ export { extendAddon } from './scaffold/extend.js';
|
|
|
13
13
|
export { listSkills, readSkill, resolveSkillsDir } from './skills.js';
|
|
14
14
|
// Hub access — the one credential chain, session cache, address and TLS trust
|
|
15
15
|
// shared by the CLI, scripts/hub/hub.mjs and the operator MCP (D835).
|
|
16
|
-
export { ADMIN_TOKEN_PREFIX, authRejectedHint, credentialTier, MissingCredentialsError, readTokenFile, resolveCredentials, withAuthHint, } from './hub/credentials.js';
|
|
16
|
+
export { ADMIN_TOKEN_PREFIX, authRejectedHint, credentialTier, jwtPayloadIsAdmin, MissingCredentialsError, readTokenFile, resolveCredentials, withAuthHint, } from './hub/credentials.js';
|
|
17
17
|
export { adminTokenFileForServer, clearSession, defaultSession, defaultSessionDir, findAdminTokenFile, isSessionFile, listSessions, loadSession, saveSession, sessionFileForServer, sessionRecency, slugForServer, touchSession, } from './hub/session-store.js';
|
|
18
|
-
export { adminCredentialHint, adminLoginCommand, adminRejectedHint, adminTokenMetaFileForServer, adminTokenStatus, readPreviousAdminToken, REPO_LOCAL_LOGIN_ADMIN, saveAdminToken, } from './hub/admin-token-store.js';
|
|
18
|
+
export { adminCredentialHint, adminLoginCommand, adminRejectedHint, adminTokenMetaFileForServer, adminTokenStatus, readPreviousAdminToken, REPO_LOCAL_LOGIN, REPO_LOCAL_LOGIN_ADMIN, saveAdminToken, sessionLoginCommand, } from './hub/admin-token-store.js';
|
|
19
19
|
export { DEFAULT_HUB_PORT, HubAddressError, normalizeHubAddress, validateHubAddress, } from './hub/hub-address.js';
|
|
20
20
|
export { resolveHubUrl } from './hub/hub-url.js';
|
|
21
21
|
export { createHubAgent, explainTlsFailure, hubCaFileForServer, resolveHubTls, } from './hub/hub-tls.js';
|
package/package.json
CHANGED