@structured-world/gitlab-mcp 10.0.1 → 11.0.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 +6 -6
- package/README.md.in +1 -1
- package/dist/src/channel-gateway/format.js +7 -1
- package/dist/src/channel-gateway/format.js.map +1 -1
- package/dist/src/channel-gateway/forwarding.d.ts +3 -0
- package/dist/src/channel-gateway/forwarding.js +8 -1
- package/dist/src/channel-gateway/forwarding.js.map +1 -1
- package/dist/src/channel-gateway/gateway.d.ts +7 -0
- package/dist/src/channel-gateway/gateway.js +80 -16
- package/dist/src/channel-gateway/gateway.js.map +1 -1
- package/dist/src/cli/docker/container-runtime.d.ts +1 -0
- package/dist/src/cli/docker/container-runtime.js +37 -5
- package/dist/src/cli/docker/container-runtime.js.map +1 -1
- package/dist/src/cli/docker/docker-command.js +11 -2
- package/dist/src/cli/docker/docker-command.js.map +1 -1
- package/dist/src/cli/docker/docker-utils.d.ts +1 -0
- package/dist/src/cli/docker/docker-utils.js +137 -27
- package/dist/src/cli/docker/docker-utils.js.map +1 -1
- package/dist/src/cli/docker/oauth-issuer-prompt.d.ts +2 -0
- package/dist/src/cli/docker/oauth-issuer-prompt.js +47 -0
- package/dist/src/cli/docker/oauth-issuer-prompt.js.map +1 -0
- package/dist/src/cli/docker/types.d.ts +18 -4
- package/dist/src/cli/docker/types.js.map +1 -1
- package/dist/src/cli/list-tools.js +14 -35
- package/dist/src/cli/list-tools.js.map +1 -1
- package/dist/src/cli/setup/flows/server-setup.js +15 -0
- package/dist/src/cli/setup/flows/server-setup.js.map +1 -1
- package/dist/src/config/instances-loader.js +17 -3
- package/dist/src/config/instances-loader.js.map +1 -1
- package/dist/src/config/instances-schema.d.ts +6 -3
- package/dist/src/config/instances-schema.js +7 -6
- package/dist/src/config/instances-schema.js.map +1 -1
- package/dist/src/config.js.map +1 -1
- package/dist/src/configuration/caller.d.ts +10 -0
- package/dist/src/configuration/caller.js +39 -0
- package/dist/src/configuration/caller.js.map +1 -0
- package/dist/src/configuration/composed-feeds.d.ts +31 -0
- package/dist/src/configuration/composed-feeds.js +698 -0
- package/dist/src/configuration/composed-feeds.js.map +1 -0
- package/dist/src/configuration/composed-listings.d.ts +14 -0
- package/dist/src/configuration/composed-listings.js +157 -0
- package/dist/src/configuration/composed-listings.js.map +1 -0
- package/dist/src/configuration/groups.d.ts +8 -0
- package/dist/src/configuration/groups.js +39 -0
- package/dist/src/configuration/groups.js.map +1 -0
- package/dist/src/configuration/index.d.ts +6 -0
- package/dist/src/configuration/index.js +87 -0
- package/dist/src/configuration/index.js.map +1 -0
- package/dist/src/configuration/policy.d.ts +34 -0
- package/dist/src/configuration/policy.js +122 -0
- package/dist/src/configuration/policy.js.map +1 -0
- package/dist/src/configuration/scope-ids.d.ts +7 -0
- package/dist/src/configuration/scope-ids.js +78 -0
- package/dist/src/configuration/scope-ids.js.map +1 -0
- package/dist/src/configuration/scope-projects.d.ts +5 -0
- package/dist/src/configuration/scope-projects.js +76 -0
- package/dist/src/configuration/scope-projects.js.map +1 -0
- package/dist/src/configuration/scope-targets.d.ts +26 -0
- package/dist/src/configuration/scope-targets.js +307 -0
- package/dist/src/configuration/scope-targets.js.map +1 -0
- package/dist/src/configuration/scoped-execution.d.ts +6 -0
- package/dist/src/configuration/scoped-execution.js +577 -0
- package/dist/src/configuration/scoped-execution.js.map +1 -0
- package/dist/src/configuration/scoped-feeds.d.ts +22 -0
- package/dist/src/configuration/scoped-feeds.js +136 -0
- package/dist/src/configuration/scoped-feeds.js.map +1 -0
- package/dist/src/configuration/service.d.ts +53 -0
- package/dist/src/configuration/service.js +186 -0
- package/dist/src/configuration/service.js.map +1 -0
- package/dist/src/configuration/settings-store.d.ts +20 -0
- package/dist/src/configuration/settings-store.js +228 -0
- package/dist/src/configuration/settings-store.js.map +1 -0
- package/dist/src/configuration/types.d.ts +30 -0
- package/dist/src/configuration/types.js +20 -0
- package/dist/src/configuration/types.js.map +1 -0
- package/dist/src/contracts/storage.d.ts +2 -1
- package/dist/src/dashboard/html-template.js +8 -15
- package/dist/src/dashboard/html-template.js.map +1 -1
- package/dist/src/dashboard/metrics.d.ts +1 -1
- package/dist/src/entities/context/connection-check.d.ts +64 -0
- package/dist/src/entities/context/connection-check.js +117 -0
- package/dist/src/entities/context/connection-check.js.map +1 -0
- package/dist/src/entities/context/context-manager.d.ts +10 -22
- package/dist/src/entities/context/context-manager.js +108 -207
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/handlers.d.ts +3 -5
- package/dist/src/entities/context/handlers.js +2 -14
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/output-schema.d.ts +272 -0
- package/dist/src/entities/context/output-schema.js +182 -0
- package/dist/src/entities/context/output-schema.js.map +1 -0
- package/dist/src/entities/context/profile.d.ts +29 -0
- package/dist/src/entities/context/profile.js +72 -0
- package/dist/src/entities/context/profile.js.map +1 -0
- package/dist/src/entities/context/registry.js +140 -3
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +6 -14
- package/dist/src/entities/context/schema.js +6 -13
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/scope-search.d.ts +49 -0
- package/dist/src/entities/context/scope-search.js +71 -0
- package/dist/src/entities/context/scope-search.js.map +1 -0
- package/dist/src/entities/context/settings-panel.d.ts +13 -0
- package/dist/src/entities/context/settings-panel.js +508 -0
- package/dist/src/entities/context/settings-panel.js.map +1 -0
- package/dist/src/entities/context/settings.d.ts +78 -0
- package/dist/src/entities/context/settings.js +239 -0
- package/dist/src/entities/context/settings.js.map +1 -0
- package/dist/src/entities/context/types.d.ts +3 -4
- package/dist/src/entities/context/whoami.js +39 -31
- package/dist/src/entities/context/whoami.js.map +1 -1
- package/dist/src/entities/core/registry.js +34 -33
- package/dist/src/entities/core/registry.js.map +1 -1
- package/dist/src/entities/environments/schema-readonly.d.ts +3 -3
- package/dist/src/entities/files/registry.js +3 -2
- package/dist/src/entities/files/registry.js.map +1 -1
- package/dist/src/entities/iterations/registry.js +3 -2
- package/dist/src/entities/iterations/registry.js.map +1 -1
- package/dist/src/entities/mrs/registry.js +11 -5
- package/dist/src/entities/mrs/registry.js.map +1 -1
- package/dist/src/entities/mrs/schema-readonly.d.ts +8 -2
- package/dist/src/entities/mrs/schema-readonly.js +31 -3
- package/dist/src/entities/mrs/schema-readonly.js.map +1 -1
- package/dist/src/entities/pipelines/registry.js +3 -2
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/entities/pipelines/schema-readonly.d.ts +3 -3
- package/dist/src/entities/runners/project-access.d.ts +14 -0
- package/dist/src/entities/runners/project-access.js +64 -0
- package/dist/src/entities/runners/project-access.js.map +1 -0
- package/dist/src/entities/runners/registry.js +54 -26
- package/dist/src/entities/runners/registry.js.map +1 -1
- package/dist/src/entities/search/schema-readonly.d.ts +28 -28
- package/dist/src/graphql/runners.d.ts +26 -1
- package/dist/src/graphql/runners.js +43 -6
- package/dist/src/graphql/runners.js.map +1 -1
- package/dist/src/graphql/vulnerabilities.d.ts +3 -0
- package/dist/src/graphql/vulnerabilities.js +1 -0
- package/dist/src/graphql/vulnerabilities.js.map +1 -1
- package/dist/src/handlers.js +218 -142
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/logger.d.ts +3 -2
- package/dist/src/mcp-apps.d.ts +6 -0
- package/dist/src/mcp-apps.js +8 -0
- package/dist/src/mcp-apps.js.map +1 -0
- package/dist/src/middleware/mcp-auth-routes.d.ts +3 -0
- package/dist/src/middleware/mcp-auth-routes.js +9 -0
- package/dist/src/middleware/mcp-auth-routes.js.map +1 -0
- package/dist/src/middleware/oauth-auth.js +83 -23
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/middleware/rate-limiter.js +11 -10
- package/dist/src/middleware/rate-limiter.js.map +1 -1
- package/dist/src/oauth/authorization-response.d.ts +1 -0
- package/dist/src/oauth/authorization-response.js +14 -0
- package/dist/src/oauth/authorization-response.js.map +1 -0
- package/dist/src/oauth/client-auth.d.ts +16 -0
- package/dist/src/oauth/client-auth.js +73 -0
- package/dist/src/oauth/client-auth.js.map +1 -0
- package/dist/src/oauth/config.d.ts +2 -0
- package/dist/src/oauth/config.js +37 -0
- package/dist/src/oauth/config.js.map +1 -1
- package/dist/src/oauth/endpoints/authorize.d.ts +1 -0
- package/dist/src/oauth/endpoints/authorize.js +361 -102
- package/dist/src/oauth/endpoints/authorize.js.map +1 -1
- package/dist/src/oauth/endpoints/callback.js +78 -41
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/index.d.ts +1 -0
- package/dist/src/oauth/endpoints/index.js +3 -1
- package/dist/src/oauth/endpoints/index.js.map +1 -1
- package/dist/src/oauth/endpoints/metadata.d.ts +1 -1
- package/dist/src/oauth/endpoints/metadata.js +23 -8
- package/dist/src/oauth/endpoints/metadata.js.map +1 -1
- package/dist/src/oauth/endpoints/register.d.ts +3 -2
- package/dist/src/oauth/endpoints/register.js +70 -19
- package/dist/src/oauth/endpoints/register.js.map +1 -1
- package/dist/src/oauth/endpoints/revoke.d.ts +2 -0
- package/dist/src/oauth/endpoints/revoke.js +97 -0
- package/dist/src/oauth/endpoints/revoke.js.map +1 -0
- package/dist/src/oauth/endpoints/token.js +136 -62
- package/dist/src/oauth/endpoints/token.js.map +1 -1
- package/dist/src/oauth/gitlab-device-flow.d.ts +27 -8
- package/dist/src/oauth/gitlab-device-flow.js +119 -57
- package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
- package/dist/src/oauth/gitlab-request-bound.d.ts +1 -0
- package/dist/src/oauth/gitlab-request-bound.js +6 -0
- package/dist/src/oauth/gitlab-request-bound.js.map +1 -0
- package/dist/src/oauth/gitlab-token-refresh.d.ts +6 -0
- package/dist/src/oauth/gitlab-token-refresh.js +130 -0
- package/dist/src/oauth/gitlab-token-refresh.js.map +1 -0
- package/dist/src/oauth/granted-scopes.d.ts +1 -0
- package/dist/src/oauth/granted-scopes.js +7 -0
- package/dist/src/oauth/granted-scopes.js.map +1 -0
- package/dist/src/oauth/index.d.ts +2 -2
- package/dist/src/oauth/index.js +4 -2
- package/dist/src/oauth/index.js.map +1 -1
- package/dist/src/oauth/instance-app.d.ts +4 -0
- package/dist/src/oauth/instance-app.js +45 -0
- package/dist/src/oauth/instance-app.js.map +1 -0
- package/dist/src/oauth/issued-tokens.d.ts +1 -0
- package/dist/src/oauth/issued-tokens.js +24 -0
- package/dist/src/oauth/issued-tokens.js.map +1 -0
- package/dist/src/oauth/oauth-app.d.ts +9 -0
- package/dist/src/oauth/oauth-app.js +14 -0
- package/dist/src/oauth/oauth-app.js.map +1 -0
- package/dist/src/oauth/request-params.d.ts +1 -0
- package/dist/src/oauth/request-params.js +17 -0
- package/dist/src/oauth/request-params.js.map +1 -0
- package/dist/src/oauth/resource.d.ts +12 -0
- package/dist/src/oauth/resource.js +66 -0
- package/dist/src/oauth/resource.js.map +1 -0
- package/dist/src/oauth/routes.d.ts +2 -0
- package/dist/src/oauth/routes.js +31 -0
- package/dist/src/oauth/routes.js.map +1 -0
- package/dist/src/oauth/session-store.d.ts +44 -36
- package/dist/src/oauth/session-store.js +125 -253
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/factory.js +1 -1
- package/dist/src/oauth/storage/factory.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +23 -1
- package/dist/src/oauth/storage/file.js +168 -36
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.d.ts +23 -1
- package/dist/src/oauth/storage/memory.js +120 -22
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +17 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/oauth/tool-auth.d.ts +12 -0
- package/dist/src/oauth/tool-auth.js +108 -0
- package/dist/src/oauth/tool-auth.js.map +1 -0
- package/dist/src/oauth/types.d.ts +30 -0
- package/dist/src/profiles/scope-enforcer.d.ts +8 -0
- package/dist/src/profiles/scope-enforcer.js +86 -24
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/profiles/types.js +4 -1
- package/dist/src/profiles/types.js.map +1 -1
- package/dist/src/registry-manager.d.ts +16 -4
- package/dist/src/registry-manager.js +115 -33
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +66 -39
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +2 -1
- package/dist/src/services/ConnectionManager.js +26 -19
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.d.ts +5 -1
- package/dist/src/services/TokenScopeDetector.js +19 -0
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/session-manager.d.ts +3 -1
- package/dist/src/session-manager.js +35 -10
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/types.d.ts +3 -2
- package/dist/src/types.js.map +1 -1
- package/dist/src/utils/bounded-map.d.ts +1 -0
- package/dist/src/utils/bounded-map.js +23 -0
- package/dist/src/utils/bounded-map.js.map +1 -0
- package/dist/src/utils/fetch.d.ts +0 -1
- package/dist/src/utils/fetch.js +2 -12
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/gitlab-api.js +2 -1
- package/dist/src/utils/gitlab-api.js.map +1 -1
- package/dist/src/utils/gitlab-base-url.d.ts +2 -0
- package/dist/src/utils/gitlab-base-url.js +30 -0
- package/dist/src/utils/gitlab-base-url.js.map +1 -0
- package/dist/src/utils/html.d.ts +1 -0
- package/dist/src/utils/html.js +12 -0
- package/dist/src/utils/html.js.map +1 -0
- package/dist/src/utils/namespace.d.ts +1 -0
- package/dist/src/utils/namespace.js +72 -24
- package/dist/src/utils/namespace.js.map +1 -1
- package/dist/src/utils/schema-utils.d.ts +5 -3
- package/dist/src/utils/schema-utils.js +50 -22
- package/dist/src/utils/schema-utils.js.map +1 -1
- package/dist/src/utils/smart-user-search.js +2 -1
- package/dist/src/utils/smart-user-search.js.map +1 -1
- package/dist/src/utils/sync-directory.d.ts +1 -0
- package/dist/src/utils/sync-directory.js +49 -0
- package/dist/src/utils/sync-directory.js.map +1 -0
- package/dist/src/utils/tool-result.d.ts +4 -0
- package/dist/src/utils/tool-result.js +41 -0
- package/dist/src/utils/tool-result.js.map +1 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +65 -18
- package/skills/gitlab-ci/SKILL.md +16 -0
- package/skills/gitlab-discovery/SKILL.md +15 -0
- package/skills/gitlab-review/SKILL.md +16 -0
- package/skills/gitlab-setup/SKILL.md +16 -0
- package/skills/gitlab-work-items/SKILL.md +16 -0
package/dist/src/oauth/config.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConfigurationError = void 0;
|
|
4
|
+
exports.issuerValidationError = issuerValidationError;
|
|
4
5
|
exports.loadOAuthConfig = loadOAuthConfig;
|
|
5
6
|
exports.validateStaticConfig = validateStaticConfig;
|
|
6
7
|
exports.isOAuthEnabled = isOAuthEnabled;
|
|
@@ -10,8 +11,43 @@ exports.isStaticTokenConfigured = isStaticTokenConfigured;
|
|
|
10
11
|
exports.isAuthenticationConfigured = isAuthenticationConfigured;
|
|
11
12
|
const zod_1 = require("zod");
|
|
12
13
|
const logger_1 = require("../logger");
|
|
14
|
+
const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '[::1]']);
|
|
15
|
+
const IssuerSchema = zod_1.z
|
|
16
|
+
.string({ error: 'OAUTH_ISSUER is required (the public URL clients connect to)' })
|
|
17
|
+
.transform((value, ctx) => {
|
|
18
|
+
let url;
|
|
19
|
+
try {
|
|
20
|
+
url = new URL(value);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
ctx.addIssue({ code: 'custom', message: 'OAUTH_ISSUER must be an absolute URL' });
|
|
24
|
+
return zod_1.z.NEVER;
|
|
25
|
+
}
|
|
26
|
+
if (url.search || url.hash || url.username || url.password) {
|
|
27
|
+
ctx.addIssue({
|
|
28
|
+
code: 'custom',
|
|
29
|
+
message: 'OAUTH_ISSUER must not contain credentials, a query or a fragment',
|
|
30
|
+
});
|
|
31
|
+
return zod_1.z.NEVER;
|
|
32
|
+
}
|
|
33
|
+
if (url.protocol !== 'https:' &&
|
|
34
|
+
!(url.protocol === 'http:' && LOOPBACK_HOSTS.has(url.hostname))) {
|
|
35
|
+
ctx.addIssue({
|
|
36
|
+
code: 'custom',
|
|
37
|
+
message: 'OAUTH_ISSUER must use https (http is allowed only for localhost)',
|
|
38
|
+
});
|
|
39
|
+
return zod_1.z.NEVER;
|
|
40
|
+
}
|
|
41
|
+
const path = url.pathname.endsWith('/') ? url.pathname.slice(0, -1) : url.pathname;
|
|
42
|
+
return `${url.origin}${path}`;
|
|
43
|
+
});
|
|
44
|
+
function issuerValidationError(value) {
|
|
45
|
+
const parsed = IssuerSchema.safeParse(value);
|
|
46
|
+
return parsed.success ? undefined : parsed.error.issues[0]?.message;
|
|
47
|
+
}
|
|
13
48
|
const OAuthConfigSchema = zod_1.z.object({
|
|
14
49
|
enabled: zod_1.z.literal(true),
|
|
50
|
+
issuer: IssuerSchema,
|
|
15
51
|
sessionSecret: zod_1.z.string().min(32, 'OAUTH_SESSION_SECRET must be at least 32 characters'),
|
|
16
52
|
gitlabClientId: zod_1.z.string().min(1, 'OAUTH_CLIENT_ID is required'),
|
|
17
53
|
gitlabClientSecret: zod_1.z.string().optional(),
|
|
@@ -33,6 +69,7 @@ function loadOAuthConfig() {
|
|
|
33
69
|
}
|
|
34
70
|
const result = OAuthConfigSchema.safeParse({
|
|
35
71
|
enabled: true,
|
|
72
|
+
issuer: process.env.OAUTH_ISSUER,
|
|
36
73
|
sessionSecret: process.env.OAUTH_SESSION_SECRET,
|
|
37
74
|
gitlabClientId: process.env.OAUTH_CLIENT_ID,
|
|
38
75
|
gitlabClientSecret: process.env.OAUTH_CLIENT_SECRET,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/oauth/config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/oauth/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
2
|
export declare function authorizeHandler(req: Request, res: Response): Promise<void>;
|
|
3
3
|
export declare function pollHandler(req: Request, res: Response): Promise<void>;
|
|
4
|
+
export declare function discardCompletion(sessionId: string, code: string): Promise<void>;
|
|
@@ -2,70 +2,193 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.authorizeHandler = authorizeHandler;
|
|
4
4
|
exports.pollHandler = pollHandler;
|
|
5
|
+
exports.discardCompletion = discardCompletion;
|
|
5
6
|
const config_1 = require("../config");
|
|
6
7
|
const session_store_1 = require("../session-store");
|
|
8
|
+
const issued_tokens_1 = require("../issued-tokens");
|
|
7
9
|
const gitlab_device_flow_1 = require("../gitlab-device-flow");
|
|
8
10
|
const token_utils_1 = require("../token-utils");
|
|
9
|
-
const metadata_1 = require("./metadata");
|
|
10
11
|
const config_2 = require("../../config");
|
|
11
12
|
const logger_1 = require("../../logger");
|
|
12
13
|
const request_logger_1 = require("../../utils/request-logger");
|
|
14
|
+
const granted_scopes_1 = require("../granted-scopes");
|
|
15
|
+
const register_1 = require("./register");
|
|
16
|
+
const resource_1 = require("../resource");
|
|
17
|
+
const authorization_response_1 = require("../authorization-response");
|
|
18
|
+
const instance_app_1 = require("../instance-app");
|
|
19
|
+
const url_1 = require("../../utils/url");
|
|
20
|
+
const html_1 = require("../../utils/html");
|
|
21
|
+
const gitlab_request_bound_1 = require("../gitlab-request-bound");
|
|
22
|
+
const SINGLE_VALUED_PARAMS = [
|
|
23
|
+
'response_type',
|
|
24
|
+
'client_id',
|
|
25
|
+
'redirect_uri',
|
|
26
|
+
'state',
|
|
27
|
+
'code_challenge',
|
|
28
|
+
'code_challenge_method',
|
|
29
|
+
'scope',
|
|
30
|
+
'instance',
|
|
31
|
+
];
|
|
32
|
+
function rejection(status, error, description, redirectable = false) {
|
|
33
|
+
return { rejected: true, status, error, description, redirectable };
|
|
34
|
+
}
|
|
35
|
+
function isRejection(value) {
|
|
36
|
+
return typeof value === 'object' && value !== null && 'rejected' in value;
|
|
37
|
+
}
|
|
38
|
+
function singleValuedParams(query) {
|
|
39
|
+
const params = {};
|
|
40
|
+
for (const name of SINGLE_VALUED_PARAMS) {
|
|
41
|
+
const value = query[name];
|
|
42
|
+
if (value === undefined)
|
|
43
|
+
continue;
|
|
44
|
+
if (typeof value !== 'string') {
|
|
45
|
+
return rejection(400, 'invalid_request', `${name} must not be repeated`);
|
|
46
|
+
}
|
|
47
|
+
params[name] = value;
|
|
48
|
+
}
|
|
49
|
+
return params;
|
|
50
|
+
}
|
|
51
|
+
function requiredParams(params) {
|
|
52
|
+
if (params.response_type !== 'code') {
|
|
53
|
+
return rejection(400, 'unsupported_response_type', 'Only "code" response type is supported');
|
|
54
|
+
}
|
|
55
|
+
if (!params.client_id)
|
|
56
|
+
return rejection(400, 'invalid_request', 'client_id is required');
|
|
57
|
+
if (!params.code_challenge) {
|
|
58
|
+
return rejection(400, 'invalid_request', 'code_challenge is required (PKCE)');
|
|
59
|
+
}
|
|
60
|
+
if (params.code_challenge_method !== 'S256') {
|
|
61
|
+
return rejection(400, 'invalid_request', 'code_challenge_method must be "S256"');
|
|
62
|
+
}
|
|
63
|
+
return { clientId: params.client_id, codeChallenge: params.code_challenge };
|
|
64
|
+
}
|
|
65
|
+
async function registeredRedirectUri(clientId, requested) {
|
|
66
|
+
if (!requested)
|
|
67
|
+
return undefined;
|
|
68
|
+
let client;
|
|
69
|
+
try {
|
|
70
|
+
client = await (0, register_1.getRegisteredClient)(clientId);
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
(0, logger_1.logError)('Failed to read client registration', { err: error });
|
|
74
|
+
return rejection(500, 'server_error', 'Failed to start authorization');
|
|
75
|
+
}
|
|
76
|
+
if (!client) {
|
|
77
|
+
return rejection(400, 'invalid_request', 'Unknown client_id; register the client via /register');
|
|
78
|
+
}
|
|
79
|
+
return (client.redirect_uris.find((registered) => registered === requested) ??
|
|
80
|
+
rejection(400, 'invalid_request', 'redirect_uri is not registered for this client'));
|
|
81
|
+
}
|
|
82
|
+
function requestedResource(issuer, value) {
|
|
83
|
+
const resource = (0, resource_1.resourceParameter)(issuer, value);
|
|
84
|
+
return resource === null
|
|
85
|
+
? rejection(400, 'invalid_target', 'resource must name this MCP server', true)
|
|
86
|
+
: resource;
|
|
87
|
+
}
|
|
88
|
+
function requestedApp(apps, requestedInstance) {
|
|
89
|
+
const wanted = requestedInstance === undefined ? undefined : (0, url_1.normalizeInstanceUrl)(requestedInstance);
|
|
90
|
+
const app = wanted === undefined ? apps[0] : apps.find((candidate) => candidate.baseUrl === wanted);
|
|
91
|
+
return (app ?? rejection(400, 'invalid_request', 'instance is not a configured GitLab instance', true));
|
|
92
|
+
}
|
|
13
93
|
async function authorizeHandler(req, res) {
|
|
14
94
|
const config = (0, config_1.loadOAuthConfig)();
|
|
15
95
|
if (!config) {
|
|
16
96
|
sendError(req, res, 500, 'server_error', 'OAuth not configured');
|
|
17
97
|
return;
|
|
18
98
|
}
|
|
19
|
-
const
|
|
20
|
-
if (
|
|
21
|
-
|
|
99
|
+
const params = singleValuedParams(req.query);
|
|
100
|
+
if (isRejection(params)) {
|
|
101
|
+
sendRejection(req, res, params);
|
|
22
102
|
return;
|
|
23
103
|
}
|
|
24
|
-
|
|
25
|
-
|
|
104
|
+
const required = requiredParams(params);
|
|
105
|
+
if (isRejection(required)) {
|
|
106
|
+
sendRejection(req, res, required);
|
|
26
107
|
return;
|
|
27
108
|
}
|
|
28
|
-
|
|
29
|
-
|
|
109
|
+
const redirectUri = await registeredRedirectUri(required.clientId, params.redirect_uri);
|
|
110
|
+
if (isRejection(redirectUri)) {
|
|
111
|
+
sendRejection(req, res, redirectUri);
|
|
30
112
|
return;
|
|
31
113
|
}
|
|
32
|
-
|
|
33
|
-
|
|
114
|
+
const refuse = (refusal) => {
|
|
115
|
+
if (refusal.redirectable && redirectUri) {
|
|
116
|
+
res.redirect((0, authorization_response_1.authorizationRedirect)(redirectUri, config.issuer, {
|
|
117
|
+
error: refusal.error,
|
|
118
|
+
error_description: refusal.description,
|
|
119
|
+
state: params.state,
|
|
120
|
+
}));
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
sendRejection(req, res, refusal);
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
const resource = requestedResource(config.issuer, req.query.resource);
|
|
127
|
+
if (isRejection(resource)) {
|
|
128
|
+
refuse(resource);
|
|
34
129
|
return;
|
|
35
130
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
131
|
+
const scopes = (0, resource_1.grantedMcpScopes)(params.scope);
|
|
132
|
+
const apps = await (0, instance_app_1.selectableOAuthApps)(config);
|
|
133
|
+
if (params.instance === undefined && apps.length > 1) {
|
|
134
|
+
res.setHeader('Content-Type', 'text/html');
|
|
135
|
+
res.send(getInstanceChooserHTML(config.issuer, req.query, apps));
|
|
136
|
+
return;
|
|
137
|
+
}
|
|
138
|
+
const app = requestedApp(apps, params.instance);
|
|
139
|
+
if (isRejection(app)) {
|
|
140
|
+
refuse(app);
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
const flow = {
|
|
144
|
+
clientId: required.clientId,
|
|
145
|
+
state: params.state ?? '',
|
|
146
|
+
codeChallenge: required.codeChallenge,
|
|
147
|
+
codeChallengeMethod: 'S256',
|
|
148
|
+
scopes,
|
|
149
|
+
resource,
|
|
150
|
+
app,
|
|
151
|
+
};
|
|
152
|
+
if (redirectUri) {
|
|
153
|
+
await handleAuthorizationCodeFlow(req, res, config, { ...flow, redirectUri });
|
|
44
154
|
}
|
|
45
155
|
else {
|
|
46
|
-
await handleDeviceFlow(req, res, config,
|
|
47
|
-
clientId: client_id,
|
|
48
|
-
state: state ?? '',
|
|
49
|
-
codeChallenge: code_challenge,
|
|
50
|
-
codeChallengeMethod: code_challenge_method,
|
|
51
|
-
});
|
|
156
|
+
await handleDeviceFlow(req, res, config, flow);
|
|
52
157
|
}
|
|
53
158
|
}
|
|
159
|
+
function sendRejection(req, res, refusal) {
|
|
160
|
+
sendError(req, res, refusal.status, refusal.error, refusal.description);
|
|
161
|
+
}
|
|
54
162
|
async function handleAuthorizationCodeFlow(req, res, config, params) {
|
|
55
|
-
const
|
|
56
|
-
const callbackUri = `${baseUrl}/oauth/callback`;
|
|
163
|
+
const callbackUri = `${config.issuer}/oauth/callback`;
|
|
57
164
|
const internalState = (0, token_utils_1.generateRandomString)(32);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
165
|
+
try {
|
|
166
|
+
await session_store_1.sessionStore.storeAuthCodeFlow(internalState, {
|
|
167
|
+
requestedGitlabScopes: params.app.scopes.split(/[,\s]+/).filter(Boolean),
|
|
168
|
+
selectedInstance: params.app.baseUrl,
|
|
169
|
+
selectedInstanceLabel: params.app.label,
|
|
170
|
+
clientId: params.clientId,
|
|
171
|
+
codeChallenge: params.codeChallenge,
|
|
172
|
+
codeChallengeMethod: params.codeChallengeMethod,
|
|
173
|
+
clientState: params.state,
|
|
174
|
+
internalState: internalState,
|
|
175
|
+
clientRedirectUri: params.redirectUri,
|
|
176
|
+
callbackUri: callbackUri,
|
|
177
|
+
expiresAt: Date.now() + 10 * 60 * 1000,
|
|
178
|
+
scopes: params.scopes,
|
|
179
|
+
resource: params.resource,
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
catch (error) {
|
|
183
|
+
(0, logger_1.logError)('Failed to store authorization flow', { err: error });
|
|
184
|
+
res.redirect((0, authorization_response_1.authorizationRedirect)(params.redirectUri, config.issuer, {
|
|
185
|
+
error: 'temporarily_unavailable',
|
|
186
|
+
error_description: 'Authorization could not be started; try again',
|
|
187
|
+
state: params.state,
|
|
188
|
+
}));
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
191
|
+
const gitlabAuthUrl = (0, gitlab_device_flow_1.buildGitLabAuthUrl)(config, callbackUri, internalState, params.app);
|
|
69
192
|
(0, logger_1.logInfo)('Authorization Code Flow initiated, redirecting to GitLab', {
|
|
70
193
|
internalState: (0, logger_1.truncateId)(internalState),
|
|
71
194
|
clientRedirectUri: params.redirectUri,
|
|
@@ -74,38 +197,52 @@ async function handleAuthorizationCodeFlow(req, res, config, params) {
|
|
|
74
197
|
}
|
|
75
198
|
async function handleDeviceFlow(req, res, config, params) {
|
|
76
199
|
try {
|
|
77
|
-
const deviceResponse = await (0, gitlab_device_flow_1.initiateDeviceFlow)(config);
|
|
200
|
+
const deviceResponse = await (0, gitlab_device_flow_1.initiateDeviceFlow)(config, params.app);
|
|
78
201
|
const flowState = (0, token_utils_1.generateRandomString)(32);
|
|
79
|
-
|
|
202
|
+
const interval = Math.max(deviceResponse.interval, config.devicePollInterval);
|
|
203
|
+
const lifetime = Math.min(deviceResponse.expires_in, config.deviceTimeout);
|
|
204
|
+
const startedAt = Date.now();
|
|
205
|
+
await session_store_1.sessionStore.storeDeviceFlow(flowState, {
|
|
206
|
+
requestedGitlabScopes: params.app.scopes.split(/[,\s]+/).filter(Boolean),
|
|
207
|
+
selectedInstance: params.app.baseUrl,
|
|
208
|
+
selectedInstanceLabel: params.app.label,
|
|
80
209
|
deviceCode: deviceResponse.device_code,
|
|
81
210
|
userCode: deviceResponse.user_code,
|
|
82
211
|
verificationUri: deviceResponse.verification_uri,
|
|
83
212
|
verificationUriComplete: deviceResponse.verification_uri_complete,
|
|
84
|
-
expiresAt:
|
|
85
|
-
interval
|
|
213
|
+
expiresAt: startedAt + lifetime * 1000,
|
|
214
|
+
interval,
|
|
215
|
+
nextPollAt: startedAt + interval * 1000,
|
|
86
216
|
clientId: params.clientId,
|
|
87
217
|
codeChallenge: params.codeChallenge,
|
|
88
218
|
codeChallengeMethod: params.codeChallengeMethod,
|
|
89
219
|
state: params.state,
|
|
90
220
|
redirectUri: undefined,
|
|
221
|
+
scopes: params.scopes,
|
|
222
|
+
resource: params.resource,
|
|
91
223
|
});
|
|
92
224
|
(0, logger_1.logInfo)('Device flow initiated for authorization', {
|
|
93
225
|
flowState: (0, logger_1.truncateId)(flowState),
|
|
94
226
|
userCode: deviceResponse.user_code,
|
|
95
227
|
});
|
|
96
|
-
const baseUrl = (0, metadata_1.getBaseUrl)(req);
|
|
97
228
|
const html = getDeviceFlowHTML({
|
|
98
229
|
userCode: deviceResponse.user_code,
|
|
99
230
|
verificationUri: deviceResponse.verification_uri,
|
|
100
231
|
verificationUriComplete: deviceResponse.verification_uri_complete,
|
|
101
232
|
flowState,
|
|
102
|
-
pollUrl: `${
|
|
103
|
-
expiresIn:
|
|
233
|
+
pollUrl: `${config.issuer}/oauth/poll`,
|
|
234
|
+
expiresIn: lifetime,
|
|
235
|
+
interval,
|
|
104
236
|
});
|
|
105
237
|
res.setHeader('Content-Type', 'text/html');
|
|
106
238
|
res.send(html);
|
|
107
239
|
}
|
|
108
240
|
catch (error) {
|
|
241
|
+
if (error instanceof gitlab_device_flow_1.GitLabOAuthHttpError && error.status === 404) {
|
|
242
|
+
sendError(req, res, 400, 'invalid_request', 'This GitLab instance does not support device authorization (GitLab 17.3 or later); ' +
|
|
243
|
+
'authorize with a redirect_uri instead');
|
|
244
|
+
return;
|
|
245
|
+
}
|
|
109
246
|
(0, logger_1.logError)('Failed to initiate device flow', { err: error });
|
|
110
247
|
sendError(req, res, 500, 'server_error', 'Failed to initiate authentication');
|
|
111
248
|
}
|
|
@@ -116,83 +253,198 @@ async function pollHandler(req, res) {
|
|
|
116
253
|
res.status(500).json({ error: 'server_error' });
|
|
117
254
|
return;
|
|
118
255
|
}
|
|
119
|
-
const
|
|
256
|
+
const flow_state = typeof req.query.flow_state === 'string' ? req.query.flow_state : undefined;
|
|
120
257
|
if (!flow_state) {
|
|
121
258
|
res.status(400).json({ status: 'failed', error: 'Missing flow_state' });
|
|
122
259
|
return;
|
|
123
260
|
}
|
|
124
|
-
|
|
261
|
+
let flow;
|
|
262
|
+
try {
|
|
263
|
+
flow = await session_store_1.sessionStore.getDeviceFlow(flow_state);
|
|
264
|
+
}
|
|
265
|
+
catch (error) {
|
|
266
|
+
(0, logger_1.logWarn)('Device flow lookup failed', { err: error });
|
|
267
|
+
res.status(503).json({ status: 'pending' });
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
125
270
|
if (!flow) {
|
|
126
271
|
res.status(400).json({ status: 'expired', error: 'Flow not found' });
|
|
127
272
|
return;
|
|
128
273
|
}
|
|
129
274
|
if (Date.now() > flow.expiresAt) {
|
|
130
|
-
session_store_1.sessionStore.deleteDeviceFlow(flow_state);
|
|
275
|
+
await session_store_1.sessionStore.deleteDeviceFlow(flow_state);
|
|
131
276
|
res.status(400).json({ status: 'expired', error: 'Device code expired' });
|
|
132
277
|
return;
|
|
133
278
|
}
|
|
279
|
+
const app = await (0, instance_app_1.oauthAppFor)(config, flow.selectedInstance);
|
|
280
|
+
if (!app) {
|
|
281
|
+
await session_store_1.sessionStore.deleteDeviceFlow(flow_state);
|
|
282
|
+
res.json({ status: 'failed', error: 'GitLab instance is no longer configured' });
|
|
283
|
+
return;
|
|
284
|
+
}
|
|
285
|
+
const now = Date.now();
|
|
286
|
+
const reservedUntil = now + Math.max(flow.interval * 1000, gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS);
|
|
287
|
+
const claimed = await session_store_1.sessionStore.claimDevicePoll(flow_state, now, reservedUntil);
|
|
288
|
+
if (!claimed) {
|
|
289
|
+
res.json({ status: 'pending', interval: flow.interval });
|
|
290
|
+
return;
|
|
291
|
+
}
|
|
134
292
|
try {
|
|
135
|
-
const
|
|
136
|
-
if (
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
const now = Date.now();
|
|
140
|
-
const authCode = (0, token_utils_1.generateAuthorizationCode)();
|
|
141
|
-
session_store_1.sessionStore.storeAuthCode({
|
|
142
|
-
code: authCode,
|
|
143
|
-
sessionId,
|
|
144
|
-
clientId: flow.clientId,
|
|
145
|
-
codeChallenge: flow.codeChallenge,
|
|
146
|
-
codeChallengeMethod: flow.codeChallengeMethod,
|
|
147
|
-
redirectUri: flow.redirectUri,
|
|
148
|
-
expiresAt: now + 10 * 60 * 1000,
|
|
149
|
-
});
|
|
150
|
-
session_store_1.sessionStore.createSession({
|
|
151
|
-
id: sessionId,
|
|
152
|
-
mcpAccessToken: '',
|
|
153
|
-
mcpRefreshToken: '',
|
|
154
|
-
mcpTokenExpiry: 0,
|
|
155
|
-
gitlabAccessToken: tokenResponse.access_token,
|
|
156
|
-
gitlabRefreshToken: tokenResponse.refresh_token,
|
|
157
|
-
gitlabTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(tokenResponse.expires_in),
|
|
158
|
-
gitlabUserId: userInfo.id,
|
|
159
|
-
gitlabUsername: userInfo.username,
|
|
160
|
-
gitlabApiUrl: flow.selectedInstance ?? config_2.GITLAB_BASE_URL,
|
|
161
|
-
instanceLabel: flow.selectedInstanceLabel,
|
|
162
|
-
clientId: flow.clientId,
|
|
163
|
-
scopes: ['mcp:tools', 'mcp:resources'],
|
|
164
|
-
createdAt: now,
|
|
165
|
-
updatedAt: now,
|
|
166
|
-
});
|
|
167
|
-
session_store_1.sessionStore.deleteDeviceFlow(flow_state);
|
|
168
|
-
(0, logger_1.logInfo)('Device flow authorization completed', {
|
|
169
|
-
sessionId: (0, logger_1.truncateId)(sessionId),
|
|
170
|
-
userId: userInfo.id,
|
|
171
|
-
username: userInfo.username,
|
|
172
|
-
});
|
|
173
|
-
const response = {
|
|
174
|
-
status: 'complete',
|
|
175
|
-
redirect_uri: flow.redirectUri,
|
|
176
|
-
code: authCode,
|
|
177
|
-
state: flow.state ? flow.state : undefined,
|
|
178
|
-
};
|
|
179
|
-
res.json(response);
|
|
180
|
-
}
|
|
181
|
-
else {
|
|
182
|
-
res.json({ status: 'pending' });
|
|
293
|
+
const tokens = claimed.gitlabTokens ?? (await pollGitLab(flow_state, claimed, config, app, now));
|
|
294
|
+
if (!('access_token' in tokens)) {
|
|
295
|
+
res.json({ status: 'pending', interval: tokens.interval });
|
|
296
|
+
return;
|
|
183
297
|
}
|
|
298
|
+
const response = await completeDeviceFlow(flow_state, claimed, tokens, config, app);
|
|
299
|
+
res.json(response ?? { status: 'pending', interval: claimed.interval });
|
|
184
300
|
}
|
|
185
301
|
catch (error) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
res.json({ status: 'failed', error: message });
|
|
302
|
+
if (error instanceof gitlab_device_flow_1.DeviceGrantRefusedError) {
|
|
303
|
+
await session_store_1.sessionStore.deleteDeviceFlow(flow_state);
|
|
304
|
+
res.json({ status: 'failed', error: error.message });
|
|
190
305
|
}
|
|
191
306
|
else {
|
|
192
307
|
(0, logger_1.logWarn)('Device flow poll error', { err: error });
|
|
193
|
-
|
|
308
|
+
await reschedulePoll(flow_state, claimed.interval);
|
|
309
|
+
res.json({ status: 'pending', interval: claimed.interval });
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
async function discardCompletion(sessionId, code) {
|
|
314
|
+
try {
|
|
315
|
+
await session_store_1.sessionStore.deleteAuthCode(code);
|
|
316
|
+
await session_store_1.sessionStore.deleteSession(sessionId);
|
|
317
|
+
}
|
|
318
|
+
catch (error) {
|
|
319
|
+
(0, logger_1.logWarn)('Failed to remove the session of a duplicate completion', { err: error });
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
async function reschedulePoll(flowState, interval) {
|
|
323
|
+
try {
|
|
324
|
+
const current = await session_store_1.sessionStore.getDeviceFlow(flowState);
|
|
325
|
+
if (current) {
|
|
326
|
+
await session_store_1.sessionStore.storeDeviceFlow(flowState, {
|
|
327
|
+
...current,
|
|
328
|
+
nextPollAt: Date.now() + interval * 1000,
|
|
329
|
+
});
|
|
194
330
|
}
|
|
195
331
|
}
|
|
332
|
+
catch (error) {
|
|
333
|
+
(0, logger_1.logWarn)('Failed to reschedule device flow poll', { err: error });
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
async function pollGitLab(flowState, flow, config, app, now) {
|
|
337
|
+
const step = await (0, gitlab_device_flow_1.pollDeviceFlowStep)(flow.deviceCode, config, app);
|
|
338
|
+
if (step.status !== 'complete') {
|
|
339
|
+
const interval = step.status === 'slow_down' ? flow.interval + 5 : flow.interval;
|
|
340
|
+
await session_store_1.sessionStore.storeDeviceFlow(flowState, {
|
|
341
|
+
...flow,
|
|
342
|
+
interval,
|
|
343
|
+
nextPollAt: Date.now() + interval * 1000,
|
|
344
|
+
});
|
|
345
|
+
return { interval };
|
|
346
|
+
}
|
|
347
|
+
await (0, issued_tokens_1.keepIssuedTokens)(() => session_store_1.sessionStore.storeDeviceFlow(flowState, {
|
|
348
|
+
...flow,
|
|
349
|
+
nextPollAt: now + flow.interval * 1000,
|
|
350
|
+
gitlabTokens: step.tokens,
|
|
351
|
+
}));
|
|
352
|
+
return step.tokens;
|
|
353
|
+
}
|
|
354
|
+
async function completeDeviceFlow(flowState, flow, tokens, config, app) {
|
|
355
|
+
const userInfo = await (0, gitlab_device_flow_1.getGitLabUser)(tokens.access_token, app.baseUrl);
|
|
356
|
+
const sessionId = (0, token_utils_1.generateSessionId)();
|
|
357
|
+
const createdAt = Date.now();
|
|
358
|
+
const authCode = (0, token_utils_1.generateAuthorizationCode)();
|
|
359
|
+
await session_store_1.sessionStore.createSession({
|
|
360
|
+
id: sessionId,
|
|
361
|
+
mcpAccessToken: '',
|
|
362
|
+
mcpRefreshToken: '',
|
|
363
|
+
mcpTokenExpiry: 0,
|
|
364
|
+
gitlabAccessToken: tokens.access_token,
|
|
365
|
+
gitlabRefreshToken: tokens.refresh_token,
|
|
366
|
+
gitlabTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(tokens.expires_in),
|
|
367
|
+
gitlabScopes: (0, granted_scopes_1.grantedGitlabScopes)(tokens.scope, flow.requestedGitlabScopes),
|
|
368
|
+
gitlabUserId: userInfo.id,
|
|
369
|
+
gitlabUsername: userInfo.username,
|
|
370
|
+
gitlabApiUrl: flow.selectedInstance ?? config_2.GITLAB_BASE_URL,
|
|
371
|
+
instanceLabel: flow.selectedInstanceLabel,
|
|
372
|
+
clientId: flow.clientId,
|
|
373
|
+
scopes: flow.scopes ?? [...resource_1.MCP_SCOPES],
|
|
374
|
+
resource: flow.resource,
|
|
375
|
+
createdAt,
|
|
376
|
+
updatedAt: createdAt,
|
|
377
|
+
});
|
|
378
|
+
await session_store_1.sessionStore.storeAuthCode({
|
|
379
|
+
code: authCode,
|
|
380
|
+
sessionId,
|
|
381
|
+
clientId: flow.clientId,
|
|
382
|
+
codeChallenge: flow.codeChallenge,
|
|
383
|
+
codeChallengeMethod: flow.codeChallengeMethod,
|
|
384
|
+
redirectUri: flow.redirectUri,
|
|
385
|
+
expiresAt: createdAt + 10 * 60 * 1000,
|
|
386
|
+
});
|
|
387
|
+
if (!(await session_store_1.sessionStore.consumeDeviceFlow(flowState))) {
|
|
388
|
+
await discardCompletion(sessionId, authCode);
|
|
389
|
+
return undefined;
|
|
390
|
+
}
|
|
391
|
+
(0, logger_1.logInfo)('Device flow authorization completed', {
|
|
392
|
+
sessionId: (0, logger_1.truncateId)(sessionId),
|
|
393
|
+
userId: userInfo.id,
|
|
394
|
+
username: userInfo.username,
|
|
395
|
+
});
|
|
396
|
+
return {
|
|
397
|
+
status: 'complete',
|
|
398
|
+
redirect_uri: flow.redirectUri,
|
|
399
|
+
code: authCode,
|
|
400
|
+
state: flow.state ? flow.state : undefined,
|
|
401
|
+
iss: config.issuer,
|
|
402
|
+
};
|
|
403
|
+
}
|
|
404
|
+
function getInstanceChooserHTML(issuer, query, apps) {
|
|
405
|
+
const links = apps
|
|
406
|
+
.map((app) => {
|
|
407
|
+
const params = new URLSearchParams();
|
|
408
|
+
for (const [name, value] of Object.entries(query)) {
|
|
409
|
+
for (const entry of Array.isArray(value) ? value : [value]) {
|
|
410
|
+
if (typeof entry === 'string')
|
|
411
|
+
params.append(name, entry);
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
params.set('instance', app.baseUrl);
|
|
415
|
+
const href = (0, html_1.escapeHtml)(`${issuer}/authorize?${params.toString()}`);
|
|
416
|
+
const label = app.label
|
|
417
|
+
? `${(0, html_1.escapeHtml)(app.label)} <small>${(0, html_1.escapeHtml)(app.baseUrl)}</small>`
|
|
418
|
+
: (0, html_1.escapeHtml)(app.baseUrl);
|
|
419
|
+
return `<li><a href="${href}">${label}</a></li>`;
|
|
420
|
+
})
|
|
421
|
+
.join('\n ');
|
|
422
|
+
return `<!DOCTYPE html>
|
|
423
|
+
<html lang="en">
|
|
424
|
+
<head>
|
|
425
|
+
<meta charset="UTF-8">
|
|
426
|
+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
427
|
+
<title>GitLab MCP - Choose GitLab instance</title>
|
|
428
|
+
<style>
|
|
429
|
+
body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; max-width: 600px; margin: 0 auto; padding: 40px 20px; background: #f5f5f5; }
|
|
430
|
+
.container { background: white; padding: 40px; border-radius: 12px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); }
|
|
431
|
+
h1 { color: #333; font-size: 24px; margin: 0 0 20px; }
|
|
432
|
+
ul { list-style: none; padding: 0; }
|
|
433
|
+
li { margin: 12px 0; }
|
|
434
|
+
a { display: block; padding: 14px 18px; border: 1px solid #ddd; border-radius: 8px; color: #333; text-decoration: none; }
|
|
435
|
+
a:hover { border-color: #fc6d26; }
|
|
436
|
+
small { display: block; color: #888; margin-top: 4px; }
|
|
437
|
+
</style>
|
|
438
|
+
</head>
|
|
439
|
+
<body>
|
|
440
|
+
<div class="container">
|
|
441
|
+
<h1>Choose the GitLab instance to sign in to</h1>
|
|
442
|
+
<ul>
|
|
443
|
+
${links}
|
|
444
|
+
</ul>
|
|
445
|
+
</div>
|
|
446
|
+
</body>
|
|
447
|
+
</html>`;
|
|
196
448
|
}
|
|
197
449
|
function sendError(req, res, status, error, description) {
|
|
198
450
|
(0, logger_1.logWarn)('OAuth authorize request failed', {
|
|
@@ -377,7 +629,8 @@ function getDeviceFlowHTML(params) {
|
|
|
377
629
|
|
|
378
630
|
<script>
|
|
379
631
|
const pollUrl = '${params.pollUrl}?flow_state=${params.flowState}';
|
|
380
|
-
|
|
632
|
+
// The server sets the cadence and raises it on GitLab slow_down (RFC 8628 3.5).
|
|
633
|
+
let pollInterval = ${params.interval * 1000};
|
|
381
634
|
let countdown = ${params.expiresIn};
|
|
382
635
|
|
|
383
636
|
// Update countdown timer
|
|
@@ -414,6 +667,9 @@ function getDeviceFlowHTML(params) {
|
|
|
414
667
|
if (data.state) {
|
|
415
668
|
redirectUrl.searchParams.set('state', data.state);
|
|
416
669
|
}
|
|
670
|
+
if (data.iss) {
|
|
671
|
+
redirectUrl.searchParams.set('iss', data.iss);
|
|
672
|
+
}
|
|
417
673
|
|
|
418
674
|
// Redirect after a brief delay
|
|
419
675
|
setTimeout(() => {
|
|
@@ -431,7 +687,10 @@ function getDeviceFlowHTML(params) {
|
|
|
431
687
|
return;
|
|
432
688
|
}
|
|
433
689
|
|
|
434
|
-
// Still pending, continue polling
|
|
690
|
+
// Still pending, continue polling at the interval the server asks for
|
|
691
|
+
if (typeof data.interval === 'number' && data.interval > 0) {
|
|
692
|
+
pollInterval = data.interval * 1000;
|
|
693
|
+
}
|
|
435
694
|
setTimeout(poll, pollInterval);
|
|
436
695
|
|
|
437
696
|
} catch (error) {
|