@1mcp/agent 0.39.3 → 0.39.5
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/build/admin/assets/{admin-OAuthServicesWorkspace-BN-YviL_.js → admin-OAuthServicesWorkspace-BzrCR7Bi.js} +1 -1
- package/build/admin/assets/{admin-console-Cg5G_AjF.js → admin-console-BpUgmlrR.js} +3 -3
- package/build/admin/index.html +1 -1
- package/build/auth/sessionTypes.d.ts +6 -0
- package/build/auth/sessionTypes.d.ts.map +1 -1
- package/build/commands/serve/cooperativeRuntime.js +2 -2
- package/build/commands/serve/cooperativeRuntime.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.d.ts +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js +19 -11
- package/build/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.js.map +1 -1
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.d.ts +13 -5
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.d.ts.map +1 -1
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.js +95 -9
- package/build/sdk/legacy/transport/http/streamableSessionLifecycle.js.map +1 -1
- package/build/sdk/legacy/transport/stdioProxyTransport.d.ts.map +1 -1
- package/build/sdk/legacy/transport/stdioProxyTransport.js +5 -2
- package/build/sdk/legacy/transport/stdioProxyTransport.js.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/streamableHttpRoutes.js +31 -4
- package/build/transport/http/routes/streamableHttpRoutes.js.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.d.ts +2 -2
- package/build/transport/http/storage/streamableSessionRepository.d.ts.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.js +3 -1
- package/build/transport/http/storage/streamableSessionRepository.js.map +1 -1
- package/build/transport/http/streamableSessionAuthorization.d.ts +8 -0
- package/build/transport/http/streamableSessionAuthorization.d.ts.map +1 -0
- package/build/transport/http/streamableSessionAuthorization.js +38 -0
- package/build/transport/http/streamableSessionAuthorization.js.map +1 -0
- package/package.json +2 -2
package/build/admin/index.html
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
6
6
|
<link rel="icon" href="/admin/favicon.svg" type="image/svg+xml" />
|
|
7
7
|
<title>1MCP Admin Console</title>
|
|
8
|
-
<script type="module" crossorigin src="/admin/assets/admin-console-
|
|
8
|
+
<script type="module" crossorigin src="/admin/assets/admin-console-BpUgmlrR.js"></script>
|
|
9
9
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-rolldown-runtime-Bh1tDfsg.js">
|
|
10
10
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-react-BSaWeqgv.js">
|
|
11
11
|
<link rel="modulepreload" crossorigin href="/admin/assets/admin-mantine-xwbfu5Gd.js">
|
|
@@ -87,7 +87,13 @@ export interface InitializeResponseData {
|
|
|
87
87
|
version: string;
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
|
+
export interface StreamableSessionAuthorizationBinding {
|
|
91
|
+
clientId: string;
|
|
92
|
+
resource: string;
|
|
93
|
+
scopes: string[];
|
|
94
|
+
}
|
|
90
95
|
export interface StreamableSessionData extends ExpirableData {
|
|
96
|
+
authorizationBinding?: StreamableSessionAuthorizationBinding;
|
|
91
97
|
tags?: string[];
|
|
92
98
|
tagExpression?: string;
|
|
93
99
|
tagQuery?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionTypes.d.ts","sourceRoot":"","sources":["../../src/auth/sessionTypes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sessionTypes.d.ts","sourceRoot":"","sources":["../../src/auth/sessionTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -142,7 +142,7 @@ export async function launchCooperativeRuntime(options, prepared) {
|
|
|
142
142
|
defaultBackgroundLogFile(runtimeScope);
|
|
143
143
|
fs.mkdirSync(path.dirname(effective['log-file']), { recursive: true, mode: 0o700 });
|
|
144
144
|
const { command, baseArgs } = resolveSelfInvocation();
|
|
145
|
-
const child = spawn(command, [...baseArgs, 'serve', '--cooperative-bootstrap=supervisor', '--config', configFilePath], { detached: true, stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
|
|
145
|
+
const child = spawn(command, [...baseArgs, 'serve', '--cooperative-bootstrap=supervisor', '--config', configFilePath], { detached: true, windowsHide: true, stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
|
|
146
146
|
const bootstrap = {
|
|
147
147
|
type: 'runtime-bootstrap',
|
|
148
148
|
nonce: randomUUID(),
|
|
@@ -454,7 +454,7 @@ export async function runCooperativeSupervisor() {
|
|
|
454
454
|
nonce: randomUUID(),
|
|
455
455
|
claimId: ownership.record.claimId,
|
|
456
456
|
};
|
|
457
|
-
const child = spawn(cmd, [...args], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
|
|
457
|
+
const child = spawn(cmd, [...args], { windowsHide: true, stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
|
|
458
458
|
worker = child;
|
|
459
459
|
if (child.pid)
|
|
460
460
|
spawnedWorkerPids.add(child.pid);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cooperativeRuntime.js","sourceRoot":"","sources":["../../../src/commands/serve/cooperativeRuntime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cooperativeRuntime.js","sourceRoot":"","sources":["../../../src/commands/serve/cooperativeRuntime.ts"],"names":[],"mappings":"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"}
|
package/build/constants/mcp.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export declare const MCP_CONFIG_FILE = "mcp.json";
|
|
|
6
6
|
export declare const APP_CONFIG_FILE = "config.toml";
|
|
7
7
|
export declare const MCP_INSTRUCTIONS_TEMPLATE_FILE = "instructions-template.md";
|
|
8
8
|
export declare const MCP_SERVER_NAME = "1mcp";
|
|
9
|
-
export declare const MCP_SERVER_VERSION = "0.39.
|
|
9
|
+
export declare const MCP_SERVER_VERSION = "0.39.5";
|
|
10
10
|
export declare const MCP_PROJECT_METADATA: {
|
|
11
11
|
readonly repository: "https://github.com/1mcp-app/agent";
|
|
12
12
|
readonly documentation: "https://docs.1mcp.app";
|
package/build/constants/mcp.js
CHANGED
|
@@ -3,7 +3,7 @@ export const MCP_CONFIG_FILE = 'mcp.json';
|
|
|
3
3
|
export const APP_CONFIG_FILE = 'config.toml';
|
|
4
4
|
export const MCP_INSTRUCTIONS_TEMPLATE_FILE = 'instructions-template.md';
|
|
5
5
|
export const MCP_SERVER_NAME = '1mcp';
|
|
6
|
-
export const MCP_SERVER_VERSION = '0.39.
|
|
6
|
+
export const MCP_SERVER_VERSION = '0.39.5';
|
|
7
7
|
// Compiled with every artifact so Admin Console metadata does not depend on
|
|
8
8
|
// package.json being adjacent to the runtime entrypoint.
|
|
9
9
|
export const MCP_PROJECT_METADATA = {
|
|
@@ -57,7 +57,7 @@ export declare function revalidateAuthInfo(auth: AuthInfo | undefined): Promise<
|
|
|
57
57
|
* 2. Validates that requested tags are covered by granted scopes
|
|
58
58
|
* 3. Provides authentication context to downstream handlers
|
|
59
59
|
*
|
|
60
|
-
* When scope validation is disabled, all tags are allowed.
|
|
60
|
+
* When scope validation is disabled, all tags are allowed but authentication still applies.
|
|
61
61
|
* When scope validation is enabled:
|
|
62
62
|
* - If auth is also enabled, validates tokens and scopes
|
|
63
63
|
* - If auth is disabled, allows all tags (useful for development/testing)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAuthMiddleware.d.ts","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAEL,+BAA+B,EAChC,MAAM,wDAAwD,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"scopeAuthMiddleware.d.ts","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAGpE,OAAO,EAEL,+BAA+B,EAChC,MAAM,wDAAwD,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAIpF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,IAAI,CAAC,EAAE,WAAW,CAAC;SACpB;QAED,UAAU,QAAQ;YAChB,MAAM,EAAE,cAAc,CAAC;SACxB;KACF;CACF;AAED;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC7D,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,mDAAmD;IACnD,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,4CAA4C;IAC5C,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,sBAAsB;IACtB,aAAa,CAAC,EAAE,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC7D,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,6BAA6B;IAC7B,IAAI,CAAC,EAAE,QAAQ,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC;AAM3C,sGAAsG;AACtG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAE/E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,CAAC,EAAE,sBAAsB,UAO9D,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI,CAkJlE;AA6CD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,EAAE,CAaxD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,aAAa,GAAG,SAAS,CAOzE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,MAAM,CAW5F;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAO/D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,GAAG,SAAS,CAG/D;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAoB/D;+BA3RiB,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,IAAI;AA8RnE,wBAA2C"}
|
|
@@ -3,6 +3,7 @@ import { AgentConfigManager } from '../../../../../core/server/agentConfig.js';
|
|
|
3
3
|
import logger from '../../../../../logger/logger.js';
|
|
4
4
|
import { requireBearerAuth } from '../../../server/auth/middleware/bearerAuth.js';
|
|
5
5
|
import { registerRequestAuthRevalidator, revalidateLegacyRequestAuthInfo, } from '../../../server/auth/requestAuthRevalidation.js';
|
|
6
|
+
import { bindAuthenticatedSessionRequest } from '../../../../../transport/http/streamableSessionAuthorization.js';
|
|
6
7
|
import { auditScopeOperation, hasRequiredScopes, scopesToTags } from '../../../../../utils/validation/scopeValidation.js';
|
|
7
8
|
export { revalidateLegacyRequestAuthInfo };
|
|
8
9
|
function normalizedGrant(clientId, scopes) {
|
|
@@ -20,21 +21,15 @@ export function revalidateAuthInfo(auth) {
|
|
|
20
21
|
* 2. Validates that requested tags are covered by granted scopes
|
|
21
22
|
* 3. Provides authentication context to downstream handlers
|
|
22
23
|
*
|
|
23
|
-
* When scope validation is disabled, all tags are allowed.
|
|
24
|
+
* When scope validation is disabled, all tags are allowed but authentication still applies.
|
|
24
25
|
* When scope validation is enabled:
|
|
25
26
|
* - If auth is also enabled, validates tokens and scopes
|
|
26
27
|
* - If auth is disabled, allows all tags (useful for development/testing)
|
|
27
28
|
*/
|
|
28
29
|
export function createScopeAuthMiddleware(oauthProvider) {
|
|
29
30
|
const serverConfig = AgentConfigManager.getInstance();
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return (_req, res, next) => {
|
|
33
|
-
res.locals.validatedTags = getRequestedTagsForScope(res);
|
|
34
|
-
next();
|
|
35
|
-
};
|
|
36
|
-
}
|
|
37
|
-
// If scope validation is enabled but auth is disabled, allow all tags
|
|
31
|
+
const scopeValidation = serverConfig.get('features').scopeValidation;
|
|
32
|
+
// If auth is disabled, allow all tags
|
|
38
33
|
if (!serverConfig.get('features').auth) {
|
|
39
34
|
return (_req, res, next) => {
|
|
40
35
|
res.locals.validatedTags = getRequestedTagsForScope(res);
|
|
@@ -91,7 +86,7 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
91
86
|
const expressionTags = tagFilterMode === 'advanced' && tagExpression ? extractTagsFromExpression(tagExpression) : [];
|
|
92
87
|
const allRequestedTags = Array.from(new Set([...requestedTags, ...expressionTags]));
|
|
93
88
|
// Validate that all requested tags are covered by granted scopes
|
|
94
|
-
if (allRequestedTags.length > 0 && !hasRequiredScopes(grantedScopes, allRequestedTags)) {
|
|
89
|
+
if (scopeValidation && allRequestedTags.length > 0 && !hasRequiredScopes(grantedScopes, allRequestedTags)) {
|
|
95
90
|
auditScopeOperation('insufficient_scopes', {
|
|
96
91
|
clientId: authInfo.clientId,
|
|
97
92
|
requestedScopes: allRequestedTags.map((tag) => `tag:${tag}`),
|
|
@@ -133,9 +128,22 @@ export function createScopeAuthMiddleware(oauthProvider) {
|
|
|
133
128
|
registerRequestAuthRevalidator(authContext, revalidate);
|
|
134
129
|
registerRequestAuthRevalidator(authInfo, revalidate);
|
|
135
130
|
res.locals.auth = authContext;
|
|
131
|
+
bindAuthenticatedSessionRequest(req, {
|
|
132
|
+
clientId: authContext.clientId,
|
|
133
|
+
resource: expectedResource,
|
|
134
|
+
scopes: grantedScopes,
|
|
135
|
+
});
|
|
136
136
|
// Provide validated tags to downstream handlers
|
|
137
137
|
// If no specific tags requested, use all granted tags
|
|
138
|
-
|
|
138
|
+
if (!scopeValidation) {
|
|
139
|
+
res.locals.validatedTags = getRequestedTagsForScope(res);
|
|
140
|
+
}
|
|
141
|
+
else if (allRequestedTags.length > 0) {
|
|
142
|
+
res.locals.validatedTags = allRequestedTags;
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
res.locals.validatedTags = grantedTags;
|
|
146
|
+
}
|
|
139
147
|
auditScopeOperation('scope_validation_success', {
|
|
140
148
|
clientId: authInfo.clientId,
|
|
141
149
|
requestedScopes: allRequestedTags.map((tag) => `tag:${tag}`),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAuthMiddleware.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGrE,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sDAAsD,CAAC;AACzF,OAAO,EACL,8BAA8B,EAC9B,+BAA+B,GAChC,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAkDhH,OAAO,EAAE,+BAA+B,EAAE,CAAC;AAE3C,SAAS,eAAe,CAAC,QAAgB,EAAE,MAAgB;IACzD,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAC5G,CAAC;AAED,sGAAsG;AACtG,MAAM,UAAU,kBAAkB,CAAC,IAA0B;IAC3D,OAAO,+BAA+B,CAAC,IAAI,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,yBAAyB,CAAC,aAAsC;IAC9E,MAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;IAEtD,
|
|
1
|
+
{"version":3,"file":"scopeAuthMiddleware.js","sourceRoot":"","sources":["../../../../../../src/sdk/legacy/transport/http/middlewares/scopeAuthMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { InitializeResponseData } from '../../../../auth/sessionTypes.js';
|
|
1
|
+
import { InitializeResponseData, StreamableSessionAuthorizationBinding } from '../../../../auth/sessionTypes.js';
|
|
2
2
|
import { AsyncLoadingOrchestrator } from '../../../../core/capabilities/asyncLoadingOrchestrator.js';
|
|
3
3
|
import type { TemplateContextProof } from '../../../../core/context/templateContextTrust.js';
|
|
4
4
|
import { ServerManager } from '../../../../core/server/serverManager.js';
|
|
@@ -58,6 +58,7 @@ export interface StreamableSessionCreateData {
|
|
|
58
58
|
contextProof?: TemplateContextProof;
|
|
59
59
|
}
|
|
60
60
|
export interface ResolvePostSessionInput {
|
|
61
|
+
authorizationBinding?: StreamableSessionAuthorizationBinding | null;
|
|
61
62
|
sessionId?: string;
|
|
62
63
|
isInitializeRequest: boolean;
|
|
63
64
|
createSessionData: () => StreamableSessionCreateData;
|
|
@@ -71,19 +72,26 @@ export declare class StreamableSessionLifecycle {
|
|
|
71
72
|
private serverManager;
|
|
72
73
|
private sessionRepository;
|
|
73
74
|
private asyncOrchestrator?;
|
|
75
|
+
private readonly pendingSessionIds;
|
|
76
|
+
private readonly activeBindings;
|
|
74
77
|
private createTransportImpl;
|
|
75
78
|
private createRestorableTransportImpl;
|
|
76
79
|
private isStreamableTransportImpl;
|
|
77
80
|
constructor(serverManager: ServerManager, sessionRepository: StreamableSessionRepository, asyncOrchestrator?: AsyncLoadingOrchestrator | undefined, options?: StreamableSessionLifecycleOptions);
|
|
78
81
|
resolvePostSession(input: ResolvePostSessionInput): Promise<StreamablePostSessionResult>;
|
|
79
|
-
resolveExistingSession(sessionId: string): Promise<StreamableSessionLookupResult>;
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
82
|
+
resolveExistingSession(sessionId: string, authorizationBinding?: StreamableSessionAuthorizationBinding | null | undefined): Promise<StreamableSessionLookupResult>;
|
|
83
|
+
/** A verified local proof can admit a fresh signed identity, never replace a retained session. */
|
|
84
|
+
canInitializeSignedSession(sessionId: string, binding: StreamableSessionAuthorizationBinding | null | undefined, context?: Partial<ContextData>, proof?: TemplateContextProof): boolean;
|
|
85
|
+
/** Check ownership before project admission, without renewing or restoring a session. */
|
|
86
|
+
isSessionAuthorized(sessionId: string, authorizationBinding?: StreamableSessionAuthorizationBinding | null | undefined): boolean;
|
|
87
|
+
getSession(sessionId: string, authorizationBinding?: StreamableSessionAuthorizationBinding | null): Promise<StreamableTransport | null>;
|
|
88
|
+
restoreSession(sessionId: string, authorizationBinding?: StreamableSessionAuthorizationBinding | null | undefined): Promise<StreamableSessionRestoreResult>;
|
|
89
|
+
createSession(config: InboundConnectionConfig, context?: Partial<ContextData>, providedSessionId?: string, status?: StreamableSessionCreateResult['status'], contextProof?: TemplateContextProof, authorizationBinding?: StreamableSessionAuthorizationBinding | null | undefined): Promise<StreamableSessionCreateResult>;
|
|
83
90
|
storeInitializeResponse(sessionId: string, initializeResponse: InitializeResponseData): void;
|
|
84
91
|
handleAbnormalDisconnect(sessionId: string): Promise<void>;
|
|
85
92
|
completeExplicitDelete(sessionId: string): Promise<void>;
|
|
86
93
|
deleteSession(sessionId: string): Promise<void>;
|
|
94
|
+
private defaultAuthorizationBinding;
|
|
87
95
|
private initializeNotifications;
|
|
88
96
|
private setupTransportHandlers;
|
|
89
97
|
private setInitializedState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streamableSessionLifecycle.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/streamableSessionLifecycle.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"streamableSessionLifecycle.d.ts","sourceRoot":"","sources":["../../../../../src/sdk/legacy/transport/http/streamableSessionLifecycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import { AUTH_CONFIG } from '../../../../constants.js';
|
|
3
|
+
import { AgentConfigManager } from '../../../../core/server/agentConfig.js';
|
|
3
4
|
import logger from '../../../../logger/logger.js';
|
|
4
5
|
import { StreamableHTTPServerTransport } from '../../server/streamableHttp.js';
|
|
5
6
|
import { RestorableStreamableHTTPServerTransport } from '../../../../transport/http/restorableStreamableTransport.js';
|
|
7
|
+
import { canonicalSessionBinding, sessionBindingsMatch } from '../../../../transport/http/streamableSessionAuthorization.js';
|
|
8
|
+
import { isContextData } from '../../../../transport/http/utils/contextExtractor.js';
|
|
6
9
|
import { authorizeRequestTemplateContext } from '../../../../transport/http/utils/templateContextAuthority.js';
|
|
7
10
|
import { logError } from '../../../../transport/http/utils/unifiedLogger.js';
|
|
8
11
|
import { withCanonicalSessionId } from '../../../../utils/context/sessionIdentity.js';
|
|
@@ -59,6 +62,8 @@ export class StreamableSessionLifecycle {
|
|
|
59
62
|
serverManager;
|
|
60
63
|
sessionRepository;
|
|
61
64
|
asyncOrchestrator;
|
|
65
|
+
pendingSessionIds = new Set();
|
|
66
|
+
activeBindings = new WeakMap();
|
|
62
67
|
createTransportImpl;
|
|
63
68
|
createRestorableTransportImpl;
|
|
64
69
|
isStreamableTransportImpl;
|
|
@@ -79,6 +84,14 @@ export class StreamableSessionLifecycle {
|
|
|
79
84
|
this.isStreamableTransportImpl = options.isStreamableTransport ?? defaultIsStreamableTransport;
|
|
80
85
|
}
|
|
81
86
|
async resolvePostSession(input) {
|
|
87
|
+
const binding = input.authorizationBinding ?? this.defaultAuthorizationBinding();
|
|
88
|
+
if (binding === null) {
|
|
89
|
+
return {
|
|
90
|
+
status: StreamableSessionStatus.Missing,
|
|
91
|
+
sessionId: input.sessionId ?? '',
|
|
92
|
+
reason: StreamableSessionMissingReason.NotFound,
|
|
93
|
+
};
|
|
94
|
+
}
|
|
82
95
|
if (!input.sessionId) {
|
|
83
96
|
if (!input.isInitializeRequest) {
|
|
84
97
|
return {
|
|
@@ -88,12 +101,26 @@ export class StreamableSessionLifecycle {
|
|
|
88
101
|
};
|
|
89
102
|
}
|
|
90
103
|
const { config, context, contextProof } = input.createSessionData();
|
|
91
|
-
return this.createSession(config, context, undefined, StreamableSessionStatus.Created, contextProof);
|
|
104
|
+
return this.createSession(config, context, undefined, StreamableSessionStatus.Created, contextProof, binding);
|
|
92
105
|
}
|
|
93
|
-
const existing = await this.resolveExistingSession(input.sessionId);
|
|
106
|
+
const existing = await this.resolveExistingSession(input.sessionId, binding);
|
|
94
107
|
if (existing.status !== StreamableSessionStatus.Missing) {
|
|
95
108
|
return existing;
|
|
96
109
|
}
|
|
110
|
+
if (binding !== undefined) {
|
|
111
|
+
if (!input.isInitializeRequest)
|
|
112
|
+
return existing;
|
|
113
|
+
const { config, context, contextProof } = input.createSessionData();
|
|
114
|
+
if (!this.canInitializeSignedSession(input.sessionId, binding, context, contextProof))
|
|
115
|
+
return existing;
|
|
116
|
+
this.pendingSessionIds.add(input.sessionId);
|
|
117
|
+
try {
|
|
118
|
+
return await this.createSession(config, context, input.sessionId, StreamableSessionStatus.Created, contextProof, binding);
|
|
119
|
+
}
|
|
120
|
+
finally {
|
|
121
|
+
this.pendingSessionIds.delete(input.sessionId);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
97
124
|
if (!input.isInitializeRequest) {
|
|
98
125
|
return {
|
|
99
126
|
status: StreamableSessionStatus.Missing,
|
|
@@ -111,7 +138,7 @@ export class StreamableSessionLifecycle {
|
|
|
111
138
|
const { config, context, contextProof } = input.createSessionData();
|
|
112
139
|
return this.createSession(config, context, input.sessionId, StreamableSessionStatus.InitializeRecovered, contextProof);
|
|
113
140
|
}
|
|
114
|
-
async resolveExistingSession(sessionId) {
|
|
141
|
+
async resolveExistingSession(sessionId, authorizationBinding = this.defaultAuthorizationBinding()) {
|
|
115
142
|
if (!isValidSessionId(sessionId)) {
|
|
116
143
|
logger.debug('streamableSessionLifecycle.invalid.sessionid.provided.to.streamable.lifecycle.lookup.946c0da3');
|
|
117
144
|
return {
|
|
@@ -120,6 +147,9 @@ export class StreamableSessionLifecycle {
|
|
|
120
147
|
reason: StreamableSessionMissingReason.InvalidSession,
|
|
121
148
|
};
|
|
122
149
|
}
|
|
150
|
+
if (!this.isSessionAuthorized(sessionId, authorizationBinding)) {
|
|
151
|
+
return { status: StreamableSessionStatus.Missing, sessionId, reason: StreamableSessionMissingReason.NotFound };
|
|
152
|
+
}
|
|
123
153
|
const existingTransport = this.serverManager.getTransport(sessionId);
|
|
124
154
|
if (existingTransport) {
|
|
125
155
|
if (this.isStreamableTransportImpl(existingTransport)) {
|
|
@@ -132,7 +162,7 @@ export class StreamableSessionLifecycle {
|
|
|
132
162
|
reason: StreamableSessionMissingReason.WrongTransport,
|
|
133
163
|
};
|
|
134
164
|
}
|
|
135
|
-
const restoreResult = await this.restoreSession(sessionId);
|
|
165
|
+
const restoreResult = await this.restoreSession(sessionId, authorizationBinding);
|
|
136
166
|
if (restoreResult.transport) {
|
|
137
167
|
return { status: StreamableSessionStatus.Restored, sessionId, transport: restoreResult.transport };
|
|
138
168
|
}
|
|
@@ -146,17 +176,62 @@ export class StreamableSessionLifecycle {
|
|
|
146
176
|
restoreErrorType: restoreResult.errorType,
|
|
147
177
|
};
|
|
148
178
|
}
|
|
149
|
-
|
|
150
|
-
|
|
179
|
+
/** A verified local proof can admit a fresh signed identity, never replace a retained session. */
|
|
180
|
+
canInitializeSignedSession(sessionId, binding, context, proof) {
|
|
181
|
+
if (!canonicalSessionBinding(binding))
|
|
182
|
+
return false;
|
|
183
|
+
if (!proof)
|
|
184
|
+
return false;
|
|
185
|
+
if (!isContextData(context))
|
|
186
|
+
return false;
|
|
187
|
+
if (!isPersistableSessionId(sessionId))
|
|
188
|
+
return false;
|
|
189
|
+
const authorization = authorizeRequestTemplateContext({
|
|
190
|
+
context,
|
|
191
|
+
proof,
|
|
192
|
+
transportSessionId: sessionId,
|
|
193
|
+
source: 'meta',
|
|
194
|
+
});
|
|
195
|
+
if (authorization.status !== 'trusted')
|
|
196
|
+
return false;
|
|
197
|
+
if (authorization.provenance !== 'verified-local')
|
|
198
|
+
return false;
|
|
199
|
+
if (this.pendingSessionIds.has(sessionId))
|
|
200
|
+
return false;
|
|
201
|
+
if (this.serverManager.getTransport(sessionId))
|
|
202
|
+
return false;
|
|
203
|
+
return !this.sessionRepository.getSessionData(sessionId);
|
|
204
|
+
}
|
|
205
|
+
/** Check ownership before project admission, without renewing or restoring a session. */
|
|
206
|
+
isSessionAuthorized(sessionId, authorizationBinding = this.defaultAuthorizationBinding()) {
|
|
207
|
+
if (authorizationBinding === undefined)
|
|
208
|
+
return true;
|
|
209
|
+
if (authorizationBinding === null)
|
|
210
|
+
return false;
|
|
211
|
+
const transport = this.serverManager.getTransport(sessionId);
|
|
212
|
+
let stored;
|
|
213
|
+
if (transport && this.isStreamableTransportImpl(transport)) {
|
|
214
|
+
stored = this.activeBindings.get(transport);
|
|
215
|
+
}
|
|
216
|
+
stored ??= this.sessionRepository.getSessionData(sessionId)?.authorizationBinding;
|
|
217
|
+
return sessionBindingsMatch(stored, authorizationBinding);
|
|
218
|
+
}
|
|
219
|
+
async getSession(sessionId, authorizationBinding) {
|
|
220
|
+
const result = await this.resolveExistingSession(sessionId, authorizationBinding);
|
|
151
221
|
return result.status === StreamableSessionStatus.Missing ? null : result.transport;
|
|
152
222
|
}
|
|
153
|
-
async restoreSession(sessionId) {
|
|
223
|
+
async restoreSession(sessionId, authorizationBinding = this.defaultAuthorizationBinding()) {
|
|
154
224
|
try {
|
|
155
225
|
const sessionData = this.sessionRepository.getSessionData(sessionId);
|
|
156
226
|
if (!sessionData) {
|
|
157
227
|
logger.debug('streamableSessionLifecycle.no.persisted.session.found.for.1fd9955e');
|
|
158
228
|
return { transport: null, errorType: StreamableSessionRestoreErrorType.NotFound };
|
|
159
229
|
}
|
|
230
|
+
if (authorizationBinding !== undefined) {
|
|
231
|
+
if (!sessionBindingsMatch(sessionData.authorizationBinding, authorizationBinding)) {
|
|
232
|
+
return { transport: null, errorType: StreamableSessionRestoreErrorType.NotFound };
|
|
233
|
+
}
|
|
234
|
+
}
|
|
160
235
|
if (!sessionData.initializeResponse) {
|
|
161
236
|
logger.warn('streamableSessionLifecycle.session.exists.but.lacks.initialize.response.data.cannot.restore.01883ab6');
|
|
162
237
|
return {
|
|
@@ -176,6 +251,9 @@ export class StreamableSessionLifecycle {
|
|
|
176
251
|
}
|
|
177
252
|
logger.info('streamableSessionLifecycle.restoring.streamable.session.35290bd2');
|
|
178
253
|
const transport = this.createRestorableTransportImpl(sessionId);
|
|
254
|
+
const binding = canonicalSessionBinding(sessionData.authorizationBinding);
|
|
255
|
+
if (binding)
|
|
256
|
+
this.activeBindings.set(transport, binding);
|
|
179
257
|
const contextData = buildContextData(config, sessionId);
|
|
180
258
|
const authorization = contextData
|
|
181
259
|
? authorizeRequestTemplateContext({
|
|
@@ -226,11 +304,16 @@ export class StreamableSessionLifecycle {
|
|
|
226
304
|
return { transport: null, error: errorMessage, errorType: StreamableSessionRestoreErrorType.TransportFailed };
|
|
227
305
|
}
|
|
228
306
|
}
|
|
229
|
-
async createSession(config, context, providedSessionId, status = StreamableSessionStatus.Created, contextProof) {
|
|
307
|
+
async createSession(config, context, providedSessionId, status = StreamableSessionStatus.Created, contextProof, authorizationBinding = this.defaultAuthorizationBinding()) {
|
|
308
|
+
const binding = canonicalSessionBinding(authorizationBinding);
|
|
309
|
+
if (authorizationBinding !== undefined && !binding)
|
|
310
|
+
throw new Error('Session authorization required');
|
|
230
311
|
const sessionId = providedSessionId || AUTH_CONFIG.SERVER.STREAMABLE_SESSION.ID_PREFIX + randomUUID();
|
|
231
312
|
let transport;
|
|
232
313
|
try {
|
|
233
314
|
transport = this.createTransportImpl(sessionId);
|
|
315
|
+
if (binding)
|
|
316
|
+
this.activeBindings.set(transport, binding);
|
|
234
317
|
}
|
|
235
318
|
catch (error) {
|
|
236
319
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
@@ -260,7 +343,7 @@ export class StreamableSessionLifecycle {
|
|
|
260
343
|
let persisted = false;
|
|
261
344
|
let persistenceError;
|
|
262
345
|
try {
|
|
263
|
-
this.sessionRepository.create(sessionId, configWithContext);
|
|
346
|
+
this.sessionRepository.create(sessionId, configWithContext, ...(binding ? [binding] : []));
|
|
264
347
|
persisted = true;
|
|
265
348
|
}
|
|
266
349
|
catch (error) {
|
|
@@ -293,6 +376,9 @@ export class StreamableSessionLifecycle {
|
|
|
293
376
|
async deleteSession(sessionId) {
|
|
294
377
|
await this.completeExplicitDelete(sessionId);
|
|
295
378
|
}
|
|
379
|
+
defaultAuthorizationBinding() {
|
|
380
|
+
return AgentConfigManager.getInstance().get('features').auth ? null : undefined;
|
|
381
|
+
}
|
|
296
382
|
initializeNotifications(sessionId) {
|
|
297
383
|
if (!this.asyncOrchestrator) {
|
|
298
384
|
return;
|