@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
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.revokeHandler = revokeHandler;
|
|
4
|
+
const config_1 = require("../config");
|
|
5
|
+
const session_store_1 = require("../session-store");
|
|
6
|
+
const instance_app_1 = require("../instance-app");
|
|
7
|
+
const gitlab_device_flow_1 = require("../gitlab-device-flow");
|
|
8
|
+
const gitlab_token_refresh_1 = require("../gitlab-token-refresh");
|
|
9
|
+
const logger_1 = require("../../logger");
|
|
10
|
+
const request_params_1 = require("../request-params");
|
|
11
|
+
const client_auth_1 = require("../client-auth");
|
|
12
|
+
function sendError(res, status, error, description) {
|
|
13
|
+
const response = { error, error_description: description };
|
|
14
|
+
res.status(status).json(response);
|
|
15
|
+
}
|
|
16
|
+
async function revokeHandler(req, res) {
|
|
17
|
+
const config = (0, config_1.loadOAuthConfig)();
|
|
18
|
+
if (!config) {
|
|
19
|
+
sendError(res, 500, 'server_error', 'OAuth not configured');
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const params = (0, request_params_1.singleValuedParams)(req.body, [
|
|
23
|
+
'token',
|
|
24
|
+
'token_type_hint',
|
|
25
|
+
'client_id',
|
|
26
|
+
'client_secret',
|
|
27
|
+
]);
|
|
28
|
+
if (typeof params === 'string') {
|
|
29
|
+
sendError(res, 400, 'invalid_request', `${params} must not be repeated`);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
const { token } = params;
|
|
33
|
+
if (!token) {
|
|
34
|
+
sendError(res, 400, 'invalid_request', 'Missing token');
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
let session;
|
|
38
|
+
let client_id;
|
|
39
|
+
try {
|
|
40
|
+
const client = await (0, client_auth_1.authenticateClient)(req, params);
|
|
41
|
+
if (!client.authenticated) {
|
|
42
|
+
if (client.challenge)
|
|
43
|
+
res.set('WWW-Authenticate', 'Basic realm="gitlab-mcp"');
|
|
44
|
+
sendError(res, client.status, client.error, client.description);
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
client_id = client.clientId;
|
|
48
|
+
if (!client_id) {
|
|
49
|
+
sendError(res, 400, 'invalid_request', 'Missing client_id');
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
session =
|
|
53
|
+
(await session_store_1.sessionStore.getSessionByRefreshToken(token)) ??
|
|
54
|
+
(await session_store_1.sessionStore.getSessionByToken(token));
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
(0, logger_1.logError)('Token revocation lookup failed', { err: error });
|
|
58
|
+
sendError(res, 503, 'temporarily_unavailable', 'Revocation is temporarily unavailable');
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
if (!session) {
|
|
62
|
+
res.status(200).end();
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
if (session.clientId !== client_id) {
|
|
66
|
+
sendError(res, 400, 'invalid_request', 'Token was issued to another client');
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
let gitlabAccessToken = session.gitlabAccessToken;
|
|
70
|
+
try {
|
|
71
|
+
gitlabAccessToken =
|
|
72
|
+
(await (0, gitlab_token_refresh_1.withFreshGitLabToken)(session, config))?.gitlabAccessToken ?? gitlabAccessToken;
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
(0, logger_1.logWarn)('Could not refresh the GitLab grant before revoking it', { err: error });
|
|
76
|
+
}
|
|
77
|
+
try {
|
|
78
|
+
await session_store_1.sessionStore.deleteSession(session.id);
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
(0, logger_1.logError)('Token revocation failed', { err: error });
|
|
82
|
+
sendError(res, 503, 'temporarily_unavailable', 'Revocation is temporarily unavailable');
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
try {
|
|
86
|
+
const app = await (0, instance_app_1.oauthAppFor)(config, session.gitlabApiUrl);
|
|
87
|
+
if (app) {
|
|
88
|
+
await (0, gitlab_device_flow_1.revokeGitLabToken)(gitlabAccessToken, config, app);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
(0, logger_1.logWarn)('GitLab token revocation failed', { err: error });
|
|
93
|
+
}
|
|
94
|
+
(0, logger_1.logInfo)('OAuth session revoked', { sessionId: (0, logger_1.truncateId)(session.id) });
|
|
95
|
+
res.status(200).end();
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=revoke.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"revoke.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/revoke.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,10 @@ exports.tokenHandler = tokenHandler;
|
|
|
4
4
|
const config_1 = require("../config");
|
|
5
5
|
const session_store_1 = require("../session-store");
|
|
6
6
|
const token_utils_1 = require("../token-utils");
|
|
7
|
-
const
|
|
8
|
-
const
|
|
7
|
+
const gitlab_token_refresh_1 = require("../gitlab-token-refresh");
|
|
8
|
+
const resource_1 = require("../resource");
|
|
9
|
+
const request_params_1 = require("../request-params");
|
|
10
|
+
const client_auth_1 = require("../client-auth");
|
|
9
11
|
const logger_1 = require("../../logger");
|
|
10
12
|
const request_logger_1 = require("../../utils/request-logger");
|
|
11
13
|
async function tokenHandler(req, res) {
|
|
@@ -14,20 +16,53 @@ async function tokenHandler(req, res) {
|
|
|
14
16
|
sendError(req, res, 500, 'server_error', 'OAuth not configured');
|
|
15
17
|
return;
|
|
16
18
|
}
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
const params = (0, request_params_1.singleValuedParams)(req.body, TOKEN_PARAMS);
|
|
20
|
+
if (typeof params === 'string') {
|
|
21
|
+
sendError(req, res, 400, 'invalid_request', `${params} must not be repeated`);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
const resource = (0, resource_1.resourceParameter)(config.issuer, req.body?.resource);
|
|
25
|
+
if (resource === null) {
|
|
26
|
+
sendError(req, res, 400, 'invalid_target', 'resource must name one resource of this server');
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
try {
|
|
30
|
+
const client = await (0, client_auth_1.authenticateClient)(req, params);
|
|
31
|
+
if (!client.authenticated) {
|
|
32
|
+
if (client.challenge)
|
|
33
|
+
res.set('WWW-Authenticate', 'Basic realm="gitlab-mcp"');
|
|
34
|
+
sendError(req, res, client.status, client.error, client.description);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
const authenticated = { ...params, client_id: client.clientId };
|
|
38
|
+
switch (params.grant_type) {
|
|
39
|
+
case 'authorization_code':
|
|
40
|
+
await handleAuthorizationCode(req, res, config, authenticated, resource);
|
|
41
|
+
break;
|
|
42
|
+
case 'refresh_token':
|
|
43
|
+
await handleRefreshToken(req, res, config, authenticated, resource);
|
|
44
|
+
break;
|
|
45
|
+
default:
|
|
46
|
+
sendError(req, res, 400, 'unsupported_grant_type', `Grant type "${params.grant_type}" is not supported`);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
(0, logger_1.logError)('Token request failed', { err: error });
|
|
51
|
+
sendError(req, res, 500, 'server_error', 'Token service is temporarily unavailable');
|
|
27
52
|
}
|
|
28
53
|
}
|
|
29
|
-
|
|
30
|
-
|
|
54
|
+
const TOKEN_PARAMS = [
|
|
55
|
+
'grant_type',
|
|
56
|
+
'code',
|
|
57
|
+
'code_verifier',
|
|
58
|
+
'redirect_uri',
|
|
59
|
+
'client_id',
|
|
60
|
+
'client_secret',
|
|
61
|
+
'refresh_token',
|
|
62
|
+
'scope',
|
|
63
|
+
];
|
|
64
|
+
async function handleAuthorizationCode(req, res, config, params, resource) {
|
|
65
|
+
const { code, code_verifier, redirect_uri, client_id } = params;
|
|
31
66
|
if (!code) {
|
|
32
67
|
sendError(req, res, 400, 'invalid_request', 'Missing authorization code');
|
|
33
68
|
return;
|
|
@@ -36,16 +71,23 @@ async function handleAuthorizationCode(req, res, config) {
|
|
|
36
71
|
sendError(req, res, 400, 'invalid_request', 'Missing code_verifier (PKCE required)');
|
|
37
72
|
return;
|
|
38
73
|
}
|
|
39
|
-
|
|
74
|
+
if (!client_id) {
|
|
75
|
+
sendError(req, res, 400, 'invalid_request', 'Missing client_id');
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const authCode = await session_store_1.sessionStore.consumeAuthCode(code);
|
|
40
79
|
if (!authCode) {
|
|
41
80
|
sendError(req, res, 400, 'invalid_grant', 'Invalid or expired authorization code');
|
|
42
81
|
return;
|
|
43
82
|
}
|
|
44
83
|
if (Date.now() > authCode.expiresAt) {
|
|
45
|
-
session_store_1.sessionStore.deleteAuthCode(code);
|
|
46
84
|
sendError(req, res, 400, 'invalid_grant', 'Authorization code has expired');
|
|
47
85
|
return;
|
|
48
86
|
}
|
|
87
|
+
if (client_id !== authCode.clientId) {
|
|
88
|
+
sendError(req, res, 400, 'invalid_grant', 'Authorization code was issued to another client');
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
49
91
|
if (!(0, token_utils_1.verifyCodeChallenge)(code_verifier, authCode.codeChallenge, authCode.codeChallengeMethod)) {
|
|
50
92
|
sendError(req, res, 400, 'invalid_grant', 'Invalid code_verifier');
|
|
51
93
|
return;
|
|
@@ -54,27 +96,29 @@ async function handleAuthorizationCode(req, res, config) {
|
|
|
54
96
|
sendError(req, res, 400, 'invalid_grant', 'redirect_uri does not match');
|
|
55
97
|
return;
|
|
56
98
|
}
|
|
57
|
-
const session = session_store_1.sessionStore.getSession(authCode.sessionId);
|
|
99
|
+
const session = await session_store_1.sessionStore.getSession(authCode.sessionId);
|
|
58
100
|
if (!session) {
|
|
59
101
|
sendError(req, res, 400, 'invalid_grant', 'Session not found');
|
|
60
102
|
return;
|
|
61
103
|
}
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
gitlab_user: session.gitlabUsername,
|
|
70
|
-
}, config.sessionSecret, config.tokenTtl);
|
|
104
|
+
const audience = resolveResource(config, session, resource);
|
|
105
|
+
if (!audience) {
|
|
106
|
+
sendError(req, res, 400, 'invalid_target', 'resource does not match the authorization');
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
await session_store_1.sessionStore.markClientUsed(session.clientId);
|
|
110
|
+
const accessToken = mintAccessToken(config, session, audience, session.scopes);
|
|
71
111
|
const refreshToken = (0, token_utils_1.generateRefreshToken)();
|
|
72
|
-
session_store_1.sessionStore.updateSession(session.id, {
|
|
112
|
+
const stored = await session_store_1.sessionStore.updateSession(session.id, {
|
|
73
113
|
mcpAccessToken: accessToken,
|
|
74
114
|
mcpRefreshToken: refreshToken,
|
|
75
115
|
mcpTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(config.tokenTtl),
|
|
116
|
+
resource: audience,
|
|
76
117
|
});
|
|
77
|
-
|
|
118
|
+
if (!stored) {
|
|
119
|
+
sendError(req, res, 400, 'invalid_grant', 'Session not found');
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
78
122
|
(0, logger_1.logInfo)('MCP tokens issued via authorization_code grant', {
|
|
79
123
|
sessionId: (0, logger_1.truncateId)(session.id),
|
|
80
124
|
userId: session.gitlabUserId,
|
|
@@ -88,55 +132,66 @@ async function handleAuthorizationCode(req, res, config) {
|
|
|
88
132
|
};
|
|
89
133
|
res.json(response);
|
|
90
134
|
}
|
|
91
|
-
async function handleRefreshToken(req, res, config) {
|
|
92
|
-
const { refresh_token } =
|
|
135
|
+
async function handleRefreshToken(req, res, config, params, resource) {
|
|
136
|
+
const { refresh_token, client_id, scope } = params;
|
|
93
137
|
if (!refresh_token) {
|
|
94
138
|
sendError(req, res, 400, 'invalid_request', 'Missing refresh_token');
|
|
95
139
|
return;
|
|
96
140
|
}
|
|
97
|
-
|
|
141
|
+
if (!client_id) {
|
|
142
|
+
sendError(req, res, 400, 'invalid_request', 'Missing client_id');
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
const session = await session_store_1.sessionStore.getSessionByRefreshToken(refresh_token);
|
|
98
146
|
if (!session) {
|
|
99
147
|
sendError(req, res, 400, 'invalid_grant', 'Invalid refresh token');
|
|
100
148
|
return;
|
|
101
149
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
150
|
+
if (client_id !== session.clientId) {
|
|
151
|
+
sendError(req, res, 400, 'invalid_grant', 'Refresh token was issued to another client');
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
const audience = resolveResource(config, session, resource);
|
|
155
|
+
if (!audience) {
|
|
156
|
+
sendError(req, res, 400, 'invalid_target', 'resource does not match the authorization');
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
const requested = (scope ?? '').split(' ').filter((s) => resource_1.MCP_SCOPES.includes(s));
|
|
160
|
+
const tokenScopes = requested.length === 0 ? session.scopes : [...new Set(requested)];
|
|
161
|
+
if (!tokenScopes.every((s) => session.scopes.includes(s))) {
|
|
162
|
+
sendError(req, res, 400, 'invalid_scope', 'scope exceeds the original grant');
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
let updatedSession;
|
|
166
|
+
try {
|
|
167
|
+
updatedSession = await (0, gitlab_token_refresh_1.withFreshGitLabToken)(session, config);
|
|
168
|
+
}
|
|
169
|
+
catch (error) {
|
|
170
|
+
(0, logger_1.logError)('Failed to refresh GitLab token', { err: error });
|
|
171
|
+
if (error instanceof gitlab_token_refresh_1.GitLabGrantRevokedError) {
|
|
172
|
+
sendError(req, res, 400, 'invalid_grant', 'GitLab no longer accepts this account; sign in again');
|
|
118
173
|
}
|
|
119
|
-
|
|
120
|
-
(
|
|
121
|
-
sendError(req, res, 400, 'invalid_grant', 'Failed to refresh underlying GitLab token');
|
|
122
|
-
return;
|
|
174
|
+
else {
|
|
175
|
+
sendError(req, res, 503, 'temporarily_unavailable', 'GitLab is temporarily unavailable; retry the refresh');
|
|
123
176
|
}
|
|
177
|
+
return;
|
|
124
178
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
sid: updatedSession.id,
|
|
131
|
-
scope: updatedSession.scopes.join(' '),
|
|
132
|
-
gitlab_user: updatedSession.gitlabUsername,
|
|
133
|
-
}, config.sessionSecret, config.tokenTtl);
|
|
179
|
+
if (!updatedSession) {
|
|
180
|
+
sendError(req, res, 400, 'invalid_grant', 'Session lost during refresh');
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
const accessToken = mintAccessToken(config, updatedSession, audience, tokenScopes);
|
|
134
184
|
const newRefreshToken = (0, token_utils_1.generateRefreshToken)();
|
|
135
|
-
session_store_1.sessionStore.
|
|
185
|
+
const rotated = await session_store_1.sessionStore.rotateSession(session.id, refresh_token, {
|
|
136
186
|
mcpAccessToken: accessToken,
|
|
137
187
|
mcpRefreshToken: newRefreshToken,
|
|
138
188
|
mcpTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(config.tokenTtl),
|
|
189
|
+
resource: audience,
|
|
139
190
|
});
|
|
191
|
+
if (!rotated) {
|
|
192
|
+
sendError(req, res, 400, 'invalid_grant', 'Invalid refresh token');
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
140
195
|
(0, logger_1.logInfo)('MCP tokens refreshed via refresh_token grant', {
|
|
141
196
|
sessionId: (0, logger_1.truncateId)(updatedSession.id),
|
|
142
197
|
userId: updatedSession.gitlabUserId,
|
|
@@ -146,10 +201,29 @@ async function handleRefreshToken(req, res, config) {
|
|
|
146
201
|
token_type: 'Bearer',
|
|
147
202
|
expires_in: config.tokenTtl,
|
|
148
203
|
refresh_token: newRefreshToken,
|
|
149
|
-
scope:
|
|
204
|
+
scope: tokenScopes.join(' '),
|
|
150
205
|
};
|
|
151
206
|
res.json(response);
|
|
152
207
|
}
|
|
208
|
+
function resolveResource(config, session, requested) {
|
|
209
|
+
const bound = session.resource;
|
|
210
|
+
if (requested === undefined) {
|
|
211
|
+
return bound ?? (0, resource_1.defaultResource)(config.issuer);
|
|
212
|
+
}
|
|
213
|
+
return bound === undefined || bound === requested ? requested : undefined;
|
|
214
|
+
}
|
|
215
|
+
function mintAccessToken(config, session, audience, scopes) {
|
|
216
|
+
return (0, token_utils_1.createJWT)({
|
|
217
|
+
iss: config.issuer,
|
|
218
|
+
sub: session.gitlabUserId.toString(),
|
|
219
|
+
aud: audience,
|
|
220
|
+
client_id: session.clientId,
|
|
221
|
+
jti: (0, token_utils_1.generateUUID)(),
|
|
222
|
+
sid: session.id,
|
|
223
|
+
scope: scopes.join(' '),
|
|
224
|
+
gitlab_user: session.gitlabUsername,
|
|
225
|
+
}, config.sessionSecret, config.tokenTtl);
|
|
226
|
+
}
|
|
153
227
|
function sendError(req, res, status, error, description) {
|
|
154
228
|
(0, logger_1.logWarn)('OAuth token request failed', {
|
|
155
229
|
event: 'oauth_error',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/token.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/token.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,29 @@
|
|
|
1
1
|
import { OAuthConfig } from './config';
|
|
2
2
|
import { GitLabDeviceResponse, GitLabTokenResponse, GitLabUserInfo } from './types';
|
|
3
|
-
|
|
4
|
-
export declare
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
export declare
|
|
10
|
-
|
|
3
|
+
import { type GitLabOAuthApp } from './oauth-app';
|
|
4
|
+
export declare class GitLabOAuthHttpError extends Error {
|
|
5
|
+
readonly status: number;
|
|
6
|
+
readonly oauthError?: string | undefined;
|
|
7
|
+
constructor(message: string, status: number, oauthError?: string | undefined);
|
|
8
|
+
}
|
|
9
|
+
export declare class DeviceGrantRefusedError extends Error {
|
|
10
|
+
constructor(message: string);
|
|
11
|
+
}
|
|
12
|
+
export declare function initiateDeviceFlow(config: OAuthConfig, app?: GitLabOAuthApp): Promise<GitLabDeviceResponse>;
|
|
13
|
+
export type DeviceFlowPollStep = {
|
|
14
|
+
status: 'complete';
|
|
15
|
+
tokens: GitLabTokenResponse;
|
|
16
|
+
} | {
|
|
17
|
+
status: 'pending';
|
|
18
|
+
} | {
|
|
19
|
+
status: 'slow_down';
|
|
20
|
+
};
|
|
21
|
+
export declare function pollDeviceFlowStep(deviceCode: string, config: OAuthConfig, app?: GitLabOAuthApp): Promise<DeviceFlowPollStep>;
|
|
22
|
+
export declare function pollDeviceFlowOnce(deviceCode: string, config: OAuthConfig, app?: GitLabOAuthApp): Promise<GitLabTokenResponse | null>;
|
|
23
|
+
export declare function pollForToken(deviceCode: string, config: OAuthConfig, onPending?: () => void, app?: GitLabOAuthApp): Promise<GitLabTokenResponse>;
|
|
24
|
+
export declare function refreshGitLabToken(refreshToken: string, config: OAuthConfig, app?: GitLabOAuthApp): Promise<GitLabTokenResponse>;
|
|
25
|
+
export declare function getGitLabUser(accessToken: string, baseUrl?: string): Promise<GitLabUserInfo>;
|
|
26
|
+
export declare function validateGitLabToken(accessToken: string, baseUrl?: string): Promise<boolean>;
|
|
27
|
+
export declare function exchangeGitLabAuthCode(code: string, redirectUri: string, config: OAuthConfig, app?: GitLabOAuthApp): Promise<GitLabTokenResponse>;
|
|
28
|
+
export declare function revokeGitLabToken(token: string, config: OAuthConfig, app?: GitLabOAuthApp): Promise<void>;
|
|
29
|
+
export declare function buildGitLabAuthUrl(config: OAuthConfig, redirectUri: string, state: string, app?: GitLabOAuthApp): string;
|