@stigmer/server 3.18.0 → 3.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/boot/compose.d.ts.map +1 -1
- package/dist/boot/compose.js +42 -6
- package/dist/boot/compose.js.map +1 -1
- package/dist/boot/config.d.ts +6 -2
- package/dist/boot/config.d.ts.map +1 -1
- package/dist/boot/config.js.map +1 -1
- package/dist/boot/oauth-redirect-uri.d.ts +54 -0
- package/dist/boot/oauth-redirect-uri.d.ts.map +1 -0
- package/dist/boot/oauth-redirect-uri.js +37 -0
- package/dist/boot/oauth-redirect-uri.js.map +1 -0
- package/dist/domain/agentexecution/lifecycle.js +1 -1
- package/dist/domain/agentexecution/lifecycle.js.map +1 -1
- package/dist/domain/mcpserver/complete-endpoint-auth.d.ts +16 -0
- package/dist/domain/mcpserver/complete-endpoint-auth.d.ts.map +1 -0
- package/dist/domain/mcpserver/complete-endpoint-auth.js +260 -0
- package/dist/domain/mcpserver/complete-endpoint-auth.js.map +1 -0
- package/dist/domain/mcpserver/complete-oauth-connect.d.ts.map +1 -1
- package/dist/domain/mcpserver/complete-oauth-connect.js +1 -1
- package/dist/domain/mcpserver/complete-oauth-connect.js.map +1 -1
- package/dist/domain/mcpserver/connect.d.ts +25 -0
- package/dist/domain/mcpserver/connect.d.ts.map +1 -1
- package/dist/domain/mcpserver/connect.js +8 -23
- package/dist/domain/mcpserver/connect.js.map +1 -1
- package/dist/domain/mcpserver/controller.d.ts.map +1 -1
- package/dist/domain/mcpserver/controller.js +12 -0
- package/dist/domain/mcpserver/controller.js.map +1 -1
- package/dist/domain/mcpserver/initiate-oauth-connect.d.ts.map +1 -1
- package/dist/domain/mcpserver/initiate-oauth-connect.js +38 -14
- package/dist/domain/mcpserver/initiate-oauth-connect.js.map +1 -1
- package/dist/domain/mcpserver/oauth/dcr.d.ts +10 -1
- package/dist/domain/mcpserver/oauth/dcr.d.ts.map +1 -1
- package/dist/domain/mcpserver/oauth/dcr.js +1 -9
- package/dist/domain/mcpserver/oauth/dcr.js.map +1 -1
- package/dist/domain/mcpserver/oauth/discovery.d.ts +43 -20
- package/dist/domain/mcpserver/oauth/discovery.d.ts.map +1 -1
- package/dist/domain/mcpserver/oauth/discovery.js +69 -54
- package/dist/domain/mcpserver/oauth/discovery.js.map +1 -1
- package/dist/domain/mcpserver/oauth/preflight.d.ts +27 -1
- package/dist/domain/mcpserver/oauth/preflight.d.ts.map +1 -1
- package/dist/domain/mcpserver/oauth/preflight.js +1 -26
- package/dist/domain/mcpserver/oauth/preflight.js.map +1 -1
- package/dist/domain/mcpserver/oauth/refresh.d.ts +2 -1
- package/dist/domain/mcpserver/oauth/refresh.d.ts.map +1 -1
- package/dist/domain/mcpserver/oauth/refresh.js +1 -1
- package/dist/domain/mcpserver/oauth/refresh.js.map +1 -1
- package/dist/domain/mcpserver/oauth/token.d.ts +9 -2
- package/dist/domain/mcpserver/oauth/token.d.ts.map +1 -1
- package/dist/domain/mcpserver/oauth/token.js +2 -8
- package/dist/domain/mcpserver/oauth/token.js.map +1 -1
- package/dist/domain/workflowexecution/lifecycle.js +1 -1
- package/dist/domain/workflowexecution/lifecycle.js.map +1 -1
- package/dist/extensions/drivers.d.ts +17 -0
- package/dist/extensions/drivers.d.ts.map +1 -1
- package/dist/extensions/outbound-egress.d.ts +49 -0
- package/dist/extensions/outbound-egress.d.ts.map +1 -0
- package/dist/extensions/outbound-egress.js +51 -0
- package/dist/extensions/outbound-egress.js.map +1 -0
- package/dist/extensions/registry.d.ts +6 -0
- package/dist/extensions/registry.d.ts.map +1 -1
- package/dist/extensions/registry.js +10 -0
- package/dist/extensions/registry.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/pipeline/apiresource-labels.d.ts +14 -0
- package/dist/pipeline/apiresource-labels.d.ts.map +1 -1
- package/dist/pipeline/apiresource-labels.js +14 -0
- package/dist/pipeline/apiresource-labels.js.map +1 -1
- package/dist/sandbox/kubernetes.d.ts.map +1 -1
- package/dist/sandbox/kubernetes.js +8 -1
- package/dist/sandbox/kubernetes.js.map +1 -1
- package/dist/sandbox/provisioner.d.ts +20 -5
- package/dist/sandbox/provisioner.d.ts.map +1 -1
- package/dist/sandbox/provisioner.js.map +1 -1
- package/dist/sandbox/steps.d.ts +22 -8
- package/dist/sandbox/steps.d.ts.map +1 -1
- package/dist/sandbox/steps.js +17 -12
- package/dist/sandbox/steps.js.map +1 -1
- package/package.json +6 -5
- package/src/boot/__tests__/oauth-redirect-uri.test.ts +38 -0
- package/src/boot/compose.ts +47 -8
- package/src/boot/config.ts +6 -2
- package/src/boot/oauth-redirect-uri.ts +53 -0
- package/src/domain/agentexecution/lifecycle.ts +1 -1
- package/src/domain/mcpserver/__tests__/complete-endpoint-auth.test.ts +270 -0
- package/src/domain/mcpserver/__tests__/connect-authorization.test.ts +3 -0
- package/src/domain/mcpserver/__tests__/connect.test.ts +31 -0
- package/src/domain/mcpserver/__tests__/oauth-handshake.test.ts +1 -1
- package/src/domain/mcpserver/complete-endpoint-auth.ts +277 -0
- package/src/domain/mcpserver/complete-oauth-connect.ts +1 -0
- package/src/domain/mcpserver/connect.ts +21 -15
- package/src/domain/mcpserver/controller.ts +16 -0
- package/src/domain/mcpserver/initiate-oauth-connect.ts +37 -13
- package/src/domain/mcpserver/oauth/__tests__/discovery.test.ts +120 -91
- package/src/domain/mcpserver/oauth/__tests__/token-refresh.test.ts +3 -1
- package/src/domain/mcpserver/oauth/dcr.ts +2 -1
- package/src/domain/mcpserver/oauth/discovery.ts +120 -89
- package/src/domain/mcpserver/oauth/preflight.ts +2 -1
- package/src/domain/mcpserver/oauth/refresh.ts +2 -1
- package/src/domain/mcpserver/oauth/token.ts +4 -3
- package/src/domain/workflowexecution/lifecycle.ts +1 -1
- package/src/extensions/__tests__/outbound-egress-points.test.ts +58 -0
- package/src/extensions/drivers.ts +17 -0
- package/src/extensions/outbound-egress.ts +55 -0
- package/src/extensions/registry.ts +19 -0
- package/src/index.ts +10 -0
- package/src/pipeline/apiresource-labels.ts +16 -0
- package/src/sandbox/__tests__/docker.integration.test.ts +2 -0
- package/src/sandbox/__tests__/kubernetes.test.ts +10 -2
- package/src/sandbox/__tests__/local-process.integration.test.ts +3 -0
- package/src/sandbox/__tests__/steps.test.ts +72 -19
- package/src/sandbox/kubernetes.ts +8 -1
- package/src/sandbox/provisioner.ts +20 -5
- package/src/sandbox/steps.ts +29 -12
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* CompleteEndpointAuth — the McpServer create and update chains' step that
|
|
3
|
+
* makes a URL enough: a server saved with only an `http.url` is asked once
|
|
4
|
+
* whether it wants OAuth, and when it does, the spec is completed so Sign
|
|
5
|
+
* in exists from the moment the row does.
|
|
6
|
+
*
|
|
7
|
+
* Why the domain and not the plugin. A plugin is one producer of servers
|
|
8
|
+
* among three (a plugin install, `stigmer apply` of a YAML, the console's
|
|
9
|
+
* form), and every producer's server runs these two chains. A step here
|
|
10
|
+
* reaches all three; a behaviour in the plugin's materialisation would
|
|
11
|
+
* make the same YAML come alive from a plugin and stay dead by hand.
|
|
12
|
+
*
|
|
13
|
+
* What the step reads: the author's shape only. An `http` server whose
|
|
14
|
+
* `auth` is unset, whose `env` is empty, and whose headers carry neither a
|
|
15
|
+
* `${VAR}` placeholder nor an `Authorization` header. Anything else is the
|
|
16
|
+
* author speaking about authentication (a declared token variable, a
|
|
17
|
+
* pasted literal token, an `auth` block, an `oauth_app_ref`) and the step
|
|
18
|
+
* leaves the state exactly as sent.
|
|
19
|
+
*
|
|
20
|
+
* What the step writes, and only on an OAuth challenge: the least that
|
|
21
|
+
* makes Sign in possible and the page honest. `auth.target_env_var`
|
|
22
|
+
* (`<SLUG>_ACCESS_TOKEN`), the secret `env` declaration for it, the
|
|
23
|
+
* `Authorization: Bearer ${VAR}` header, `auth.oauth_only` (the reading the
|
|
24
|
+
* runner's "requires OAuth" sentence and the console's credential hook
|
|
25
|
+
* already apply to a 401 challenge: manual token entry is a dead end), and
|
|
26
|
+
* the provenance label `stigmer.ai/mcp-auth: endpoint`, vouched through
|
|
27
|
+
* the server-stamped mechanism so GuardReservedLabels admits it for an
|
|
28
|
+
* ordinary caller. Not written: `discovery_url` (the author's override;
|
|
29
|
+
* Sign in resolves the login server from `http.url` every time through
|
|
30
|
+
* the RFC 9728 walk) and `scope_hints` (initiate reads the login server's
|
|
31
|
+
* `scopes_supported` when hints are empty). A cached fact drifts; the
|
|
32
|
+
* endpoint restates these on every Sign in.
|
|
33
|
+
*
|
|
34
|
+
* Every other outcome (a 2xx, a non-OAuth 401, any other status, no
|
|
35
|
+
* answer) leaves the spec as sent and writes no status: `ConnectStatus`
|
|
36
|
+
* records connect operations, and a probe is not one. The best-effort
|
|
37
|
+
* connect that follows an apply then runs for these servers as before.
|
|
38
|
+
*
|
|
39
|
+
* Carry-over on update, three questions in order:
|
|
40
|
+
*
|
|
41
|
+
* 1. Is the author speaking about auth? An incoming `auth`, `env`,
|
|
42
|
+
* placeholder or `Authorization` header that is NOT exactly the trio
|
|
43
|
+
* this step derived on the existing row means yes: the state is left
|
|
44
|
+
* as sent and the label is dropped (a removal passes the guard by
|
|
45
|
+
* design). An exact echo of the derived trio (the console's per-field
|
|
46
|
+
* save re-sends the whole spec) is not the author speaking: the label
|
|
47
|
+
* is kept and nothing is probed.
|
|
48
|
+
* 2. Is it the same endpoint? A changed URL with the author's shape is
|
|
49
|
+
* probed again.
|
|
50
|
+
* 3. Has it already answered? The author's shape at the same URL on a
|
|
51
|
+
* row carrying the label reuses the existing completion with no
|
|
52
|
+
* network: a plugin re-push and a `stigmer apply` re-run cost nothing
|
|
53
|
+
* and change nothing.
|
|
54
|
+
*
|
|
55
|
+
* The token-path default applies to every producer: whenever
|
|
56
|
+
* `auth.target_env_var` is set (by hand, by a plugin overlay, or by this
|
|
57
|
+
* step), the variable is declared in `env` if it is not, and the
|
|
58
|
+
* `Authorization: Bearer ${VAR}` header is added if no header references
|
|
59
|
+
* it. The chain is `auth.target_env_var` names the variable, `env` declares
|
|
60
|
+
* it (connect and execution inject a grant's token only into DECLARED
|
|
61
|
+
* variables), and a header sends it; break one link and no token is sent.
|
|
62
|
+
* An `auth` block written without the other two links used to sit silently
|
|
63
|
+
* dead; this makes it work.
|
|
64
|
+
*
|
|
65
|
+
* The probe: one complete `initialize` to `http.url` with the author's
|
|
66
|
+
* literal headers, through the slice's egress-guarded `outboundFetch`,
|
|
67
|
+
* under a 3 s deadline that covers DNS (the save waits on it; a hosted
|
|
68
|
+
* endpoint answers in well under a second, an unreachable host fails at
|
|
69
|
+
* once, and only a host that accepts and stalls reaches the ceiling). No
|
|
70
|
+
* tool is called, no metadata document is fetched, no redirect is
|
|
71
|
+
* followed. A thrown probe is logged and read as unreachable; the save
|
|
72
|
+
* never fails on it.
|
|
73
|
+
*
|
|
74
|
+
* Placement: after BuildNewState (create) or BuildUpdateState (update),
|
|
75
|
+
* immediately before GuardReservedLabels, the lineage step's law: the
|
|
76
|
+
* labels the guard diffs are the ones this step stamped.
|
|
77
|
+
*
|
|
78
|
+
* Proven by __tests__/complete-endpoint-auth.test.ts and the McpServer
|
|
79
|
+
* conformance suite's URL-only arms (CONFORMANCE_TARGET=local).
|
|
80
|
+
*/
|
|
81
|
+
import { create } from "@bufbuild/protobuf";
|
|
82
|
+
import { probeEndpointAuth } from "@stigmer/outbound/mcp-oauth";
|
|
83
|
+
import { EnvVarDeclarationSchema } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/spec_pb";
|
|
84
|
+
import { McpServerAuthSchema } from "@stigmer/protos/ai/stigmer/agentic/mcpserver/v1/spec_pb";
|
|
85
|
+
import { MCP_AUTH_ENDPOINT, MCP_AUTH_LABEL } from "../../pipeline/apiresource-labels.js";
|
|
86
|
+
import { EXISTING_RESOURCE_KEY } from "../../pipeline/steps/load-existing.js";
|
|
87
|
+
import { recordServerStampedReservedLabels } from "../../pipeline/steps/server-stamped-reserved-labels.js";
|
|
88
|
+
/** The save waits on the probe; a real endpoint answers well within this, DNS included. */
|
|
89
|
+
export const ENDPOINT_PROBE_TIMEOUT_MS = 3_000;
|
|
90
|
+
/** How the control plane names itself in the handshake's `clientInfo`. */
|
|
91
|
+
const PROBE_CLIENT_NAME = "stigmer-server";
|
|
92
|
+
/** The suffix of the token variable the step declares for a completed server. */
|
|
93
|
+
export const ACCESS_TOKEN_VAR_SUFFIX = "_ACCESS_TOKEN";
|
|
94
|
+
const AUTHORIZATION_HEADER = "authorization";
|
|
95
|
+
export function newCompleteEndpointAuthStep(deps) {
|
|
96
|
+
return {
|
|
97
|
+
name: "CompleteEndpointAuth",
|
|
98
|
+
async execute(ctx) {
|
|
99
|
+
const server = ctx.newState;
|
|
100
|
+
const spec = server.spec;
|
|
101
|
+
if (spec === undefined)
|
|
102
|
+
return;
|
|
103
|
+
applyTokenPathDefault(spec, server.metadata?.slug ?? "");
|
|
104
|
+
const existing = ctx.get(EXISTING_RESOURCE_KEY);
|
|
105
|
+
const derived = existing !== undefined ? derivedCompletionOf(existing) : undefined;
|
|
106
|
+
const url = authorShapeUrl(spec);
|
|
107
|
+
if (url === undefined) {
|
|
108
|
+
// The author speaks about auth. An exact echo of what this step
|
|
109
|
+
// derived is the console re-sending what it loaded: keep the label.
|
|
110
|
+
// Anything else is the author's own; the label goes.
|
|
111
|
+
if (derived !== undefined && echoesDerived(spec, derived)) {
|
|
112
|
+
stamp(ctx, server);
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
dropLabel(server);
|
|
116
|
+
}
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
if (derived !== undefined && derived.url === url) {
|
|
120
|
+
applyCompletion(spec, derived.variable, derived.description);
|
|
121
|
+
stamp(ctx, server);
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
const outcome = await probe(url, spec, deps);
|
|
125
|
+
if (outcome !== "oauth") {
|
|
126
|
+
dropLabel(server);
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
const variable = accessTokenVariable(server.metadata?.slug ?? "");
|
|
130
|
+
applyCompletion(spec, variable, tokenDescription(server.metadata?.slug ?? ""));
|
|
131
|
+
stamp(ctx, server);
|
|
132
|
+
},
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* The URL when the spec is the author's shape (an `http` server that says
|
|
137
|
+
* nothing about authentication); undefined otherwise.
|
|
138
|
+
*/
|
|
139
|
+
function authorShapeUrl(spec) {
|
|
140
|
+
if (spec.serverType.case !== "http")
|
|
141
|
+
return undefined;
|
|
142
|
+
if (spec.auth !== undefined)
|
|
143
|
+
return undefined;
|
|
144
|
+
if (Object.keys(spec.env).length > 0)
|
|
145
|
+
return undefined;
|
|
146
|
+
for (const [name, value] of Object.entries(spec.serverType.value.headers)) {
|
|
147
|
+
if (name.toLowerCase() === AUTHORIZATION_HEADER)
|
|
148
|
+
return undefined;
|
|
149
|
+
if (value.includes("${"))
|
|
150
|
+
return undefined;
|
|
151
|
+
}
|
|
152
|
+
return spec.serverType.value.url;
|
|
153
|
+
}
|
|
154
|
+
function derivedCompletionOf(existing) {
|
|
155
|
+
if (existing.metadata?.labels[MCP_AUTH_LABEL] !== MCP_AUTH_ENDPOINT)
|
|
156
|
+
return undefined;
|
|
157
|
+
const spec = existing.spec;
|
|
158
|
+
if (spec === undefined || spec.serverType.case !== "http")
|
|
159
|
+
return undefined;
|
|
160
|
+
const variable = spec.auth?.targetEnvVar ?? "";
|
|
161
|
+
if (variable === "")
|
|
162
|
+
return undefined;
|
|
163
|
+
return { url: spec.serverType.value.url, variable, description: spec.env[variable]?.description ?? "" };
|
|
164
|
+
}
|
|
165
|
+
/** Whether the incoming spec carries exactly the trio the step derived, and nothing more about auth. */
|
|
166
|
+
function echoesDerived(spec, derived) {
|
|
167
|
+
if (spec.serverType.case !== "http" || spec.serverType.value.url !== derived.url)
|
|
168
|
+
return false;
|
|
169
|
+
const auth = spec.auth;
|
|
170
|
+
if (auth === undefined)
|
|
171
|
+
return false;
|
|
172
|
+
if (auth.targetEnvVar !== derived.variable || !auth.oauthOnly)
|
|
173
|
+
return false;
|
|
174
|
+
if ((auth.oauthAppRef?.slug ?? "") !== "" || auth.discoveryUrl !== "" || auth.scopeHints.length > 0 || auth.tokenLifetimeHint !== "")
|
|
175
|
+
return false;
|
|
176
|
+
const envKeys = Object.keys(spec.env);
|
|
177
|
+
if (envKeys.length !== 1 || envKeys[0] !== derived.variable)
|
|
178
|
+
return false;
|
|
179
|
+
const declaration = spec.env[derived.variable];
|
|
180
|
+
if (declaration === undefined || !declaration.isSecret || declaration.optional)
|
|
181
|
+
return false;
|
|
182
|
+
const headers = Object.entries(spec.serverType.value.headers);
|
|
183
|
+
const authorization = headers.filter(([name]) => name.toLowerCase() === AUTHORIZATION_HEADER);
|
|
184
|
+
if (authorization.length !== 1 || authorization[0]?.[1] !== bearerHeader(derived.variable))
|
|
185
|
+
return false;
|
|
186
|
+
return headers.every(([name, value]) => name.toLowerCase() === AUTHORIZATION_HEADER || !value.includes("${"));
|
|
187
|
+
}
|
|
188
|
+
function applyCompletion(spec, variable, description) {
|
|
189
|
+
spec.auth = create(McpServerAuthSchema, { targetEnvVar: variable, oauthOnly: true });
|
|
190
|
+
spec.env[variable] = create(EnvVarDeclarationSchema, { isSecret: true, optional: false, description });
|
|
191
|
+
applyTokenPathDefault(spec, "");
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
194
|
+
* Whenever `auth.target_env_var` names a variable, the variable is declared
|
|
195
|
+
* (secret, required) if the author did not, and the header that sends it is
|
|
196
|
+
* added if no header references it; a declaration or a header the author
|
|
197
|
+
* wrote is left as written. Only an `http` server carries headers; a stdio
|
|
198
|
+
* server's token reaches it through the declared variable alone.
|
|
199
|
+
*/
|
|
200
|
+
function applyTokenPathDefault(spec, slug) {
|
|
201
|
+
const variable = spec.auth?.targetEnvVar ?? "";
|
|
202
|
+
if (variable === "")
|
|
203
|
+
return;
|
|
204
|
+
if (spec.env[variable] === undefined) {
|
|
205
|
+
spec.env[variable] = create(EnvVarDeclarationSchema, { isSecret: true, optional: false, description: tokenDescription(slug) });
|
|
206
|
+
}
|
|
207
|
+
if (spec.serverType.case !== "http")
|
|
208
|
+
return;
|
|
209
|
+
const headers = spec.serverType.value.headers;
|
|
210
|
+
const reference = `\${${variable}}`;
|
|
211
|
+
if (Object.values(headers).some((value) => value.includes(reference)))
|
|
212
|
+
return;
|
|
213
|
+
headers["Authorization"] = bearerHeader(variable);
|
|
214
|
+
}
|
|
215
|
+
function bearerHeader(variable) {
|
|
216
|
+
return `Bearer \${${variable}}`;
|
|
217
|
+
}
|
|
218
|
+
/** `<SLUG>_ACCESS_TOKEN`, the slug upper-cased with every non-alphanumeric run as one underscore. */
|
|
219
|
+
export function accessTokenVariable(slug) {
|
|
220
|
+
const stem = slug.toUpperCase().replace(/[^A-Z0-9]+/g, "_").replace(/^_+|_+$/g, "");
|
|
221
|
+
return `${stem === "" ? "MCP" : stem}${ACCESS_TOKEN_VAR_SUFFIX}`;
|
|
222
|
+
}
|
|
223
|
+
function tokenDescription(slug) {
|
|
224
|
+
return `OAuth access token for the '${slug}' MCP server; Sign in fills it`;
|
|
225
|
+
}
|
|
226
|
+
function stamp(ctx, server) {
|
|
227
|
+
if (server.metadata === undefined)
|
|
228
|
+
return;
|
|
229
|
+
server.metadata.labels[MCP_AUTH_LABEL] = MCP_AUTH_ENDPOINT;
|
|
230
|
+
recordServerStampedReservedLabels(ctx, MCP_AUTH_LABEL);
|
|
231
|
+
}
|
|
232
|
+
function dropLabel(server) {
|
|
233
|
+
if (server.metadata === undefined)
|
|
234
|
+
return;
|
|
235
|
+
delete server.metadata.labels[MCP_AUTH_LABEL];
|
|
236
|
+
}
|
|
237
|
+
async function probe(url, spec, deps) {
|
|
238
|
+
const headers = spec.serverType.case === "http" ? spec.serverType.value.headers : {};
|
|
239
|
+
try {
|
|
240
|
+
const outcome = await probeEndpointAuth(url, headers, {
|
|
241
|
+
fetchImpl: deps.outboundFetch,
|
|
242
|
+
timeoutMs: ENDPOINT_PROBE_TIMEOUT_MS,
|
|
243
|
+
clientName: PROBE_CLIENT_NAME,
|
|
244
|
+
});
|
|
245
|
+
if (outcome.kind === "unreachable") {
|
|
246
|
+
deps.logger.debug("MCP endpoint probe got no answer; saving the spec as sent", { url, error: outcome.error });
|
|
247
|
+
}
|
|
248
|
+
return outcome.kind === "oauth" ? "oauth" : "other";
|
|
249
|
+
}
|
|
250
|
+
catch (error) {
|
|
251
|
+
// probeEndpointAuth never throws by contract; a throw here is a defect
|
|
252
|
+
// in the fetch it was handed, and a save must not fail on it.
|
|
253
|
+
deps.logger.warn("MCP endpoint probe threw; saving the spec as sent", {
|
|
254
|
+
url,
|
|
255
|
+
error: error instanceof Error ? error.message : String(error),
|
|
256
|
+
});
|
|
257
|
+
return "other";
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
//# sourceMappingURL=complete-endpoint-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"complete-endpoint-auth.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/complete-endpoint-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-oauth-connect.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/complete-oauth-connect.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,uDAAuD,CAAC;AAI/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AASnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,oBAAoB,EAC1B,KAAK,EAAE,yBAAyB,EAChC,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,0BAA0B,CAAC,
|
|
1
|
+
{"version":3,"file":"complete-oauth-connect.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/complete-oauth-connect.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,uDAAuD,CAAC;AAI/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AASnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,oBAAoB,EAC1B,KAAK,EAAE,yBAAyB,EAChC,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,0BAA0B,CAAC,CAmMrC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,uBAAuB,CAC3C,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,iBAAiB,CAAC,CAoB5B"}
|
|
@@ -79,7 +79,7 @@ export async function completeOAuthConnect(deps, input, identity) {
|
|
|
79
79
|
// the pinned (unusual) Go mapping, complete_oauth_connect.go:96.
|
|
80
80
|
let tokenResponse;
|
|
81
81
|
try {
|
|
82
|
-
tokenResponse = await exchangeCode(pendingState.tokenEndpoint, code, pendingState.redirectUri, pendingState.codeVerifier, pendingState.clientId, pendingState.clientSecret, pendingState.tokenAuthMethod);
|
|
82
|
+
tokenResponse = await exchangeCode(pendingState.tokenEndpoint, code, pendingState.redirectUri, pendingState.codeVerifier, pendingState.clientId, pendingState.clientSecret, pendingState.tokenAuthMethod, deps.outboundFetch);
|
|
83
83
|
}
|
|
84
84
|
catch (error) {
|
|
85
85
|
throw unavailableError(`token exchange failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-oauth-connect.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/complete-oauth-connect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"complete-oauth-connect.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/complete-oauth-connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* McpServer connect (blocking lane) + the shared connect machinery —
|
|
3
|
+
* ports pkg/domain/mcpserver/controller/connect.go: the Connect RPC,
|
|
4
|
+
* prepareConnect (OAuth refresh pre-flight, ephemeral ExecutionContext,
|
|
5
|
+
* decrypt-lane token minting), environment resolution, the workflow
|
|
6
|
+
* failure→gRPC mapping, and apply's best-effort auto-connect tail. The
|
|
7
|
+
* async lane lives in start-connect.ts; the connect_status persistence
|
|
8
|
+
* family in connect-status.ts.
|
|
9
|
+
*
|
|
10
|
+
* Discovery runs on the RUNNER: this module starts the runner's
|
|
11
|
+
* stigmer/mcp-server/connect workflow through the engine seam
|
|
12
|
+
* (engine.ts) and never registers a worker.
|
|
13
|
+
*
|
|
14
|
+
* Proven by mcpserver-connect.conformance.test.ts
|
|
15
|
+
* (CONFORMANCE_TARGET=local-execution) and __tests__/connect.test.ts.
|
|
16
|
+
*/
|
|
17
|
+
import type { OutboundFetch } from "@stigmer/outbound/egress";
|
|
1
18
|
import type { MessageInitShape } from "@bufbuild/protobuf";
|
|
2
19
|
import { ConnectError } from "@connectrpc/connect";
|
|
3
20
|
import type { EnvironmentList, EnvironmentSecretValueInputSchema, ListEnvironmentsRequestSchema } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/io_pb";
|
|
@@ -132,6 +149,14 @@ export interface McpServerConnectDeps {
|
|
|
132
149
|
readonly pendingOAuthStates: PendingOAuthStateStore;
|
|
133
150
|
readonly secretService: SecretService;
|
|
134
151
|
readonly oauthRedirectUri: string;
|
|
152
|
+
/**
|
|
153
|
+
* The ONE fetch this slice dials user-supplied URLs with: the MCP
|
|
154
|
+
* endpoint probed at save time and the login server reached on Sign in
|
|
155
|
+
* (discovery, registration, the authorize preflight, token exchange and
|
|
156
|
+
* refresh). Composed at the root under the edition's egress policy
|
|
157
|
+
* (`drivers.outboundEgress`); no module here holds a `fetch` of its own.
|
|
158
|
+
*/
|
|
159
|
+
readonly outboundFetch: OutboundFetch;
|
|
135
160
|
}
|
|
136
161
|
/**
|
|
137
162
|
* Everything prepareConnect resolves for a connect lane: the slim
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* McpServer connect (blocking lane) + the shared connect machinery —
|
|
3
|
-
* ports pkg/domain/mcpserver/controller/connect.go: the Connect RPC,
|
|
4
|
-
* prepareConnect (OAuth refresh pre-flight, ephemeral ExecutionContext,
|
|
5
|
-
* decrypt-lane token minting), environment resolution, the workflow
|
|
6
|
-
* failure→gRPC mapping, and apply's best-effort auto-connect tail. The
|
|
7
|
-
* async lane lives in start-connect.ts; the connect_status persistence
|
|
8
|
-
* family in connect-status.ts.
|
|
9
|
-
*
|
|
10
|
-
* Discovery runs on the RUNNER: this module starts the runner's
|
|
11
|
-
* stigmer/mcp-server/connect workflow through the engine seam
|
|
12
|
-
* (engine.ts) and never registers a worker.
|
|
13
|
-
*
|
|
14
|
-
* Proven by mcpserver-connect.conformance.test.ts
|
|
15
|
-
* (CONFORMANCE_TARGET=local-execution) and __tests__/connect.test.ts.
|
|
16
|
-
*/
|
|
17
1
|
import { create } from "@bufbuild/protobuf";
|
|
18
2
|
import { Code, ConnectError } from "@connectrpc/connect";
|
|
19
3
|
import { EnvironmentValueSchema } from "@stigmer/protos/ai/stigmer/agentic/environment/v1/spec_pb";
|
|
@@ -647,7 +631,7 @@ export async function refreshOAuthTokenIfNeeded(deps, mcpServer, callerOrg) {
|
|
|
647
631
|
}
|
|
648
632
|
let result;
|
|
649
633
|
try {
|
|
650
|
-
result = await refreshTokenIfExpired(grant, refreshTokenValue, clientSecret, tokenAuthMethod, deps.logger);
|
|
634
|
+
result = await refreshTokenIfExpired(grant, refreshTokenValue, clientSecret, tokenAuthMethod, deps.logger, deps.outboundFetch);
|
|
651
635
|
}
|
|
652
636
|
catch (error) {
|
|
653
637
|
throw failedPreconditionError(error instanceof Error ? error.message : String(error));
|
|
@@ -790,12 +774,13 @@ export async function startBestEffortConnect(deps, mcpServer) {
|
|
|
790
774
|
}
|
|
791
775
|
const outcome = await run.result(CONNECT_TIMEOUT.ms + BEST_EFFORT_CONNECT_GET_BUFFER_MS);
|
|
792
776
|
if (!outcome.ok) {
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
777
|
+
// The same mapping the blocking lane and the async settle apply, so
|
|
778
|
+
// the page of a freshly applied server says what the runner found
|
|
779
|
+
// ("requires OAuth", "Missing Cursor credential") rather than that a
|
|
780
|
+
// background task did not complete. ConnectStatus promises the lanes
|
|
781
|
+
// record alike; this arm once recorded a generic sentence instead.
|
|
782
|
+
const failure = mapConnectFailure(deps.logger, mcpServer, run.workflowId, outcome.failure, CONNECT_TIMEOUT);
|
|
783
|
+
await persistConnectFailure(deps.store, deps.logger, mcpServerId, failure);
|
|
799
784
|
return;
|
|
800
785
|
}
|
|
801
786
|
let persisted;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/domain/mcpserver/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/controller.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AAczE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAyDjG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAGtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../src/domain/mcpserver/controller.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AAczE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4CAA4C,CAAC;AAyDjG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAGtD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAezD,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,kHAAkH;IAClH,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,qFAAqF;IACrF,QAAQ,CAAC,sBAAsB,EAAE,8BAA8B,GAAG,SAAS,CAAC;IAC5E,uDAAuD;IACvD,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;CACxC;AAED,sEAAsE;AACtE,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,uBAAuB,GAC5B,IAAI,CAiCN"}
|
|
@@ -59,6 +59,7 @@ import { newValidateVisibilityStep, newValidateVisibilityUpdateStep, } from "../
|
|
|
59
59
|
import { completeOAuthConnect } from "./complete-oauth-connect.js";
|
|
60
60
|
import { connect, startBestEffortConnect } from "./connect.js";
|
|
61
61
|
import { disconnectOAuth } from "./disconnect-oauth.js";
|
|
62
|
+
import { newCompleteEndpointAuthStep, } from "./complete-endpoint-auth.js";
|
|
62
63
|
import { getOAuthGrantStatus } from "./get-oauth-grant-status.js";
|
|
63
64
|
import { initiateOAuthConnect } from "./initiate-oauth-connect.js";
|
|
64
65
|
import { mcpServerSearchExtractor } from "./search-extractor.js";
|
|
@@ -124,6 +125,10 @@ function orgOAuthAppUnimplemented(method) {
|
|
|
124
125
|
function kindOf(ctx) {
|
|
125
126
|
return ctx.values.get(apiResourceKindKey);
|
|
126
127
|
}
|
|
128
|
+
/** The endpoint-auth step's slice of the deps: the guarded fetch the connect slice holds. */
|
|
129
|
+
function endpointAuthDeps(deps) {
|
|
130
|
+
return { outboundFetch: deps.connect.outboundFetch, logger: deps.logger };
|
|
131
|
+
}
|
|
127
132
|
/** Create — chain per Go buildCreatePipeline. */
|
|
128
133
|
async function createMcpServer(deps, server, ctx) {
|
|
129
134
|
const reqCtx = new RequestContext(McpServerSchema, server, callerIdentityOf(ctx), kindOf(ctx));
|
|
@@ -135,6 +140,10 @@ async function createMcpServer(deps, server, ctx) {
|
|
|
135
140
|
.addStep(newCheckDuplicateStep(deps.store))
|
|
136
141
|
.addStep(newBuildNewStateStep())
|
|
137
142
|
.addStep(newGuardPublicVisibilityStep(deps.authorizer))
|
|
143
|
+
// A URL-only server is asked once whether it wants OAuth and completed
|
|
144
|
+
// when it does; immediately before GuardReservedLabels because the
|
|
145
|
+
// provenance label it stamps is one the guard diffs.
|
|
146
|
+
.addStep(newCompleteEndpointAuthStep(endpointAuthDeps(deps)))
|
|
138
147
|
.addStep(newGuardReservedLabelsStep(deps.authorizer))
|
|
139
148
|
.addStep(newNormalizeReferencesStep())
|
|
140
149
|
.addStep(newPersistStep(deps.store))
|
|
@@ -161,6 +170,9 @@ async function update(deps, server, ctx) {
|
|
|
161
170
|
// STORED labels and the plugin row's existence).
|
|
162
171
|
.addStep(newGuardPluginManagedStep(deps.store))
|
|
163
172
|
.addStep(newBuildUpdateStateStep())
|
|
173
|
+
// Reads the existing row LoadExisting set, to reuse a completion or to
|
|
174
|
+
// tell an author's own auth from the derived one (its header).
|
|
175
|
+
.addStep(newCompleteEndpointAuthStep(endpointAuthDeps(deps)))
|
|
164
176
|
.addStep(newGuardReservedLabelsStep(deps.authorizer))
|
|
165
177
|
.addStep(newValidateDefaultEnabledToolsStep())
|
|
166
178
|
.addStep(newNormalizeReferencesStep())
|