@mainwave/cli 0.2.0 → 0.2.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/dist/adapters/claude-desktop.js +16 -48
- package/dist/adapters/claude-desktop.js.map +1 -1
- package/dist/adapters/copilot-chat.js +5 -28
- package/dist/adapters/copilot-chat.js.map +1 -1
- package/dist/adapters/copilot-cli.js +7 -30
- package/dist/adapters/copilot-cli.js.map +1 -1
- package/dist/core/format.js +48 -35
- package/dist/core/format.js.map +1 -1
- package/dist/core/headers.js +221 -0
- package/dist/core/headers.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { homedir } from 'node:os';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
3
|
import { jsonManagedCodec } from '../core/codecs/json-managed.js';
|
|
4
|
+
import { buildHeaders, HEADER_NAME, headerBearerToken, jsonObjectHeaders, kvPairsHeaders, } from '../core/headers.js';
|
|
4
5
|
/**
|
|
5
6
|
* Claude Desktop (Cowork on Team/Enterprise, and the third-party-inference
|
|
6
7
|
* "3P" builds) exports session activity to any OpenTelemetry collector — this
|
|
@@ -81,39 +82,25 @@ const contentCategories = (optIns) => {
|
|
|
81
82
|
cats.push('toolContent');
|
|
82
83
|
return cats;
|
|
83
84
|
};
|
|
84
|
-
/**
|
|
85
|
-
|
|
86
|
-
* surfaces need (see `buildEnv` for the JSON managed-config form and
|
|
87
|
-
* `headersAsConsoleValue` for the console form). Key order is stable so a re-run
|
|
88
|
-
* doesn't churn the JSON.
|
|
89
|
-
*/
|
|
90
|
-
const buildHeaders = ({ ucid, apiKey, }) => {
|
|
91
|
-
const headers = { Authorization: `Bearer ${apiKey}` };
|
|
92
|
-
// Omit the UCID header when unset — events land unmapped. See MAI-1033.
|
|
93
|
-
if (ucid)
|
|
94
|
-
headers['X-Mainwave-UCID'] = ucid;
|
|
95
|
-
headers['X-Mainwave-Source'] = SOURCE_VALUE;
|
|
96
|
-
return headers;
|
|
97
|
-
};
|
|
85
|
+
/** The tenancy/auth headers, in the shared shape both surfaces encode from. */
|
|
86
|
+
const headersFor = (input) => buildHeaders({ apiKey: input.apiKey, ucid: input.ucid, source: SOURCE_VALUE });
|
|
98
87
|
/**
|
|
99
88
|
* The first-party Cowork console (Admin settings → Cowork) takes OTLP headers in
|
|
100
89
|
* the OpenTelemetry env-var convention — comma-separated `key=value` pairs — and
|
|
101
90
|
* REJECTS a JSON object (verified against a live claude.ai admin-settings install,
|
|
102
91
|
* MAI-1187). The JSON-object form (`buildEnv`'s `otlpHeaders`) is the
|
|
103
92
|
* managed-config (plist / registry / managed-settings.json) encoding only; the
|
|
104
|
-
* two must not be swapped.
|
|
105
|
-
*
|
|
93
|
+
* two must not be swapped. Both come from `core/headers.ts`, which is also what
|
|
94
|
+
* the display masker decodes with.
|
|
106
95
|
*/
|
|
107
|
-
const headersAsConsoleValue = (headers) =>
|
|
108
|
-
.map(([k, v]) => `${k}=${v}`)
|
|
109
|
-
.join(',');
|
|
96
|
+
const headersAsConsoleValue = (headers) => kvPairsHeaders.encode(headers);
|
|
110
97
|
const buildEnv = ({ ucid, collectorUrl, apiKey, optIns, }) => {
|
|
111
98
|
const out = {
|
|
112
99
|
[KEY.endpoint]: stripTrailingSlash(collectorUrl),
|
|
113
100
|
[KEY.protocol]: DEFAULT_PROTOCOL,
|
|
114
101
|
// Managed-config surface: JSON-object string, the encoding the plist /
|
|
115
102
|
// registry / managed-settings.json keys require.
|
|
116
|
-
[KEY.headers]:
|
|
103
|
+
[KEY.headers]: jsonObjectHeaders.encode(headersFor({ ucid, apiKey })),
|
|
117
104
|
[KEY.tracesEnabled]: 'true',
|
|
118
105
|
};
|
|
119
106
|
const cats = contentCategories(optIns);
|
|
@@ -121,19 +108,7 @@ const buildEnv = ({ ucid, collectorUrl, apiKey, optIns, }) => {
|
|
|
121
108
|
out[KEY.contentCapture] = JSON.stringify(cats);
|
|
122
109
|
return out;
|
|
123
110
|
};
|
|
124
|
-
const
|
|
125
|
-
if (!raw)
|
|
126
|
-
return undefined;
|
|
127
|
-
try {
|
|
128
|
-
const parsed = JSON.parse(raw);
|
|
129
|
-
return parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)
|
|
130
|
-
? parsed
|
|
131
|
-
: undefined;
|
|
132
|
-
}
|
|
133
|
-
catch {
|
|
134
|
-
return undefined;
|
|
135
|
-
}
|
|
136
|
-
};
|
|
111
|
+
const parseHeaders = (raw) => raw ? jsonObjectHeaders.decode(raw) : undefined;
|
|
137
112
|
const tryParseArray = (raw) => {
|
|
138
113
|
if (!raw)
|
|
139
114
|
return [];
|
|
@@ -145,11 +120,6 @@ const tryParseArray = (raw) => {
|
|
|
145
120
|
return [];
|
|
146
121
|
}
|
|
147
122
|
};
|
|
148
|
-
const parseBearer = (header) => {
|
|
149
|
-
if (typeof header !== 'string' || !header.toLowerCase().startsWith('bearer '))
|
|
150
|
-
return undefined;
|
|
151
|
-
return header.slice('bearer '.length).trim() || undefined;
|
|
152
|
-
};
|
|
153
123
|
const parseEnv = (env) => {
|
|
154
124
|
if (!MANAGED_ENV_KEYS.some((k) => k in env))
|
|
155
125
|
return {};
|
|
@@ -158,13 +128,13 @@ const parseEnv = (env) => {
|
|
|
158
128
|
// per-signal path itself, so there is no /v1/<signal> suffix to strip.
|
|
159
129
|
if (env[KEY.endpoint])
|
|
160
130
|
out.collectorUrl = env[KEY.endpoint];
|
|
161
|
-
const headers =
|
|
131
|
+
const headers = parseHeaders(env[KEY.headers]);
|
|
162
132
|
if (headers) {
|
|
163
|
-
const token =
|
|
133
|
+
const token = headerBearerToken(headers[HEADER_NAME.authorization]);
|
|
164
134
|
if (token)
|
|
165
135
|
out.apiKey = token;
|
|
166
|
-
const ucid = headers[
|
|
167
|
-
if (
|
|
136
|
+
const ucid = headers[HEADER_NAME.ucid];
|
|
137
|
+
if (ucid)
|
|
168
138
|
out.ucid = ucid;
|
|
169
139
|
}
|
|
170
140
|
const cats = tryParseArray(env[KEY.contentCapture]);
|
|
@@ -182,13 +152,11 @@ const parseEnv = (env) => {
|
|
|
182
152
|
* doctor.ts would always report "missing mainwave.ucid" for Desktop setups.
|
|
183
153
|
*/
|
|
184
154
|
const normalizeForGenericChecks = (env) => {
|
|
185
|
-
const headers =
|
|
186
|
-
const auth = headers?.Authorization;
|
|
187
|
-
const ucid = headers?.['X-Mainwave-UCID'];
|
|
155
|
+
const headers = parseHeaders(env[KEY.headers]);
|
|
188
156
|
return {
|
|
189
157
|
endpoint: env[KEY.endpoint],
|
|
190
|
-
auth:
|
|
191
|
-
ucid:
|
|
158
|
+
auth: headers?.[HEADER_NAME.authorization],
|
|
159
|
+
ucid: headers?.[HEADER_NAME.ucid],
|
|
192
160
|
};
|
|
193
161
|
};
|
|
194
162
|
const collectChecks = (env) => {
|
|
@@ -244,7 +212,7 @@ const HIERARCHY = [
|
|
|
244
212
|
const printPostSetupInstructions = (input) => {
|
|
245
213
|
const env = buildEnv(input);
|
|
246
214
|
// Console headers are comma-separated key=value (NOT the JSON in the profile).
|
|
247
|
-
const consoleHeaders = headersAsConsoleValue(
|
|
215
|
+
const consoleHeaders = headersAsConsoleValue(headersFor(input));
|
|
248
216
|
const lines = [
|
|
249
217
|
'Claude Desktop reads OTel config from a managed source, not this file directly.',
|
|
250
218
|
'Deploy the generated profile one of two ways:',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-desktop.js","sourceRoot":"","sources":["../../src/adapters/claude-desktop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;
|
|
1
|
+
{"version":3,"file":"claude-desktop.js","sourceRoot":"","sources":["../../src/adapters/claude-desktop.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { join } from 'node:path';
|
|
|
3
3
|
import { envFileCodec } from '../core/codecs/env-file.js';
|
|
4
4
|
import { jsonFlatCodec } from '../core/codecs/json-flat.js';
|
|
5
5
|
import { color } from '../core/format.js';
|
|
6
|
+
import { buildHeaders, HEADER_NAME, headerBearerToken, kvPairsHeaders } from '../core/headers.js';
|
|
6
7
|
import { renderEnvFileBlock } from '../core/post-setup.js';
|
|
7
8
|
/**
|
|
8
9
|
* VS Code's GitHub Copilot Chat extension splits OTLP configuration across
|
|
@@ -59,32 +60,8 @@ const LOCAL_SETTINGS_PATH = join('.vscode', 'settings.json');
|
|
|
59
60
|
const ENV_FILE_GLOBAL_PATH = join(homedir(), '.mainwave', 'copilot-chat.env');
|
|
60
61
|
const ENV_FILE_LOCAL_PATH = join('.mainwave', 'copilot-chat.env');
|
|
61
62
|
const stripTrailingSlash = (url) => url.replace(/\/+$/, '');
|
|
62
|
-
const buildHeadersValue = (apiKey, ucid) =>
|
|
63
|
-
|
|
64
|
-
// Omit the UCID header when unset — events land unmapped. See MAI-1033.
|
|
65
|
-
...(ucid ? [`X-Mainwave-UCID=${ucid}`] : []),
|
|
66
|
-
`X-Mainwave-Source=${SOURCE_VALUE}`,
|
|
67
|
-
].join(',');
|
|
68
|
-
const parseHeaders = (raw) => {
|
|
69
|
-
const out = {};
|
|
70
|
-
for (const pair of raw.split(',')) {
|
|
71
|
-
const eq = pair.indexOf('=');
|
|
72
|
-
if (eq < 0)
|
|
73
|
-
continue;
|
|
74
|
-
const k = pair.slice(0, eq).trim();
|
|
75
|
-
const v = pair.slice(eq + 1).trim();
|
|
76
|
-
if (k)
|
|
77
|
-
out[k] = v;
|
|
78
|
-
}
|
|
79
|
-
return out;
|
|
80
|
-
};
|
|
81
|
-
const parseBearer = (auth) => {
|
|
82
|
-
if (!auth)
|
|
83
|
-
return undefined;
|
|
84
|
-
if (!auth.toLowerCase().startsWith('bearer '))
|
|
85
|
-
return undefined;
|
|
86
|
-
return auth.slice('bearer '.length).trim() || undefined;
|
|
87
|
-
};
|
|
63
|
+
const buildHeadersValue = (apiKey, ucid) => kvPairsHeaders.encode(buildHeaders({ apiKey, ucid, source: SOURCE_VALUE }));
|
|
64
|
+
const parseHeaders = (raw) => kvPairsHeaders.decode(raw) ?? {};
|
|
88
65
|
const buildEnv = ({ collectorUrl, optIns }) => ({
|
|
89
66
|
[VSCODE_KEY_ENABLED]: 'true',
|
|
90
67
|
[VSCODE_KEY_EXPORTER_TYPE]: 'otlp-http',
|
|
@@ -126,10 +103,10 @@ const parseEnvFile = (env) => {
|
|
|
126
103
|
const raw = env.OTEL_EXPORTER_OTLP_HEADERS;
|
|
127
104
|
if (raw) {
|
|
128
105
|
const headers = parseHeaders(raw);
|
|
129
|
-
const token =
|
|
106
|
+
const token = headerBearerToken(headers[HEADER_NAME.authorization]);
|
|
130
107
|
if (token)
|
|
131
108
|
out.apiKey = token;
|
|
132
|
-
const u = headers[
|
|
109
|
+
const u = headers[HEADER_NAME.ucid];
|
|
133
110
|
if (u)
|
|
134
111
|
out.ucid = u;
|
|
135
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-chat.js","sourceRoot":"","sources":["../../src/adapters/copilot-chat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAU1D;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,YAAY,GAAG,2BAA2B,CAAA;AAEhD,MAAM,kBAAkB,GAAG,kCAAkC,CAAA;AAC7D,MAAM,wBAAwB,GAAG,uCAAuC,CAAA;AACxE,MAAM,wBAAwB,GAAG,uCAAuC,CAAA;AACxE,MAAM,0BAA0B,GAAG,yCAAyC,CAAA;AAE5E,MAAM,qBAAqB,GAAG;IAC5B,kBAAkB;IAClB,wBAAwB;IACxB,wBAAwB;IACxB,0BAA0B;CAClB,CAAA;AAEV,MAAM,gBAAgB,GAAG;IACvB,6BAA6B;IAC7B,4BAA4B;IAC5B,6BAA6B;IAC7B,0BAA0B;CAClB,CAAA;AAEV,MAAM,gBAAgB,GAAG,GAAW,EAAE;IACpC,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAA;IAC7B,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;IAC3F,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAA;QAC5E,OAAO,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;IACvD,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,CAAA;AACpE,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,gBAAgB,EAAE,CAAA;AAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;AAC5D,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;AAC7E,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAA;AAEjE,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAE3E,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,IAAa,EAAU,EAAE,CAClE
|
|
1
|
+
{"version":3,"file":"copilot-chat.js","sourceRoot":"","sources":["../../src/adapters/copilot-chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { homedir } from 'node:os';
|
|
|
2
2
|
import { join } from 'node:path';
|
|
3
3
|
import { envFileCodec } from '../core/codecs/env-file.js';
|
|
4
4
|
import { color } from '../core/format.js';
|
|
5
|
+
import { buildHeaders, HEADER_NAME, headerBearerToken, kvPairsHeaders } from '../core/headers.js';
|
|
5
6
|
import { renderEnvFileBlock } from '../core/post-setup.js';
|
|
6
7
|
/**
|
|
7
8
|
* GitHub Copilot CLI (the standalone `copilot` terminal binary) configures
|
|
@@ -38,32 +39,8 @@ const MANAGED_ENV_KEYS = [
|
|
|
38
39
|
const GLOBAL_PATH = join(homedir(), '.mainwave', 'copilot-cli.env');
|
|
39
40
|
const LOCAL_PATH = join('.mainwave', 'copilot-cli.env');
|
|
40
41
|
const stripTrailingSlash = (url) => url.replace(/\/+$/, '');
|
|
41
|
-
const buildHeadersValue = (apiKey, ucid) =>
|
|
42
|
-
|
|
43
|
-
// Omit the UCID header when unset — events land unmapped. See MAI-1033.
|
|
44
|
-
...(ucid ? [`X-Mainwave-UCID=${ucid}`] : []),
|
|
45
|
-
`X-Mainwave-Source=${SOURCE_VALUE}`,
|
|
46
|
-
].join(',');
|
|
47
|
-
const parseHeaders = (raw) => {
|
|
48
|
-
const out = {};
|
|
49
|
-
for (const pair of raw.split(',')) {
|
|
50
|
-
const eq = pair.indexOf('=');
|
|
51
|
-
if (eq < 0)
|
|
52
|
-
continue;
|
|
53
|
-
const k = pair.slice(0, eq).trim();
|
|
54
|
-
const v = pair.slice(eq + 1).trim();
|
|
55
|
-
if (k)
|
|
56
|
-
out[k] = v;
|
|
57
|
-
}
|
|
58
|
-
return out;
|
|
59
|
-
};
|
|
60
|
-
const parseBearer = (auth) => {
|
|
61
|
-
if (!auth)
|
|
62
|
-
return undefined;
|
|
63
|
-
if (!auth.toLowerCase().startsWith('bearer '))
|
|
64
|
-
return undefined;
|
|
65
|
-
return auth.slice('bearer '.length).trim() || undefined;
|
|
66
|
-
};
|
|
42
|
+
const buildHeadersValue = (apiKey, ucid) => kvPairsHeaders.encode(buildHeaders({ apiKey, ucid, source: SOURCE_VALUE }));
|
|
43
|
+
const parseHeaders = (raw) => kvPairsHeaders.decode(raw) ?? {};
|
|
67
44
|
const buildEnv = ({ ucid, collectorUrl, apiKey }) => ({
|
|
68
45
|
OTEL_EXPORTER_OTLP_ENDPOINT: stripTrailingSlash(collectorUrl),
|
|
69
46
|
OTEL_EXPORTER_OTLP_HEADERS: buildHeadersValue(apiKey, ucid),
|
|
@@ -81,10 +58,10 @@ const parseEnv = (env) => {
|
|
|
81
58
|
const raw = env.OTEL_EXPORTER_OTLP_HEADERS;
|
|
82
59
|
if (raw) {
|
|
83
60
|
const headers = parseHeaders(raw);
|
|
84
|
-
const token =
|
|
61
|
+
const token = headerBearerToken(headers[HEADER_NAME.authorization]);
|
|
85
62
|
if (token)
|
|
86
63
|
out.apiKey = token;
|
|
87
|
-
const ucid = headers[
|
|
64
|
+
const ucid = headers[HEADER_NAME.ucid];
|
|
88
65
|
if (ucid)
|
|
89
66
|
out.ucid = ucid;
|
|
90
67
|
}
|
|
@@ -97,8 +74,8 @@ const normalizeForGenericChecks = (env) => {
|
|
|
97
74
|
let ucid;
|
|
98
75
|
if (raw) {
|
|
99
76
|
const headers = parseHeaders(raw);
|
|
100
|
-
auth = headers.
|
|
101
|
-
ucid = headers[
|
|
77
|
+
auth = headers[HEADER_NAME.authorization];
|
|
78
|
+
ucid = headers[HEADER_NAME.ucid];
|
|
102
79
|
}
|
|
103
80
|
return { endpoint, auth, ucid };
|
|
104
81
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-cli.js","sourceRoot":"","sources":["../../src/adapters/copilot-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAI1D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,MAAM,YAAY,GAAG,0BAA0B,CAAA;AAE/C,MAAM,gBAAgB,GAAG;IACvB,6BAA6B;IAC7B,4BAA4B;IAC5B,6BAA6B;IAC7B,sBAAsB;CACd,CAAA;AAEV,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAA;AACnE,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAA;AAEvD,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAE3E,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,IAAa,EAAU,EAAE,CAClE
|
|
1
|
+
{"version":3,"file":"copilot-cli.js","sourceRoot":"","sources":["../../src/adapters/copilot-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACjG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAI1D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,MAAM,YAAY,GAAG,0BAA0B,CAAA;AAE/C,MAAM,gBAAgB,GAAG;IACvB,6BAA6B;IAC7B,4BAA4B;IAC5B,6BAA6B;IAC7B,sBAAsB;CACd,CAAA;AAEV,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,iBAAiB,CAAC,CAAA;AACnE,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAA;AAEvD,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AAE3E,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,IAAa,EAAU,EAAE,CAClE,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAA;AAE7E,MAAM,YAAY,GAAG,CAAC,GAAW,EAA0B,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;AAE9F,MAAM,QAAQ,GAAG,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAiB,EAA0B,EAAE,CAAC,CAAC;IAC3F,2BAA2B,EAAE,kBAAkB,CAAC,YAAY,CAAC;IAC7D,0BAA0B,EAAE,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC;IAC3D,2BAA2B,EAAE,eAAe;IAC5C,oBAAoB,EAAE,MAAM;CAC7B,CAAC,CAAA;AAEF,MAAM,QAAQ,GAAG,CAAC,GAA2B,EAA0B,EAAE;IACvE,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAA;IAC5D,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAA;IAE7B,MAAM,GAAG,GAA2B,EAAE,CAAA;IAEtC,MAAM,QAAQ,GAAG,GAAG,CAAC,2BAA2B,CAAA;IAChD,IAAI,QAAQ;QAAE,GAAG,CAAC,YAAY,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAA;IAE7D,MAAM,GAAG,GAAG,GAAG,CAAC,0BAA0B,CAAA;IAC1C,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACjC,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;QACnE,IAAI,KAAK;YAAE,GAAG,CAAC,MAAM,GAAG,KAAK,CAAA;QAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,IAAI;YAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAChC,GAAqC,EACd,EAAE;IACzB,MAAM,QAAQ,GAAG,GAAG,CAAC,2BAA2B,CAAA;IAChD,MAAM,GAAG,GAAG,GAAG,CAAC,0BAA0B,CAAA;IAC1C,IAAI,IAAwB,CAAA;IAC5B,IAAI,IAAwB,CAAA;IAC5B,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;QACjC,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;QACzC,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;AACjC,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,CACjC,MAAqB,EACrB,QAA4B,QAAQ,EAC5B,EAAE;IACV,MAAM,IAAI,GAAG,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAA;IACzD,OAAO;QACL,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC;QAC/B,EAAE;QACF,KAAK,CAAC,GAAG,CAAC,sCAAsC,CAAC;QACjD,KAAK,KAAK,CAAC,IAAI,CAAC,wCAAwC,CAAC,EAAE;QAC3D,EAAE;QACF,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC;QACvB,KAAK,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;KAC7B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACd,CAAC,CAAA;AAED,MAAM,SAAS,GAA6B;IAC1C;QACE,EAAE,EAAE,cAAc;QAClB,KAAK,EAAE,iBAAiB;QACxB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,MAAM;KACb;IACD;QACE,EAAE,EAAE,MAAM;QACV,KAAK,EAAE,eAAe;QACtB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,MAAM;KACb;CACF,CAAA;AAED,MAAM,CAAC,MAAM,UAAU,GAAY;IACjC,IAAI,EAAE,aAAa;IACnB,WAAW,EAAE,oBAAoB;IACjC,KAAK,EAAE;QACL,KAAK,EAAE,UAAU;QACjB,MAAM,EAAE,WAAW;KACpB;IACD,KAAK,EAAE,YAAY;IACnB,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,SAAS;IACpB,QAAQ;IACR,QAAQ;IACR,yBAAyB;IACzB,0BAA0B;CAC3B,CAAA"}
|
package/dist/core/format.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import pc from 'picocolors';
|
|
2
|
+
import { hasCredentialShape, isBearerValue, isSecretHeaderName, redactHeaderCollection, } from './headers.js';
|
|
2
3
|
/**
|
|
3
4
|
* Masks a secret the way the platform UI does (`ApiKeysPage`): reveals the
|
|
4
5
|
* first 8 characters — the stored `key_prefix` — then a fixed `••••` run, so a
|
|
@@ -11,34 +12,11 @@ export const maskSecret = (value) => {
|
|
|
11
12
|
return '••••';
|
|
12
13
|
return `${value.slice(0, 8)}••••`;
|
|
13
14
|
};
|
|
14
|
-
/**
|
|
15
|
-
* Masks an `OTEL_EXPORTER_OTLP_HEADERS`-shaped value, leaving non-secret keys
|
|
16
|
-
* visible and masking the bearer token portion. Other key=value pairs in the
|
|
17
|
-
* comma-separated string pass through unchanged.
|
|
18
|
-
*/
|
|
19
|
-
export const maskAuthHeader = (value) => value
|
|
20
|
-
.split(',')
|
|
21
|
-
.map((pair) => {
|
|
22
|
-
const eq = pair.indexOf('=');
|
|
23
|
-
if (eq < 0)
|
|
24
|
-
return pair;
|
|
25
|
-
const key = pair.slice(0, eq);
|
|
26
|
-
const v = pair.slice(eq + 1).trim();
|
|
27
|
-
if (key.trim().toLowerCase() !== 'authorization')
|
|
28
|
-
return pair;
|
|
29
|
-
if (v.toLowerCase().startsWith('bearer ')) {
|
|
30
|
-
const token = v.slice('bearer '.length).trim();
|
|
31
|
-
return `${key}=Bearer ${maskSecret(token)}`;
|
|
32
|
-
}
|
|
33
|
-
return `${key}=${maskSecret(v)}`;
|
|
34
|
-
})
|
|
35
|
-
.join(',');
|
|
36
15
|
/** Last dotted segment of a key, case-insensitive — `otel.exporter.otlp-http.headers.Authorization` → `authorization`. */
|
|
37
16
|
const lastSegment = (key) => {
|
|
38
17
|
const parts = key.split('.');
|
|
39
18
|
return (parts[parts.length - 1] ?? key).toLowerCase();
|
|
40
19
|
};
|
|
41
|
-
const BEARER_PREFIX_RE = /^\s*bearer\s+\S/i;
|
|
42
20
|
/**
|
|
43
21
|
* Capture a `Bearer <token>` value. eslint(prefer-regexp-exec) would prefer
|
|
44
22
|
* .exec, but that token is what the repo's security hook scans for. Stick
|
|
@@ -56,24 +34,59 @@ const maskBearerValue = (value) => {
|
|
|
56
34
|
}
|
|
57
35
|
return `${leading}${prefix} ${maskSecret(token.trim())}`;
|
|
58
36
|
};
|
|
37
|
+
/**
|
|
38
|
+
* Stands in for a value that carries something credential-shaped which no
|
|
39
|
+
* declared encoding could render. Printing the value would leak; printing
|
|
40
|
+
* nothing would hide that the file is broken — the marker says both.
|
|
41
|
+
*/
|
|
42
|
+
const UNREADABLE = '<unreadable value, redacted>';
|
|
43
|
+
/**
|
|
44
|
+
* Masks a value that holds a header collection, by handing it to each encoding
|
|
45
|
+
* `core/headers.ts` declares — the comma-separated `key=value` form of
|
|
46
|
+
* `OTEL_EXPORTER_OTLP_HEADERS` and the Cowork console, or the JSON-object form
|
|
47
|
+
* of Claude Desktop's `otlpHeaders`.
|
|
48
|
+
*
|
|
49
|
+
* Dispatching on the *value's* encoding rather than the setting's name is the
|
|
50
|
+
* point: adapters call this key `otlpHeaders`, `OTEL_EXPORTER_OTLP_HEADERS`, or
|
|
51
|
+
* whatever their tool wants, and a name-based masker misses every name it
|
|
52
|
+
* wasn't told about — which is how MAI-1340 printed a live key.
|
|
53
|
+
*
|
|
54
|
+
* Fails closed. When nothing can render the value — truncated JSON, a nested
|
|
55
|
+
* non-string value, a token containing the `,` delimiter — the value is
|
|
56
|
+
* replaced with a marker rather than echoed. `doctor` prints what is on disk,
|
|
57
|
+
* and a hand-edited or MDM-mangled profile is exactly where that bites.
|
|
58
|
+
*/
|
|
59
|
+
const maskHeaderCollection = (value) => {
|
|
60
|
+
const redacted = redactHeaderCollection(value, maskBearerValue);
|
|
61
|
+
if (redacted !== undefined)
|
|
62
|
+
return redacted;
|
|
63
|
+
return hasCredentialShape(value) ? UNREADABLE : value;
|
|
64
|
+
};
|
|
65
|
+
/**
|
|
66
|
+
* Masks an `OTEL_EXPORTER_OTLP_HEADERS`-shaped value, leaving non-secret keys
|
|
67
|
+
* visible and masking the bearer token portion. Kept as a named entry point for
|
|
68
|
+
* the env-var header form; values carrying no credential pass through
|
|
69
|
+
* unchanged, and unrenderable ones are replaced with a marker.
|
|
70
|
+
*/
|
|
71
|
+
export const maskAuthHeader = (value) => maskHeaderCollection(value);
|
|
59
72
|
/**
|
|
60
73
|
* Mask any secret-looking value before printing to the user.
|
|
61
74
|
*
|
|
62
|
-
* 1.
|
|
63
|
-
*
|
|
64
|
-
*
|
|
65
|
-
*
|
|
66
|
-
*
|
|
75
|
+
* 1. Any value that looks like a Bearer token — a single header value, such as
|
|
76
|
+
* Codex's one-TOML-key-per-header shape. Checked first so a base64 token's
|
|
77
|
+
* `=` padding can't be mistaken for a `key=value` pair below.
|
|
78
|
+
* 2. Any key whose last dotted segment names a secret header (`authorization`),
|
|
79
|
+
* for non-Bearer credential values.
|
|
80
|
+
* 3. A whole header collection in any encoding `core/headers.ts` declares —
|
|
81
|
+
* regardless of what the setting holding it is called, and failing closed
|
|
82
|
+
* when the value carries a credential nothing can render.
|
|
67
83
|
*/
|
|
68
84
|
export const maskForDisplay = (envKey, value) => {
|
|
69
|
-
if (
|
|
70
|
-
return maskAuthHeader(value);
|
|
71
|
-
if (lastSegment(envKey) === 'authorization') {
|
|
72
|
-
return BEARER_PREFIX_RE.test(value) ? maskBearerValue(value) : maskSecret(value);
|
|
73
|
-
}
|
|
74
|
-
if (BEARER_PREFIX_RE.test(value))
|
|
85
|
+
if (isBearerValue(value))
|
|
75
86
|
return maskBearerValue(value);
|
|
76
|
-
|
|
87
|
+
if (isSecretHeaderName(lastSegment(envKey)))
|
|
88
|
+
return maskSecret(value);
|
|
89
|
+
return maskHeaderCollection(value);
|
|
77
90
|
};
|
|
78
91
|
/** Renders a settings diff as plain text suitable for stdout. */
|
|
79
92
|
export const renderDiff = (diff) => {
|
package/dist/core/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/core/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/core/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The OTLP header collection every adapter sends to the collector, the
|
|
3
|
+
* encodings a single settings value can carry it in, and the rule for which
|
|
4
|
+
* header holds a secret. One module owns all three because the display path
|
|
5
|
+
* has to reverse exactly what the build path produced: `core/format.ts` masks
|
|
6
|
+
* a rendered value by asking each encoding declared here to redact it, rather
|
|
7
|
+
* than pattern-matching the setting's name.
|
|
8
|
+
*
|
|
9
|
+
* That coupling is the fix for MAI-1340. Claude Desktop stores its headers as
|
|
10
|
+
* a JSON-object string under `otlpHeaders`; the masker only knew the
|
|
11
|
+
* comma-separated env-var form and two key names, so it printed a live org key
|
|
12
|
+
* in the wizard diff and in `doctor`. An adapter that needs a fourth encoding
|
|
13
|
+
* adds it to `HEADER_ENCODINGS` — which is what it has to build with — and the
|
|
14
|
+
* masker picks it up with no change.
|
|
15
|
+
*
|
|
16
|
+
* Adapters that split headers across one settings key per header (Codex CLI's
|
|
17
|
+
* `otel.*.otlp-http.headers.Authorization`) carry no collection to decode; the
|
|
18
|
+
* masker catches those via `isSecretHeaderName` on the key's last dotted
|
|
19
|
+
* segment, against the same name list used here.
|
|
20
|
+
*/
|
|
21
|
+
export const HEADER_NAME = {
|
|
22
|
+
authorization: 'Authorization',
|
|
23
|
+
ucid: 'X-Mainwave-UCID',
|
|
24
|
+
source: 'X-Mainwave-Source',
|
|
25
|
+
};
|
|
26
|
+
/**
|
|
27
|
+
* Header names whose value is a credential, lowercased for comparison. The
|
|
28
|
+
* single source of truth for "this must never be printed" — consulted both
|
|
29
|
+
* when redacting an encoded collection and when masking a per-header key.
|
|
30
|
+
*/
|
|
31
|
+
const SECRET_HEADER_NAMES = [HEADER_NAME.authorization.toLowerCase()];
|
|
32
|
+
export const isSecretHeaderName = (name) => SECRET_HEADER_NAMES.includes(name.trim().toLowerCase());
|
|
33
|
+
const BEARER_VALUE_RE = /^\s*bearer\s+\S/i;
|
|
34
|
+
/** True when a header value carries a bearer token, whatever the header is called. */
|
|
35
|
+
export const isBearerValue = (value) => BEARER_VALUE_RE.test(value);
|
|
36
|
+
/**
|
|
37
|
+
* A header entry must be masked when its name is a known credential header, or
|
|
38
|
+
* when the value is bearer-shaped regardless of name — defense in depth for a
|
|
39
|
+
* future tool that names its auth header something else.
|
|
40
|
+
*/
|
|
41
|
+
const isSensitiveEntry = (name, value) => isSecretHeaderName(name) || isBearerValue(value);
|
|
42
|
+
const CREDENTIAL_SHAPE_RES = [
|
|
43
|
+
/bearer\s+\S/i,
|
|
44
|
+
new RegExp(SECRET_HEADER_NAMES.join('|'), 'i'),
|
|
45
|
+
];
|
|
46
|
+
/**
|
|
47
|
+
* True when a string looks like it carries a credential *somewhere* — a bearer
|
|
48
|
+
* token or a secret header name, at any offset.
|
|
49
|
+
*
|
|
50
|
+
* This is the fail-closed trigger, not a masking rule: a value no encoding
|
|
51
|
+
* could decode (truncated JSON, a nested non-string value, a token containing
|
|
52
|
+
* the delimiter) must never be rendered verbatim when it might hold a key.
|
|
53
|
+
* `doctor` reads whatever is on disk, and a managed-settings file is exactly
|
|
54
|
+
* the thing an MDM or a human hand-edits into an unparseable state.
|
|
55
|
+
*/
|
|
56
|
+
export const hasCredentialShape = (raw) => CREDENTIAL_SHAPE_RES.some((re) => re.test(raw));
|
|
57
|
+
/**
|
|
58
|
+
* The tenancy/auth headers, in a stable key order so a re-run doesn't churn the
|
|
59
|
+
* encoded value (and therefore doesn't produce a spurious wizard diff).
|
|
60
|
+
*/
|
|
61
|
+
export const buildHeaders = ({ apiKey, ucid, source, }) => {
|
|
62
|
+
const headers = {
|
|
63
|
+
[HEADER_NAME.authorization]: `Bearer ${apiKey}`,
|
|
64
|
+
};
|
|
65
|
+
if (ucid)
|
|
66
|
+
headers[HEADER_NAME.ucid] = ucid;
|
|
67
|
+
headers[HEADER_NAME.source] = source;
|
|
68
|
+
return headers;
|
|
69
|
+
};
|
|
70
|
+
/** Extracts the token from a `Bearer <token>` header value. */
|
|
71
|
+
export const headerBearerToken = (value) => {
|
|
72
|
+
if (typeof value !== 'string' || !value.toLowerCase().startsWith('bearer '))
|
|
73
|
+
return undefined;
|
|
74
|
+
return value.slice('bearer '.length).trim() || undefined;
|
|
75
|
+
};
|
|
76
|
+
/**
|
|
77
|
+
* Renders one decoded header entry. Sensitive entries are masked; the rest are
|
|
78
|
+
* recursed into first, so a value that itself holds an encoded collection (a
|
|
79
|
+
* doubly-encoded blob from a hand-written profile) is masked rather than
|
|
80
|
+
* printed. Returns `undefined` to decline — the value looks like it carries a
|
|
81
|
+
* credential but no encoding could render it — which propagates up and makes
|
|
82
|
+
* the whole collection fail closed.
|
|
83
|
+
*/
|
|
84
|
+
const redactEntry = (name, value, mask) => {
|
|
85
|
+
if (isSensitiveEntry(name, value))
|
|
86
|
+
return mask(value);
|
|
87
|
+
const nested = redactHeaderCollection(value, mask);
|
|
88
|
+
if (nested !== undefined)
|
|
89
|
+
return nested;
|
|
90
|
+
return hasCredentialShape(value) ? undefined : value;
|
|
91
|
+
};
|
|
92
|
+
const isPlainObject = (v) => v !== null && typeof v === 'object' && !Array.isArray(v);
|
|
93
|
+
/**
|
|
94
|
+
* JSON-object string — the managed-configuration encoding (macOS plist,
|
|
95
|
+
* Windows registry, Linux `managed-settings.json`) that Claude Desktop's
|
|
96
|
+
* `otlpHeaders` requires.
|
|
97
|
+
*/
|
|
98
|
+
export const jsonObjectHeaders = {
|
|
99
|
+
id: 'json-object',
|
|
100
|
+
encode: (headers) => JSON.stringify(headers),
|
|
101
|
+
decode: (raw) => {
|
|
102
|
+
if (!raw.trimStart().startsWith('{'))
|
|
103
|
+
return undefined;
|
|
104
|
+
let parsed;
|
|
105
|
+
try {
|
|
106
|
+
parsed = JSON.parse(raw);
|
|
107
|
+
}
|
|
108
|
+
catch {
|
|
109
|
+
return undefined;
|
|
110
|
+
}
|
|
111
|
+
if (!isPlainObject(parsed))
|
|
112
|
+
return undefined;
|
|
113
|
+
const out = {};
|
|
114
|
+
// All-string values only: anything else isn't a header map, and coercing it
|
|
115
|
+
// would make the masked render differ in shape from what is on disk.
|
|
116
|
+
for (const [k, v] of Object.entries(parsed)) {
|
|
117
|
+
if (typeof v !== 'string')
|
|
118
|
+
return undefined;
|
|
119
|
+
out[k] = v;
|
|
120
|
+
}
|
|
121
|
+
return Object.keys(out).length > 0 ? out : undefined;
|
|
122
|
+
},
|
|
123
|
+
// JSON is machine-written here, so decode/encode round-trips losslessly.
|
|
124
|
+
redact: (raw, mask) => {
|
|
125
|
+
const headers = jsonObjectHeaders.decode(raw);
|
|
126
|
+
if (!headers)
|
|
127
|
+
return undefined;
|
|
128
|
+
const out = {};
|
|
129
|
+
for (const [name, value] of Object.entries(headers)) {
|
|
130
|
+
const rendered = redactEntry(name, value, mask);
|
|
131
|
+
if (rendered === undefined)
|
|
132
|
+
return undefined;
|
|
133
|
+
out[name] = rendered;
|
|
134
|
+
}
|
|
135
|
+
return jsonObjectHeaders.encode(out);
|
|
136
|
+
},
|
|
137
|
+
};
|
|
138
|
+
/** RFC 7230 token — header names, and the dotted attribute names OTel reuses. No spaces. */
|
|
139
|
+
const TOKEN_RE = /^[A-Za-z0-9!#$%&'*+.^_`|~-]+$/;
|
|
140
|
+
/** Splits `key=value`; `undefined` when the segment isn't a well-formed pair. */
|
|
141
|
+
const splitPair = (segment) => {
|
|
142
|
+
const eq = segment.indexOf('=');
|
|
143
|
+
if (eq < 0)
|
|
144
|
+
return undefined;
|
|
145
|
+
const name = segment.slice(0, eq).trim();
|
|
146
|
+
// A base64 token's `=` padding must not read as a pair — the name has to look
|
|
147
|
+
// like a header name.
|
|
148
|
+
if (!TOKEN_RE.test(name))
|
|
149
|
+
return undefined;
|
|
150
|
+
return { name, value: segment.slice(eq + 1) };
|
|
151
|
+
};
|
|
152
|
+
/**
|
|
153
|
+
* Comma-separated `key=value` pairs — the OpenTelemetry env-var convention
|
|
154
|
+
* (`OTEL_EXPORTER_OTLP_HEADERS`), and the form the first-party Cowork admin
|
|
155
|
+
* console accepts (it rejects a JSON object; see the claude-desktop adapter).
|
|
156
|
+
*/
|
|
157
|
+
export const kvPairsHeaders = {
|
|
158
|
+
id: 'kv-pairs',
|
|
159
|
+
encode: (headers) => Object.entries(headers)
|
|
160
|
+
.map(([k, v]) => `${k}=${v}`)
|
|
161
|
+
.join(','),
|
|
162
|
+
decode: (raw) => {
|
|
163
|
+
const out = {};
|
|
164
|
+
for (const segment of raw.split(',')) {
|
|
165
|
+
const pair = splitPair(segment);
|
|
166
|
+
if (pair)
|
|
167
|
+
out[pair.name] = pair.value.trim();
|
|
168
|
+
}
|
|
169
|
+
return Object.keys(out).length > 0 ? out : undefined;
|
|
170
|
+
},
|
|
171
|
+
/**
|
|
172
|
+
* Rewrites sensitive pairs in place and passes every other segment through
|
|
173
|
+
* byte-for-byte, so a hand-edited value renders as it is on disk.
|
|
174
|
+
*
|
|
175
|
+
* Declines outright when a segment doesn't parse and the value looks like it
|
|
176
|
+
* carries a credential: the split is on `,`, so an unparseable segment can be
|
|
177
|
+
* the tail of a token the split cut in half, and rendering it would print a
|
|
178
|
+
* fragment of the secret.
|
|
179
|
+
*/
|
|
180
|
+
redact: (raw, mask) => {
|
|
181
|
+
let sawPair = false;
|
|
182
|
+
let sawUnparseable = false;
|
|
183
|
+
let declined = false;
|
|
184
|
+
const segments = raw.split(',').map((segment) => {
|
|
185
|
+
const pair = splitPair(segment);
|
|
186
|
+
if (!pair) {
|
|
187
|
+
sawUnparseable = true;
|
|
188
|
+
return segment;
|
|
189
|
+
}
|
|
190
|
+
sawPair = true;
|
|
191
|
+
const value = pair.value.trim();
|
|
192
|
+
const rendered = redactEntry(pair.name, value, mask);
|
|
193
|
+
if (rendered === undefined) {
|
|
194
|
+
declined = true;
|
|
195
|
+
return segment;
|
|
196
|
+
}
|
|
197
|
+
return rendered === value ? segment : `${pair.name}=${rendered}`;
|
|
198
|
+
});
|
|
199
|
+
if (!sawPair || declined)
|
|
200
|
+
return undefined;
|
|
201
|
+
if (sawUnparseable && hasCredentialShape(raw))
|
|
202
|
+
return undefined;
|
|
203
|
+
return segments.join(',');
|
|
204
|
+
},
|
|
205
|
+
};
|
|
206
|
+
/** Every encoding the CLI can emit a header collection in. Order is try-order when redacting. */
|
|
207
|
+
export const HEADER_ENCODINGS = [jsonObjectHeaders, kvPairsHeaders];
|
|
208
|
+
/**
|
|
209
|
+
* Renders `raw` with its credentials masked, using whichever declared encoding
|
|
210
|
+
* claims it. `undefined` means no encoding would render it safely — callers
|
|
211
|
+
* must fail closed, never fall back to the raw value.
|
|
212
|
+
*/
|
|
213
|
+
export const redactHeaderCollection = (raw, mask) => {
|
|
214
|
+
for (const encoding of HEADER_ENCODINGS) {
|
|
215
|
+
const redacted = encoding.redact(raw, mask);
|
|
216
|
+
if (redacted !== undefined)
|
|
217
|
+
return redacted;
|
|
218
|
+
}
|
|
219
|
+
return undefined;
|
|
220
|
+
};
|
|
221
|
+
//# sourceMappingURL=headers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/core/headers.ts"],"names":[],"mappings":"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"}
|