experimental-ash 0.3.0-alpha.26 → 0.3.0-alpha.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/src/harness/compaction.d.ts +1 -1
- package/dist/src/harness/compaction.d.ts.map +1 -1
- package/dist/src/harness/compaction.js +2 -1
- package/dist/src/harness/compaction.js.map +1 -1
- package/dist/src/harness/tool-loop.d.ts.map +1 -1
- package/dist/src/harness/tool-loop.js +28 -1
- package/dist/src/harness/tool-loop.js.map +1 -1
- package/dist/src/internal/application/package.js +1 -1
- package/dist/src/public/channels/auth.d.ts +107 -13
- package/dist/src/public/channels/auth.d.ts.map +1 -1
- package/dist/src/public/channels/auth.js +121 -14
- package/dist/src/public/channels/auth.js.map +1 -1
- package/dist/src/runtime/framework-channels/index.d.ts +4 -1
- package/dist/src/runtime/framework-channels/index.d.ts.map +1 -1
- package/dist/src/runtime/framework-channels/index.js +4 -1
- package/dist/src/runtime/framework-channels/index.js.map +1 -1
- package/dist/src/runtime/framework-tools/connection-search.d.ts.map +1 -1
- package/dist/src/runtime/framework-tools/connection-search.js +20 -1
- package/dist/src/runtime/framework-tools/connection-search.js.map +1 -1
- package/dist/src/runtime/governance/auth/oidc.d.ts.map +1 -1
- package/dist/src/runtime/governance/auth/oidc.js +29 -8
- package/dist/src/runtime/governance/auth/oidc.js.map +1 -1
- package/dist/src/runtime/governance/auth/types.d.ts +15 -1
- package/dist/src/runtime/governance/auth/types.d.ts.map +1 -1
- package/dist/src/runtime/governance/auth/types.js.map +1 -1
- package/package.json +1 -1
|
@@ -40,5 +40,5 @@ export declare function resolveCompactionModel(input: {
|
|
|
40
40
|
* Compacts messages by summarizing older history and keeping only the most
|
|
41
41
|
* recent messages.
|
|
42
42
|
*/
|
|
43
|
-
export declare function compactMessages(messages: ModelMessage[], model: LanguageModel, config: CompactionConfig, providerOptions?: Parameters<typeof generateText>[0]["providerOptions"], telemetry?: TelemetryOptions): Promise<ModelMessage[]>;
|
|
43
|
+
export declare function compactMessages(messages: ModelMessage[], model: LanguageModel, config: CompactionConfig, providerOptions?: Parameters<typeof generateText>[0]["providerOptions"], telemetry?: TelemetryOptions, headers?: Record<string, string>): Promise<ModelMessage[]>;
|
|
44
44
|
//# sourceMappingURL=compaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAEhG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAyB1E;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAET;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,qBAAqB,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;CAC9D,GAAG,OAAO,CAAC;IACV,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;CACjF,CAAC,CAWD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,gBAAgB,EACxB,eAAe,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EACvE,SAAS,CAAC,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,MAAM,IAAI,CAAC;AAEhG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAyB1E;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,SAAS,YAAY,EAAE,EACjC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAET;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,KAAK,EAAE;IAClD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,qBAAqB,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,cAAc,EAAE,qBAAqB,CAAC;IAC/C,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;CAC9D,GAAG,OAAO,CAAC;IACV,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;CACjF,CAAC,CAWD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,YAAY,EAAE,EACxB,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,gBAAgB,EACxB,eAAe,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,EACvE,SAAS,CAAC,EAAE,gBAAgB,EAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,YAAY,EAAE,CAAC,CAmCzB"}
|
|
@@ -63,7 +63,7 @@ export async function resolveCompactionModel(input) {
|
|
|
63
63
|
* Compacts messages by summarizing older history and keeping only the most
|
|
64
64
|
* recent messages.
|
|
65
65
|
*/
|
|
66
|
-
export async function compactMessages(messages, model, config, providerOptions, telemetry) {
|
|
66
|
+
export async function compactMessages(messages, model, config, providerOptions, telemetry, headers) {
|
|
67
67
|
let keep = selectRecentWindowSize(messages, config);
|
|
68
68
|
while (true) {
|
|
69
69
|
const { older, recent } = splitMessagesForCompaction(messages, keep);
|
|
@@ -75,6 +75,7 @@ export async function compactMessages(messages, model, config, providerOptions,
|
|
|
75
75
|
role: message.role,
|
|
76
76
|
}));
|
|
77
77
|
const result = await generateText({
|
|
78
|
+
headers,
|
|
78
79
|
model,
|
|
79
80
|
prompt: formatCompactionPrompt(prunedOlder),
|
|
80
81
|
providerOptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAgE,MAAM,IAAI,CAAC;AAKhG,MAAM,wBAAwB,GAAG;IAC/B,oCAAoC;IACpC,6DAA6D;IAC7D,oHAAoH;IACpH,4CAA4C;IAC5C,mHAAmH;IACnH,0CAA0C;CAC3C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,iCAAiC,GAAG,KAAK,CAAC;AAChD,MAAM,qBAAqB,GAAG,GAAG,CAAC;AAClC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAYtC;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAAiC,EACjC,MAAwB;IAExB,MAAM,KAAK,GAAG,MAAM,CAAC,oBAAoB,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,2BAA2B,CAAC;IAEtD,IACE,KAAK,KAAK,SAAS;QACnB,UAAU,KAAK,SAAS;QACxB,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC;QAC7B,UAAU,GAAG,CAAC;QACd,UAAU,GAAG,QAAQ,CAAC,MAAM,EAC5B,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,KAAK,GAAG,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAC3B,QAAiC,EACjC,MAAwB;IAExB,OAAO,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,KAK5C;IAIC,MAAM,SAAS,GAAG,KAAK,CAAC,wBAAwB,IAAI,KAAK,CAAC,cAAc,CAAC;IACzE,MAAM,KAAK,GACT,SAAS,KAAK,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAEzF,OAAO;QACL,KAAK;QACL,eAAe,EAAE,SAAS,CAAC,eAEJ;KACxB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAwB,EACxB,KAAoB,EACpB,MAAwB,EACxB,eAAuE,EACvE,SAA4B;
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../src/harness/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAoFA,OAAO,KAAK,EAIV,MAAM,EAGN,qBAAqB,EACtB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"AAoFA,OAAO,KAAK,EAIV,MAAM,EAGN,qBAAqB,EACtB,MAAM,YAAY,CAAC;AA6KpB,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAqS3E"}
|
|
@@ -80,6 +80,30 @@ function buildTelemetryRuntimeContext(authored, session) {
|
|
|
80
80
|
"ash.version": ashVersion,
|
|
81
81
|
};
|
|
82
82
|
}
|
|
83
|
+
/**
|
|
84
|
+
* Builds AI Gateway app attribution headers when the model is gateway-routed.
|
|
85
|
+
*
|
|
86
|
+
* Gateway routing is detected by `typeof model === "string"` — the same
|
|
87
|
+
* condition used for the `gateway-auto` cache path. Returns `undefined`
|
|
88
|
+
* for non-gateway models or when no meaningful attribution is available.
|
|
89
|
+
*/
|
|
90
|
+
function buildGatewayAttributionHeaders(model, runtimeIdentity) {
|
|
91
|
+
if (typeof model !== "string") {
|
|
92
|
+
return undefined;
|
|
93
|
+
}
|
|
94
|
+
const title = runtimeIdentity?.agentName ?? runtimeIdentity?.agentId;
|
|
95
|
+
const deploymentHost = process.env.VERCEL_PROJECT_PRODUCTION_URL || process.env.VERCEL_URL;
|
|
96
|
+
const referer = deploymentHost ? `https://${deploymentHost}` : undefined;
|
|
97
|
+
if (!title && !referer) {
|
|
98
|
+
return undefined;
|
|
99
|
+
}
|
|
100
|
+
const headers = {};
|
|
101
|
+
if (title)
|
|
102
|
+
headers["x-title"] = title;
|
|
103
|
+
if (referer)
|
|
104
|
+
headers["http-referer"] = referer;
|
|
105
|
+
return headers;
|
|
106
|
+
}
|
|
83
107
|
// ---------------------------------------------------------------------------
|
|
84
108
|
// Turn trace state — survives step boundaries via session.state
|
|
85
109
|
// ---------------------------------------------------------------------------
|
|
@@ -222,9 +246,11 @@ export function createToolLoopHarness(config) {
|
|
|
222
246
|
//
|
|
223
247
|
// Runs before `agent.stream()` so the compacted messages flow through
|
|
224
248
|
// `messages` (which the harness uses to rebuild session history).
|
|
249
|
+
const attributionHeaders = buildGatewayAttributionHeaders(model, config.runtimeIdentity);
|
|
225
250
|
({ messages, session } = await maybeCompact({
|
|
226
251
|
emit,
|
|
227
252
|
emissionState,
|
|
253
|
+
headers: attributionHeaders,
|
|
228
254
|
messages,
|
|
229
255
|
model,
|
|
230
256
|
onCompaction: config.onCompaction,
|
|
@@ -267,6 +293,7 @@ export function createToolLoopHarness(config) {
|
|
|
267
293
|
* handled by the harness catch block and emitted as stream events.
|
|
268
294
|
*/
|
|
269
295
|
const agentSettings = {
|
|
296
|
+
headers: attributionHeaders,
|
|
270
297
|
instructions: session.agent.system || undefined,
|
|
271
298
|
model,
|
|
272
299
|
onError() { },
|
|
@@ -512,7 +539,7 @@ async function maybeCompact(input) {
|
|
|
512
539
|
usageInputTokens: getInputTokenCount(messages, session.compaction),
|
|
513
540
|
}));
|
|
514
541
|
}
|
|
515
|
-
messages = await compactMessages(messages, compaction.model, session.compaction, compaction.providerOptions, input.telemetry);
|
|
542
|
+
messages = await compactMessages(messages, compaction.model, session.compaction, compaction.providerOptions, input.telemetry, input.headers);
|
|
516
543
|
if (input.onCompaction) {
|
|
517
544
|
const compacted = await input.onCompaction(session);
|
|
518
545
|
session = compacted.session;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../../src/harness/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { ASH_PACKAGE_NAME } from "../../package-name.js";
|
|
|
6
6
|
let cachedPackageInfo;
|
|
7
7
|
// The package build stamps the published version into `dist` so bundled
|
|
8
8
|
// deployments can still report package metadata without resolving package.json.
|
|
9
|
-
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.3.0-alpha.
|
|
9
|
+
const BUNDLED_FALLBACK_PACKAGE_VERSION = "0.3.0-alpha.27";
|
|
10
10
|
const BUNDLED_FALLBACK_PACKAGE_VERSION_PLACEHOLDER = "__ASH_PACKAGE_VERSION_PLACEHOLDER__";
|
|
11
11
|
const WORKFLOW_MODULE_ALIASES = {
|
|
12
12
|
"workflow/api": "@workflow/core/runtime",
|
|
@@ -90,13 +90,6 @@ export interface VerifyOidcConfig {
|
|
|
90
90
|
readonly clockSkewSeconds?: number;
|
|
91
91
|
readonly subjects?: readonly string[];
|
|
92
92
|
readonly claims?: Readonly<Record<string, readonly string[]>>;
|
|
93
|
-
/**
|
|
94
|
-
* When `true`, the OIDC verifier additionally accepts JWTs minted by the
|
|
95
|
-
* Vercel platform for the current runtime principal. Used to allow
|
|
96
|
-
* subagent and platform-internal callers without listing them in the
|
|
97
|
-
* `subjects` matcher.
|
|
98
|
-
*/
|
|
99
|
-
readonly allowRuntimePrincipal?: boolean;
|
|
100
93
|
}
|
|
101
94
|
/**
|
|
102
95
|
* Verifies a bearer OIDC token against an issuer's discovery URL.
|
|
@@ -174,17 +167,118 @@ export type AuthFn<TEvent> = (event: TEvent) => SessionAuthContext | null | unde
|
|
|
174
167
|
*/
|
|
175
168
|
export declare function none<TEvent = unknown>(): AuthFn<TEvent>;
|
|
176
169
|
/**
|
|
177
|
-
*
|
|
170
|
+
* Options for {@link verifyVercelOidc} and {@link vercelOidc}.
|
|
178
171
|
*/
|
|
179
|
-
export
|
|
172
|
+
export interface VerifyVercelOidcOptions {
|
|
173
|
+
/**
|
|
174
|
+
* Optional `sub` patterns that grant additional callers access on top
|
|
175
|
+
* of the always-on current-project bypass. Patterns use AWS IAM-style
|
|
176
|
+
* `*` wildcards and may target tokens minted by other Vercel projects
|
|
177
|
+
* (e.g. `"owner:acme:project:partner-agent:environment:*"`).
|
|
178
|
+
*
|
|
179
|
+
* The current Vercel project is **always** accepted regardless of
|
|
180
|
+
* this list, so authors never have to enumerate their own deployment
|
|
181
|
+
* here.
|
|
182
|
+
*/
|
|
180
183
|
readonly subjects?: readonly string[];
|
|
181
|
-
}
|
|
184
|
+
}
|
|
185
|
+
/**
|
|
186
|
+
* Verifies a bearer JWT minted by Vercel OIDC.
|
|
187
|
+
*
|
|
188
|
+
* Acceptance rule:
|
|
189
|
+
*
|
|
190
|
+
* - Tokens whose `project_id` matches `VERCEL_PROJECT_ID` are **always**
|
|
191
|
+
* accepted regardless of `subjects`. This guarantees the deployment's
|
|
192
|
+
* own runtime callers (subagent, internal fetches, etc.) authenticate
|
|
193
|
+
* without authors having to enumerate them.
|
|
194
|
+
* - Tokens from other Vercel projects are accepted **only** when their
|
|
195
|
+
* `sub` matches one of the supplied {@link VerifyVercelOidcOptions.subjects}
|
|
196
|
+
* patterns.
|
|
197
|
+
*
|
|
198
|
+
* The token's `environment` claim is not constrained — production,
|
|
199
|
+
* preview, and development tokens for the current project all
|
|
200
|
+
* authenticate. The principal is tagged `principalType: "runtime"` when
|
|
201
|
+
* the token's `environment` matches the current deployment, otherwise
|
|
202
|
+
* `"service"`.
|
|
203
|
+
*/
|
|
204
|
+
export declare function verifyVercelOidc(token: string | null, opts?: VerifyVercelOidcOptions): Promise<VerifyResult>;
|
|
205
|
+
/**
|
|
206
|
+
* Allowed values for {@link VercelSubjectInput.environment}. Use `"*"`
|
|
207
|
+
* to match any of `production`, `preview`, and `development` for the
|
|
208
|
+
* named project.
|
|
209
|
+
*/
|
|
210
|
+
export type VercelSubjectEnvironment = "production" | "preview" | "development" | "*";
|
|
211
|
+
/**
|
|
212
|
+
* Strict input shape accepted by {@link vercelSubject}.
|
|
213
|
+
*
|
|
214
|
+
* Note: the `sub` claim on Vercel OIDC tokens carries human-readable
|
|
215
|
+
* **slugs/names**, not IDs. Stable Vercel project and team IDs
|
|
216
|
+
* (`prj_…`, `team_…`) live on the separate `project_id` / `owner_id`
|
|
217
|
+
* claims, which the framework matches against `VERCEL_PROJECT_ID` for
|
|
218
|
+
* the always-on current-project bind in `verifyVercelOidc`. This
|
|
219
|
+
* helper composes a `sub` matcher pattern, so the inputs are slugs.
|
|
220
|
+
*/
|
|
221
|
+
export interface VercelSubjectInput {
|
|
222
|
+
/**
|
|
223
|
+
* Vercel team slug (a.k.a. "owner"; e.g. `"acme"`). The slug
|
|
224
|
+
* Vercel renders in URLs and embeds into the `sub` claim — **not**
|
|
225
|
+
* the stable team ID `team_…` you would pass to `VERCEL_TEAM_ID`.
|
|
226
|
+
*
|
|
227
|
+
* Must not contain `*` or `:` so authors cannot accidentally widen
|
|
228
|
+
* the matcher to "any team that happens to have a project of this
|
|
229
|
+
* name". Hand-write the subject string when cross-team federation
|
|
230
|
+
* is intentional.
|
|
231
|
+
*/
|
|
232
|
+
readonly teamSlug: string;
|
|
233
|
+
/**
|
|
234
|
+
* Vercel project name (e.g. `"acme_website"`). The name Vercel
|
|
235
|
+
* embeds into the `sub` claim — **not** the stable project ID
|
|
236
|
+
* `prj_…` you would pass to `VERCEL_PROJECT_ID`. Same constraints
|
|
237
|
+
* as {@link teamSlug}.
|
|
238
|
+
*/
|
|
239
|
+
readonly projectName: string;
|
|
240
|
+
/**
|
|
241
|
+
* Vercel deployment environment, or `"*"` to match any environment
|
|
242
|
+
* for the named project. Defaults to `"production"` so an
|
|
243
|
+
* unspecified environment cannot silently accept
|
|
244
|
+
* preview/development tokens.
|
|
245
|
+
*/
|
|
246
|
+
readonly environment?: VercelSubjectEnvironment;
|
|
247
|
+
}
|
|
248
|
+
/**
|
|
249
|
+
* Builds a Vercel OIDC `sub` matcher pattern from a typed input.
|
|
250
|
+
*
|
|
251
|
+
* Vercel-issued OIDC tokens carry a `sub` of the form
|
|
252
|
+
* `owner:[TEAM_SLUG]:project:[PROJECT_NAME]:environment:[ENVIRONMENT]`.
|
|
253
|
+
* Hand-writing this shape — and the wildcards used to extend it —
|
|
254
|
+
* invites two foot-guns: misspelling a slug (silently rejecting all
|
|
255
|
+
* callers) and over-broad wildcards (silently accepting unrelated
|
|
256
|
+
* callers). This helper rejects malformed inputs at construction time
|
|
257
|
+
* and forces an explicit `environment` choice.
|
|
258
|
+
*
|
|
259
|
+
* Use it inside {@link VerifyVercelOidcOptions.subjects} to layer
|
|
260
|
+
* additional Vercel-project callers on top of the always-on
|
|
261
|
+
* current-project bypass:
|
|
262
|
+
*
|
|
263
|
+
* ```ts
|
|
264
|
+
* vercelOidc({
|
|
265
|
+
* subjects: [vercelSubject({ teamSlug: "partner", projectName: "data" })],
|
|
266
|
+
* });
|
|
267
|
+
* ```
|
|
268
|
+
*
|
|
269
|
+
* If your team or project name changes, the `sub` claim flips with it
|
|
270
|
+
* and any policy built on this helper has to be updated too — the
|
|
271
|
+
* stable team/project IDs are not exposed in `sub`. See Vercel's OIDC
|
|
272
|
+
* reference for the full token anatomy.
|
|
273
|
+
*/
|
|
274
|
+
export declare function vercelSubject(input: VercelSubjectInput): string;
|
|
182
275
|
/**
|
|
183
276
|
* Returns an HTTP route auth callback backed by Vercel OIDC.
|
|
277
|
+
*
|
|
278
|
+
* See {@link verifyVercelOidc} for the always-on current-project bypass
|
|
279
|
+
* and how `subjects` extends acceptance to other Vercel projects.
|
|
184
280
|
*/
|
|
185
|
-
export declare function vercelOidc(opts?:
|
|
186
|
-
readonly subjects?: readonly string[];
|
|
187
|
-
}): AuthFn<Request>;
|
|
281
|
+
export declare function vercelOidc(opts?: VerifyVercelOidcOptions): AuthFn<Request>;
|
|
188
282
|
/**
|
|
189
283
|
* Returns an {@link AuthFn} that verifies HTTP Basic credentials on the
|
|
190
284
|
* inbound request via {@link verifyHttpBasic}.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/public/channels/auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/public/channels/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,13 @@
|
|
|
5
5
|
* helpers are lower-level pure functions for custom `fetch` handlers.
|
|
6
6
|
*/
|
|
7
7
|
import { decodeJwt } from "jose";
|
|
8
|
+
import { createLogger } from "../../internal/logging.js";
|
|
8
9
|
import { authenticateHttpBasicStrategy } from "../../runtime/governance/auth/http-basic.js";
|
|
9
10
|
import { authenticateJwtEcdsaStrategy } from "../../runtime/governance/auth/jwt-ecdsa.js";
|
|
10
11
|
import { authenticateJwtHmacStrategy } from "../../runtime/governance/auth/jwt-hmac.js";
|
|
11
12
|
import { authenticateOidcStrategy } from "../../runtime/governance/auth/oidc.js";
|
|
12
13
|
import { createRuntimeSessionAuthContext, } from "../../runtime/governance/auth/types.js";
|
|
14
|
+
const vercelOidcLog = createLogger("auth.vercel-oidc");
|
|
13
15
|
import { createRuntimeIpAllowList, isRuntimeIpAllowed, } from "../../runtime/governance/network/ip-allow-list.js";
|
|
14
16
|
/**
|
|
15
17
|
* Verifies an HTTP Basic credential against the supplied username +
|
|
@@ -100,11 +102,28 @@ export async function verifyJwtEcdsa(token, config) {
|
|
|
100
102
|
* Verifies a bearer OIDC token against an issuer's discovery URL.
|
|
101
103
|
*/
|
|
102
104
|
export async function verifyOidc(token, config) {
|
|
105
|
+
const result = await runOidcVerification(token, {
|
|
106
|
+
...config,
|
|
107
|
+
acceptCurrentVercelProject: false,
|
|
108
|
+
});
|
|
109
|
+
return result.kind === "authenticated"
|
|
110
|
+
? { ok: true, sessionAuth: createRuntimeSessionAuthContext(result.principal) }
|
|
111
|
+
: { ok: false };
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Runs OIDC token verification against a resolved strategy and returns
|
|
115
|
+
* the strategy authenticator's tagged result. Internal helper shared
|
|
116
|
+
* between {@link verifyOidc} (public, never grants the Vercel
|
|
117
|
+
* current-project upgrade) and {@link verifyVercelOidc} (always opts
|
|
118
|
+
* into it). Returning the raw outcome rather than a boolean lets call
|
|
119
|
+
* sites log a structured rejection reason.
|
|
120
|
+
*/
|
|
121
|
+
async function runOidcVerification(token, config) {
|
|
103
122
|
if (token === null || token.length === 0) {
|
|
104
|
-
return {
|
|
123
|
+
return { kind: "not-authenticated" };
|
|
105
124
|
}
|
|
106
125
|
const strategy = {
|
|
107
|
-
|
|
126
|
+
acceptCurrentVercelProject: config.acceptCurrentVercelProject,
|
|
108
127
|
audiences: [...config.audiences],
|
|
109
128
|
clockSkewSeconds: config.clockSkewSeconds ?? 30,
|
|
110
129
|
discoveryUrl: config.discoveryUrl ?? `${config.issuer.replace(/\/$/, "")}/.well-known/openid-configuration`,
|
|
@@ -113,14 +132,7 @@ export async function verifyOidc(token, config) {
|
|
|
113
132
|
...(config.claims === undefined ? {} : { claims: config.claims }),
|
|
114
133
|
...(config.subjects === undefined ? {} : { subjects: config.subjects }),
|
|
115
134
|
};
|
|
116
|
-
|
|
117
|
-
if (result.kind !== "authenticated") {
|
|
118
|
-
return { ok: false };
|
|
119
|
-
}
|
|
120
|
-
return {
|
|
121
|
-
ok: true,
|
|
122
|
-
sessionAuth: createRuntimeSessionAuthContext(result.principal),
|
|
123
|
-
};
|
|
135
|
+
return await authenticateOidcStrategy({ strategy, token });
|
|
124
136
|
}
|
|
125
137
|
// ---------------------------------------------------------------------------
|
|
126
138
|
// Bearer token extraction
|
|
@@ -200,27 +212,122 @@ export function none() {
|
|
|
200
212
|
const VERCEL_OIDC_ISSUER_PREFIX = "https://oidc.vercel.com/";
|
|
201
213
|
/**
|
|
202
214
|
* Verifies a bearer JWT minted by Vercel OIDC.
|
|
215
|
+
*
|
|
216
|
+
* Acceptance rule:
|
|
217
|
+
*
|
|
218
|
+
* - Tokens whose `project_id` matches `VERCEL_PROJECT_ID` are **always**
|
|
219
|
+
* accepted regardless of `subjects`. This guarantees the deployment's
|
|
220
|
+
* own runtime callers (subagent, internal fetches, etc.) authenticate
|
|
221
|
+
* without authors having to enumerate them.
|
|
222
|
+
* - Tokens from other Vercel projects are accepted **only** when their
|
|
223
|
+
* `sub` matches one of the supplied {@link VerifyVercelOidcOptions.subjects}
|
|
224
|
+
* patterns.
|
|
225
|
+
*
|
|
226
|
+
* The token's `environment` claim is not constrained — production,
|
|
227
|
+
* preview, and development tokens for the current project all
|
|
228
|
+
* authenticate. The principal is tagged `principalType: "runtime"` when
|
|
229
|
+
* the token's `environment` matches the current deployment, otherwise
|
|
230
|
+
* `"service"`.
|
|
203
231
|
*/
|
|
204
232
|
export async function verifyVercelOidc(token, opts = {}) {
|
|
205
233
|
if (token === null || token.length === 0) {
|
|
234
|
+
vercelOidcLog.debug("Rejected request without a bearer token.");
|
|
206
235
|
return { ok: false };
|
|
207
236
|
}
|
|
208
237
|
const claims = decodeUnverifiedJwtClaims(token);
|
|
209
238
|
if (claims === null) {
|
|
239
|
+
vercelOidcLog.debug("Rejected token that failed to decode as a JWT.");
|
|
240
|
+
return { ok: false };
|
|
241
|
+
}
|
|
242
|
+
if (!claims.issuer.startsWith(VERCEL_OIDC_ISSUER_PREFIX)) {
|
|
243
|
+
vercelOidcLog.debug("Rejected token whose issuer is not a Vercel OIDC issuer.", {
|
|
244
|
+
issuer: claims.issuer,
|
|
245
|
+
});
|
|
210
246
|
return { ok: false };
|
|
211
247
|
}
|
|
212
|
-
if (
|
|
248
|
+
if (claims.audiences.length === 0) {
|
|
249
|
+
vercelOidcLog.debug("Rejected token with no audience claim.", { issuer: claims.issuer });
|
|
213
250
|
return { ok: false };
|
|
214
251
|
}
|
|
215
|
-
|
|
216
|
-
|
|
252
|
+
// `acceptCurrentVercelProject: true` activates the same-project bypass
|
|
253
|
+
// inside the OIDC verifier so any token minted for `VERCEL_PROJECT_ID`
|
|
254
|
+
// is accepted regardless of `subjects`. The supplied `subjects`
|
|
255
|
+
// matcher (defaulting to an empty list that matches nothing)
|
|
256
|
+
// determines which **other** callers are allowed in.
|
|
257
|
+
const result = await runOidcVerification(token, {
|
|
258
|
+
acceptCurrentVercelProject: true,
|
|
217
259
|
audiences: claims.audiences,
|
|
218
260
|
issuer: claims.issuer,
|
|
219
|
-
|
|
261
|
+
subjects: opts.subjects ?? [],
|
|
220
262
|
});
|
|
263
|
+
if (result.kind === "authenticated") {
|
|
264
|
+
vercelOidcLog.debug("Accepted Vercel OIDC token.", {
|
|
265
|
+
issuer: claims.issuer,
|
|
266
|
+
principalType: result.principal.principalType,
|
|
267
|
+
subject: result.principal.subject,
|
|
268
|
+
});
|
|
269
|
+
return { ok: true, sessionAuth: createRuntimeSessionAuthContext(result.principal) };
|
|
270
|
+
}
|
|
271
|
+
vercelOidcLog.debug("Rejected Vercel OIDC token after verification.", {
|
|
272
|
+
audiences: claims.audiences,
|
|
273
|
+
issuer: claims.issuer,
|
|
274
|
+
reason: result.kind,
|
|
275
|
+
subjectsConfigured: (opts.subjects ?? []).length > 0,
|
|
276
|
+
...(result.kind === "misconfigured" ? { detail: result.message } : {}),
|
|
277
|
+
});
|
|
278
|
+
return { ok: false };
|
|
279
|
+
}
|
|
280
|
+
/**
|
|
281
|
+
* Builds a Vercel OIDC `sub` matcher pattern from a typed input.
|
|
282
|
+
*
|
|
283
|
+
* Vercel-issued OIDC tokens carry a `sub` of the form
|
|
284
|
+
* `owner:[TEAM_SLUG]:project:[PROJECT_NAME]:environment:[ENVIRONMENT]`.
|
|
285
|
+
* Hand-writing this shape — and the wildcards used to extend it —
|
|
286
|
+
* invites two foot-guns: misspelling a slug (silently rejecting all
|
|
287
|
+
* callers) and over-broad wildcards (silently accepting unrelated
|
|
288
|
+
* callers). This helper rejects malformed inputs at construction time
|
|
289
|
+
* and forces an explicit `environment` choice.
|
|
290
|
+
*
|
|
291
|
+
* Use it inside {@link VerifyVercelOidcOptions.subjects} to layer
|
|
292
|
+
* additional Vercel-project callers on top of the always-on
|
|
293
|
+
* current-project bypass:
|
|
294
|
+
*
|
|
295
|
+
* ```ts
|
|
296
|
+
* vercelOidc({
|
|
297
|
+
* subjects: [vercelSubject({ teamSlug: "partner", projectName: "data" })],
|
|
298
|
+
* });
|
|
299
|
+
* ```
|
|
300
|
+
*
|
|
301
|
+
* If your team or project name changes, the `sub` claim flips with it
|
|
302
|
+
* and any policy built on this helper has to be updated too — the
|
|
303
|
+
* stable team/project IDs are not exposed in `sub`. See Vercel's OIDC
|
|
304
|
+
* reference for the full token anatomy.
|
|
305
|
+
*/
|
|
306
|
+
export function vercelSubject(input) {
|
|
307
|
+
assertVercelSubjectSegment("teamSlug", input.teamSlug);
|
|
308
|
+
assertVercelSubjectSegment("projectName", input.projectName);
|
|
309
|
+
const environment = input.environment ?? "production";
|
|
310
|
+
if (environment !== "production" &&
|
|
311
|
+
environment !== "preview" &&
|
|
312
|
+
environment !== "development" &&
|
|
313
|
+
environment !== "*") {
|
|
314
|
+
throw new Error(`vercelSubject: invalid environment ${JSON.stringify(environment)}; expected "production", "preview", "development", or "*".`);
|
|
315
|
+
}
|
|
316
|
+
return `owner:${input.teamSlug}:project:${input.projectName}:environment:${environment}`;
|
|
317
|
+
}
|
|
318
|
+
function assertVercelSubjectSegment(field, value) {
|
|
319
|
+
if (value.length === 0) {
|
|
320
|
+
throw new Error(`vercelSubject: ${field} must be a non-empty string.`);
|
|
321
|
+
}
|
|
322
|
+
if (value.includes("*") || value.includes(":")) {
|
|
323
|
+
throw new Error(`vercelSubject: ${field} ${JSON.stringify(value)} may not contain ${value.includes(":") ? "':'" : "'*'"}. Hand-write the subject string when wildcards are intentional.`);
|
|
324
|
+
}
|
|
221
325
|
}
|
|
222
326
|
/**
|
|
223
327
|
* Returns an HTTP route auth callback backed by Vercel OIDC.
|
|
328
|
+
*
|
|
329
|
+
* See {@link verifyVercelOidc} for the always-on current-project bypass
|
|
330
|
+
* and how `subjects` extends acceptance to other Vercel projects.
|
|
224
331
|
*/
|
|
225
332
|
export function vercelOidc(opts = {}) {
|
|
226
333
|
return async (request) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/public/channels/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../src/public/channels/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,10 @@ export declare const HTTP_SESSION_STREAM_CHANNEL_NAME = ".well-known/ash/v1/sess
|
|
|
21
21
|
* mounting loop.
|
|
22
22
|
*
|
|
23
23
|
* Default auth is environment-aware: Vercel infrastructure uses
|
|
24
|
-
* {@link vercelOidc}
|
|
24
|
+
* {@link vercelOidc} (which always accepts tokens minted for the
|
|
25
|
+
* current `VERCEL_PROJECT_ID` and rejects every other caller because
|
|
26
|
+
* the framework default supplies no `subjects` matcher); plain local
|
|
27
|
+
* runtimes use {@link none}.
|
|
25
28
|
*/
|
|
26
29
|
export declare function getFrameworkChannelDefinitions(): readonly ResolvedChannelDefinition[];
|
|
27
30
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/runtime/framework-channels/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,+BAA+B,CAAC;AAEtE;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,mDAAmD,CAAC;AAEjG
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/runtime/framework-channels/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,+BAA+B,CAAC;AAEtE;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,mDAAmD,CAAC;AAEjG;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,8BAA8B,IAAI,SAAS,yBAAyB,EAAE,CA0BrF;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,IAAI,WAAW,CAAC,MAAM,CAAC,CAEjE"}
|
|
@@ -22,7 +22,10 @@ export const HTTP_SESSION_STREAM_CHANNEL_NAME = ".well-known/ash/v1/sessions/[se
|
|
|
22
22
|
* mounting loop.
|
|
23
23
|
*
|
|
24
24
|
* Default auth is environment-aware: Vercel infrastructure uses
|
|
25
|
-
* {@link vercelOidc}
|
|
25
|
+
* {@link vercelOidc} (which always accepts tokens minted for the
|
|
26
|
+
* current `VERCEL_PROJECT_ID` and rejects every other caller because
|
|
27
|
+
* the framework default supplies no `subjects` matcher); plain local
|
|
28
|
+
* runtimes use {@link none}.
|
|
26
29
|
*/
|
|
27
30
|
export function getFrameworkChannelDefinitions() {
|
|
28
31
|
const auth = resolveFrameworkHttpAuth();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/framework-channels/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAG9E;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,4BAA4B,CAAC;AAEtE;;;;GAIG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,gDAAgD,CAAC;AAEjG
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/framework-channels/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAG9E;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,4BAA4B,CAAC;AAEtE;;;;GAIG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,gDAAgD,CAAC;AAEjG;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,8BAA8B;IAC5C,MAAM,IAAI,GAAG,wBAAwB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,OAAO;QACL;YACE,IAAI,EAAE,yBAAyB;YAC/B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,MAAM;YAChC,OAAO,EAAE,6BAA6B;YACtC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,wBAAwB,yBAAyB,EAAE;YAChE,QAAQ,EAAE,4BAA4B;YACtC,UAAU,EAAE,QAAQ;SACrB;QACD;YACE,IAAI,EAAE,gCAAgC;YACtC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,KAAK;YAC9B,OAAO,EAAE,gDAAgD;YACzD,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,WAAW,EAAE,wBAAwB,gCAAgC,EAAE;YACvE,QAAQ,EAAE,mCAAmC;YAC7C,UAAU,EAAE,QAAQ;SACrB;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,2BAA2B;IACzC,OAAO,IAAI,GAAG,CAAC,CAAC,yBAAyB,EAAE,gCAAgC,CAAC,CAAC,CAAC;AAChF,CAAC;AAED;;;;;;GAMG;AACH,SAAS,wBAAwB;IAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvB,OAAO,UAAU,EAAE,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-search.d.ts","sourceRoot":"","sources":["../../../../src/runtime/framework-tools/connection-search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"connection-search.d.ts","sourceRoot":"","sources":["../../../../src/runtime/framework-tools/connection-search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { loadContext } from "../../context/container.js";
|
|
2
2
|
import { ContextKey } from "../../context/key.js";
|
|
3
|
+
import { createLogger } from "../../internal/logging.js";
|
|
3
4
|
import { createConnectionAuthorizationRequiredEvent } from "../../protocol/message.js";
|
|
4
5
|
import { isConnectionAuthorizationFailedError, isConnectionAuthorizationRequiredError, } from "../../public/connections/errors.js";
|
|
5
6
|
import { supportsInteractiveAuthorization, } from "../connections/types.js";
|
|
6
7
|
import { qualifiedConnectionToolName } from "./connection-tools.js";
|
|
7
8
|
import { appendPendingConnectionToolCalls, CONNECTION_AUTHORIZATION_PLACEHOLDER, PendingConnectionToolCallsKey, } from "./pending-connection-tool-calls.js";
|
|
9
|
+
const logger = createLogger("framework.connection-search");
|
|
8
10
|
/**
|
|
9
11
|
* Context key for the per-session connection registry.
|
|
10
12
|
*
|
|
@@ -115,6 +117,12 @@ export async function executeConnectionSearch(input, meta) {
|
|
|
115
117
|
continue;
|
|
116
118
|
}
|
|
117
119
|
if (isConnectionAuthorizationFailedError(err)) {
|
|
120
|
+
logger.warn("connection authorization failed", {
|
|
121
|
+
connection: conn.connectionName,
|
|
122
|
+
reason: err.reason,
|
|
123
|
+
retryable: err.retryable,
|
|
124
|
+
error: err,
|
|
125
|
+
});
|
|
118
126
|
failedConnections.push({
|
|
119
127
|
connection: conn.connectionName,
|
|
120
128
|
description: conn.description,
|
|
@@ -122,10 +130,21 @@ export async function executeConnectionSearch(input, meta) {
|
|
|
122
130
|
});
|
|
123
131
|
continue;
|
|
124
132
|
}
|
|
133
|
+
// Anything that isn't `Required` or `Failed` is unclassified —
|
|
134
|
+
// most often a misconfiguration on the upstream provider (e.g. an
|
|
135
|
+
// OAuth bridge returning a 4xx for a project that hasn't been
|
|
136
|
+
// linked) rather than the connection's HTTP server being
|
|
137
|
+
// unreachable. Log so the developer running `ash dev` sees the
|
|
138
|
+
// underlying cause; the model only gets the truncated message.
|
|
139
|
+
const message = err instanceof Error ? err.message : "unknown error";
|
|
140
|
+
logger.warn("failed to load connection tools", {
|
|
141
|
+
connection: conn.connectionName,
|
|
142
|
+
error: err instanceof Error ? err : new Error(message),
|
|
143
|
+
});
|
|
125
144
|
failedConnections.push({
|
|
126
145
|
connection: conn.connectionName,
|
|
127
146
|
description: conn.description,
|
|
128
|
-
error: `
|
|
147
|
+
error: `Failed to load tools for "${conn.connectionName}": ${message}`,
|
|
129
148
|
});
|
|
130
149
|
continue;
|
|
131
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-search.js","sourceRoot":"","sources":["../../../../src/runtime/framework-tools/connection-search.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connection-search.js","sourceRoot":"","sources":["../../../../src/runtime/framework-tools/connection-search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/oidc.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,wBAAwB,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAc9F;;GAEG;AACH,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,CAAC;CAC7C,GAAG,OAAO,CAAC,iCAAiC,CAAC,
|
|
1
|
+
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/oidc.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,wBAAwB,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAc9F;;GAEG;AACH,wBAAsB,wBAAwB,CAAC,KAAK,EAAE;IACpD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,CAAC;CAC7C,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAwD7C"}
|
|
@@ -34,12 +34,14 @@ export async function authenticateOidcStrategy(input) {
|
|
|
34
34
|
kind: "not-authenticated",
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
|
-
const
|
|
38
|
-
|
|
37
|
+
const isCurrentVercelProjectToken = input.strategy.acceptCurrentVercelProject &&
|
|
38
|
+
isCurrentVercelProject({
|
|
39
39
|
issuer: input.strategy.issuer,
|
|
40
40
|
payload: verified.payload,
|
|
41
41
|
});
|
|
42
|
-
|
|
42
|
+
const isCurrentVercelRuntimeToken = isCurrentVercelProjectToken && isCurrentVercelEnvironment({ payload: verified.payload });
|
|
43
|
+
if (!isCurrentVercelProjectToken &&
|
|
44
|
+
!areTokenClaimMatchersSatisfied(verified.payload, input.strategy)) {
|
|
43
45
|
return {
|
|
44
46
|
kind: "caller-not-allowed",
|
|
45
47
|
};
|
|
@@ -49,7 +51,7 @@ export async function authenticateOidcStrategy(input) {
|
|
|
49
51
|
principal: createJwtAuthenticatedCallerPrincipal({
|
|
50
52
|
authenticator: "oidc",
|
|
51
53
|
payload: verified.payload,
|
|
52
|
-
principalType:
|
|
54
|
+
principalType: isCurrentVercelRuntimeToken ? "runtime" : "service",
|
|
53
55
|
}),
|
|
54
56
|
};
|
|
55
57
|
}
|
|
@@ -92,15 +94,34 @@ async function getOidcDiscoveryDocument(discoveryUrl) {
|
|
|
92
94
|
oidcDiscoveryDocumentCache.set(discoveryUrl, discoveryPromise);
|
|
93
95
|
return await discoveryPromise;
|
|
94
96
|
}
|
|
95
|
-
|
|
97
|
+
/**
|
|
98
|
+
* Returns whether a verified JWT was minted by Vercel OIDC for the
|
|
99
|
+
* current Vercel project (any environment). Used by the verifier to
|
|
100
|
+
* unconditionally accept tokens from the deployment's own project on
|
|
101
|
+
* top of any author-supplied `subjects`/`claims` matchers.
|
|
102
|
+
*/
|
|
103
|
+
function isCurrentVercelProject(input) {
|
|
96
104
|
if (!input.issuer.startsWith("https://oidc.vercel.com")) {
|
|
97
105
|
return false;
|
|
98
106
|
}
|
|
99
107
|
const currentProjectId = process.env.VERCEL_PROJECT_ID?.trim();
|
|
108
|
+
if (currentProjectId === undefined || currentProjectId.length === 0) {
|
|
109
|
+
return false;
|
|
110
|
+
}
|
|
111
|
+
return (typeof input.payload.project_id === "string" && input.payload.project_id === currentProjectId);
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Returns whether a verified JWT's `environment` claim matches the
|
|
115
|
+
* current Vercel deployment environment. Combined with
|
|
116
|
+
* {@link isCurrentVercelProject} to upgrade `principalType` from
|
|
117
|
+
* `"service"` to `"runtime"` when the caller is the deployment itself.
|
|
118
|
+
*/
|
|
119
|
+
function isCurrentVercelEnvironment(input) {
|
|
100
120
|
const currentEnvironment = (process.env.VERCEL_TARGET_ENV?.trim() ?? process.env.VERCEL_ENV?.trim())?.trim();
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
121
|
+
if (currentEnvironment === undefined || currentEnvironment.length === 0) {
|
|
122
|
+
return false;
|
|
123
|
+
}
|
|
124
|
+
return (typeof input.payload.environment === "string" &&
|
|
104
125
|
input.payload.environment === currentEnvironment);
|
|
105
126
|
}
|
|
106
127
|
//# sourceMappingURL=oidc.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/oidc.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,8BAA8B,EAC9B,qCAAqC,GACtC,MAAM,mBAAmB,CAAC;AAG3B,MAAM,2BAA2B,GAAG,CAAC;KAClC,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;CAC3B,CAAC;KACD,WAAW,EAAE,CAAC;AACjB,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAGvC,CAAC;AACJ,MAAM,aAAa,GAAG,IAAI,GAAG,EAAiD,CAAC;AAE/E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,KAG9C;IACC,IAAI,UAAiD,CAAC;IAEtD,IAAI,CAAC;QACH,UAAU,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,2CAA2C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,4BAA4B,EAAE;SAC5H,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE;YACxD,QAAQ,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,gBAAgB;YAC/C,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;SAC9B,CAAC,CAAC;QAEH,IAAI,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClF,OAAO;gBACL,IAAI,EAAE,mBAAmB;aAC1B,CAAC;QACJ,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/oidc.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,8BAA8B,EAC9B,qCAAqC,GACtC,MAAM,mBAAmB,CAAC;AAG3B,MAAM,2BAA2B,GAAG,CAAC;KAClC,MAAM,CAAC;IACN,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;CAC3B,CAAC;KACD,WAAW,EAAE,CAAC;AACjB,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAGvC,CAAC;AACJ,MAAM,aAAa,GAAG,IAAI,GAAG,EAAiD,CAAC;AAE/E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,KAG9C;IACC,IAAI,UAAiD,CAAC;IAEtD,IAAI,CAAC;QACH,UAAU,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,2CAA2C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,4BAA4B,EAAE;SAC5H,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE;YACxD,QAAQ,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC;YACvC,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,gBAAgB;YAC/C,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;SAC9B,CAAC,CAAC;QAEH,IAAI,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClF,OAAO;gBACL,IAAI,EAAE,mBAAmB;aAC1B,CAAC;QACJ,CAAC;QAED,MAAM,2BAA2B,GAC/B,KAAK,CAAC,QAAQ,CAAC,0BAA0B;YACzC,sBAAsB,CAAC;gBACrB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;gBAC7B,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC,CAAC;QACL,MAAM,2BAA2B,GAC/B,2BAA2B,IAAI,0BAA0B,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAE3F,IACE,CAAC,2BAA2B;YAC5B,CAAC,8BAA8B,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,EACjE,CAAC;YACD,OAAO;gBACL,IAAI,EAAE,oBAAoB;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,SAAS,EAAE,qCAAqC,CAAC;gBAC/C,aAAa,EAAE,MAAM;gBACrB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,aAAa,EAAE,2BAA2B,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;aACnE,CAAC;SACH,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;YACL,IAAI,EAAE,mBAAmB;SAC1B,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,QAAkC;IAElC,MAAM,iBAAiB,GAAG,MAAM,wBAAwB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAE/D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3E,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAE1D,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,YAAoB;IAEpB,MAAM,MAAM,GAAG,0BAA0B,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE5D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,MAAM,MAAM,CAAC;IACtB,CAAC;IAED,MAAM,gBAAgB,GAAG,KAAK,CAAC,YAAY,EAAE;QAC3C,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB;SAC3B;KACF,CAAC;SACC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACvB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,iCAAiC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,2BAA2B,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,0BAA0B,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,KAAK,CAAC;IACd,CAAC,CAAC,CAAC;IAEL,0BAA0B,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;IAE/D,OAAO,MAAM,gBAAgB,CAAC;AAChC,CAAC;AAED;;;;;GAKG;AACH,SAAS,sBAAsB,CAAC,KAG/B;IACC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAAE,CAAC;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC;IAC/D,IAAI,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,KAAK,gBAAgB,CAC9F,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,0BAA0B,CAAC,KAAuC;IACzE,MAAM,kBAAkB,GAAG,CACzB,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,CACxE,EAAE,IAAI,EAAE,CAAC;IACV,IAAI,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,KAAK,QAAQ;QAC7C,KAAK,CAAC,OAAO,CAAC,WAAW,KAAK,kBAAkB,CACjD,CAAC;AACJ,CAAC"}
|
|
@@ -56,7 +56,21 @@ export interface ResolvedJwtEcdsaAuthStrategy extends ResolvedTokenClaimMatchers
|
|
|
56
56
|
* Resolved OIDC auth strategy.
|
|
57
57
|
*/
|
|
58
58
|
export interface ResolvedOidcAuthStrategy extends ResolvedTokenClaimMatchers {
|
|
59
|
-
|
|
59
|
+
/**
|
|
60
|
+
* Vercel-platform extension. When `true` and the token's issuer is
|
|
61
|
+
* a Vercel OIDC issuer, tokens minted for the current
|
|
62
|
+
* `VERCEL_PROJECT_ID` are accepted unconditionally — in addition to
|
|
63
|
+
* the author-supplied `subjects`/`claims` matchers — so the
|
|
64
|
+
* deployment's own runtime callers (subagent, internal fetches)
|
|
65
|
+
* always authenticate. Tokens that additionally match the current
|
|
66
|
+
* `VERCEL_TARGET_ENV` / `VERCEL_ENV` are tagged
|
|
67
|
+
* `principalType: "runtime"`; other current-project tokens are
|
|
68
|
+
* tagged `"service"`.
|
|
69
|
+
*
|
|
70
|
+
* Set exclusively by `verifyVercelOidc`. The generic public
|
|
71
|
+
* `verifyOidc` always passes `false`.
|
|
72
|
+
*/
|
|
73
|
+
readonly acceptCurrentVercelProject: boolean;
|
|
60
74
|
readonly audiences: readonly string[];
|
|
61
75
|
readonly clockSkewSeconds: number;
|
|
62
76
|
readonly discoveryUrl: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,4BAA4B,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,2BAA2B,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,2BAA2B,CAAC;IACpD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,2BAA4B,SAAQ,0BAA0B;IAC7E,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IAChD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,4BAA6B,SAAQ,0BAA0B;IAC9E,QAAQ,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IAChD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,wBAAyB,SAAQ,0BAA0B;IAC1E,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/runtime/governance/auth/types.ts"],"names":[],"mappings":"AAwHA;;;GAGG;AACH,MAAM,UAAU,+BAA+B,CAC7C,SAAuC;IAEvC,OAAO;QACL,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,aAAa,EAAE,SAAS,CAAC,aAAa;QACtC,MAAM,EAAE,SAAS,CAAC,MAAM;QACxB,WAAW,EAAE,SAAS,CAAC,WAAW;QAClC,aAAa,EAAE,SAAS,CAAC,aAAa;QACtC,OAAO,EAAE,SAAS,CAAC,OAAO;KAC3B,CAAC;AACJ,CAAC"}
|