@structured-world/gitlab-mcp 10.1.0 → 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.
Files changed (284) hide show
  1. package/README.md +7 -7
  2. package/README.md.in +1 -1
  3. package/dist/src/channel-gateway/format.js +7 -1
  4. package/dist/src/channel-gateway/format.js.map +1 -1
  5. package/dist/src/channel-gateway/forwarding.d.ts +3 -0
  6. package/dist/src/channel-gateway/forwarding.js +8 -1
  7. package/dist/src/channel-gateway/forwarding.js.map +1 -1
  8. package/dist/src/channel-gateway/gateway.d.ts +7 -0
  9. package/dist/src/channel-gateway/gateway.js +80 -16
  10. package/dist/src/channel-gateway/gateway.js.map +1 -1
  11. package/dist/src/cli/docker/container-runtime.d.ts +1 -0
  12. package/dist/src/cli/docker/container-runtime.js +37 -5
  13. package/dist/src/cli/docker/container-runtime.js.map +1 -1
  14. package/dist/src/cli/docker/docker-command.js +11 -2
  15. package/dist/src/cli/docker/docker-command.js.map +1 -1
  16. package/dist/src/cli/docker/docker-utils.d.ts +1 -0
  17. package/dist/src/cli/docker/docker-utils.js +137 -27
  18. package/dist/src/cli/docker/docker-utils.js.map +1 -1
  19. package/dist/src/cli/docker/oauth-issuer-prompt.d.ts +2 -0
  20. package/dist/src/cli/docker/oauth-issuer-prompt.js +47 -0
  21. package/dist/src/cli/docker/oauth-issuer-prompt.js.map +1 -0
  22. package/dist/src/cli/docker/types.d.ts +18 -4
  23. package/dist/src/cli/docker/types.js.map +1 -1
  24. package/dist/src/cli/list-tools.js +14 -35
  25. package/dist/src/cli/list-tools.js.map +1 -1
  26. package/dist/src/cli/setup/flows/server-setup.js +15 -0
  27. package/dist/src/cli/setup/flows/server-setup.js.map +1 -1
  28. package/dist/src/config/instances-loader.js +17 -3
  29. package/dist/src/config/instances-loader.js.map +1 -1
  30. package/dist/src/config/instances-schema.d.ts +6 -3
  31. package/dist/src/config/instances-schema.js +7 -6
  32. package/dist/src/config/instances-schema.js.map +1 -1
  33. package/dist/src/config.js.map +1 -1
  34. package/dist/src/configuration/caller.d.ts +10 -0
  35. package/dist/src/configuration/caller.js +39 -0
  36. package/dist/src/configuration/caller.js.map +1 -0
  37. package/dist/src/configuration/composed-feeds.d.ts +31 -0
  38. package/dist/src/configuration/composed-feeds.js +698 -0
  39. package/dist/src/configuration/composed-feeds.js.map +1 -0
  40. package/dist/src/configuration/composed-listings.d.ts +14 -0
  41. package/dist/src/configuration/composed-listings.js +157 -0
  42. package/dist/src/configuration/composed-listings.js.map +1 -0
  43. package/dist/src/configuration/groups.d.ts +8 -0
  44. package/dist/src/configuration/groups.js +39 -0
  45. package/dist/src/configuration/groups.js.map +1 -0
  46. package/dist/src/configuration/index.d.ts +6 -0
  47. package/dist/src/configuration/index.js +87 -0
  48. package/dist/src/configuration/index.js.map +1 -0
  49. package/dist/src/configuration/policy.d.ts +34 -0
  50. package/dist/src/configuration/policy.js +122 -0
  51. package/dist/src/configuration/policy.js.map +1 -0
  52. package/dist/src/configuration/scope-ids.d.ts +7 -0
  53. package/dist/src/configuration/scope-ids.js +78 -0
  54. package/dist/src/configuration/scope-ids.js.map +1 -0
  55. package/dist/src/configuration/scope-projects.d.ts +5 -0
  56. package/dist/src/configuration/scope-projects.js +76 -0
  57. package/dist/src/configuration/scope-projects.js.map +1 -0
  58. package/dist/src/configuration/scope-targets.d.ts +26 -0
  59. package/dist/src/configuration/scope-targets.js +307 -0
  60. package/dist/src/configuration/scope-targets.js.map +1 -0
  61. package/dist/src/configuration/scoped-execution.d.ts +6 -0
  62. package/dist/src/configuration/scoped-execution.js +577 -0
  63. package/dist/src/configuration/scoped-execution.js.map +1 -0
  64. package/dist/src/configuration/scoped-feeds.d.ts +22 -0
  65. package/dist/src/configuration/scoped-feeds.js +136 -0
  66. package/dist/src/configuration/scoped-feeds.js.map +1 -0
  67. package/dist/src/configuration/service.d.ts +53 -0
  68. package/dist/src/configuration/service.js +186 -0
  69. package/dist/src/configuration/service.js.map +1 -0
  70. package/dist/src/configuration/settings-store.d.ts +20 -0
  71. package/dist/src/configuration/settings-store.js +228 -0
  72. package/dist/src/configuration/settings-store.js.map +1 -0
  73. package/dist/src/configuration/types.d.ts +30 -0
  74. package/dist/src/configuration/types.js +20 -0
  75. package/dist/src/configuration/types.js.map +1 -0
  76. package/dist/src/contracts/storage.d.ts +2 -1
  77. package/dist/src/dashboard/html-template.js +8 -15
  78. package/dist/src/dashboard/html-template.js.map +1 -1
  79. package/dist/src/dashboard/metrics.d.ts +1 -1
  80. package/dist/src/entities/context/connection-check.d.ts +64 -0
  81. package/dist/src/entities/context/connection-check.js +117 -0
  82. package/dist/src/entities/context/connection-check.js.map +1 -0
  83. package/dist/src/entities/context/context-manager.d.ts +10 -22
  84. package/dist/src/entities/context/context-manager.js +108 -207
  85. package/dist/src/entities/context/context-manager.js.map +1 -1
  86. package/dist/src/entities/context/handlers.d.ts +3 -5
  87. package/dist/src/entities/context/handlers.js +2 -14
  88. package/dist/src/entities/context/handlers.js.map +1 -1
  89. package/dist/src/entities/context/output-schema.d.ts +272 -0
  90. package/dist/src/entities/context/output-schema.js +182 -0
  91. package/dist/src/entities/context/output-schema.js.map +1 -0
  92. package/dist/src/entities/context/profile.d.ts +29 -0
  93. package/dist/src/entities/context/profile.js +72 -0
  94. package/dist/src/entities/context/profile.js.map +1 -0
  95. package/dist/src/entities/context/registry.js +140 -3
  96. package/dist/src/entities/context/registry.js.map +1 -1
  97. package/dist/src/entities/context/schema.d.ts +6 -14
  98. package/dist/src/entities/context/schema.js +6 -13
  99. package/dist/src/entities/context/schema.js.map +1 -1
  100. package/dist/src/entities/context/scope-search.d.ts +49 -0
  101. package/dist/src/entities/context/scope-search.js +71 -0
  102. package/dist/src/entities/context/scope-search.js.map +1 -0
  103. package/dist/src/entities/context/settings-panel.d.ts +13 -0
  104. package/dist/src/entities/context/settings-panel.js +508 -0
  105. package/dist/src/entities/context/settings-panel.js.map +1 -0
  106. package/dist/src/entities/context/settings.d.ts +78 -0
  107. package/dist/src/entities/context/settings.js +239 -0
  108. package/dist/src/entities/context/settings.js.map +1 -0
  109. package/dist/src/entities/context/types.d.ts +3 -4
  110. package/dist/src/entities/context/whoami.js +39 -31
  111. package/dist/src/entities/context/whoami.js.map +1 -1
  112. package/dist/src/entities/core/registry.js +34 -33
  113. package/dist/src/entities/core/registry.js.map +1 -1
  114. package/dist/src/entities/environments/schema-readonly.d.ts +3 -3
  115. package/dist/src/entities/files/registry.js +3 -2
  116. package/dist/src/entities/files/registry.js.map +1 -1
  117. package/dist/src/entities/iterations/registry.js +3 -2
  118. package/dist/src/entities/iterations/registry.js.map +1 -1
  119. package/dist/src/entities/mrs/registry.js +6 -4
  120. package/dist/src/entities/mrs/registry.js.map +1 -1
  121. package/dist/src/entities/mrs/schema-readonly.d.ts +2 -2
  122. package/dist/src/entities/mrs/schema-readonly.js +19 -2
  123. package/dist/src/entities/mrs/schema-readonly.js.map +1 -1
  124. package/dist/src/entities/pipelines/registry.js +3 -2
  125. package/dist/src/entities/pipelines/registry.js.map +1 -1
  126. package/dist/src/entities/pipelines/schema-readonly.d.ts +3 -3
  127. package/dist/src/entities/runners/project-access.d.ts +14 -0
  128. package/dist/src/entities/runners/project-access.js +64 -0
  129. package/dist/src/entities/runners/project-access.js.map +1 -0
  130. package/dist/src/entities/runners/registry.js +54 -26
  131. package/dist/src/entities/runners/registry.js.map +1 -1
  132. package/dist/src/entities/search/schema-readonly.d.ts +28 -28
  133. package/dist/src/graphql/runners.d.ts +26 -1
  134. package/dist/src/graphql/runners.js +43 -6
  135. package/dist/src/graphql/runners.js.map +1 -1
  136. package/dist/src/graphql/vulnerabilities.d.ts +3 -0
  137. package/dist/src/graphql/vulnerabilities.js +1 -0
  138. package/dist/src/graphql/vulnerabilities.js.map +1 -1
  139. package/dist/src/handlers.js +218 -142
  140. package/dist/src/handlers.js.map +1 -1
  141. package/dist/src/mcp-apps.d.ts +6 -0
  142. package/dist/src/mcp-apps.js +8 -0
  143. package/dist/src/mcp-apps.js.map +1 -0
  144. package/dist/src/middleware/mcp-auth-routes.d.ts +3 -0
  145. package/dist/src/middleware/mcp-auth-routes.js +9 -0
  146. package/dist/src/middleware/mcp-auth-routes.js.map +1 -0
  147. package/dist/src/middleware/oauth-auth.js +83 -23
  148. package/dist/src/middleware/oauth-auth.js.map +1 -1
  149. package/dist/src/middleware/rate-limiter.js +11 -10
  150. package/dist/src/middleware/rate-limiter.js.map +1 -1
  151. package/dist/src/oauth/authorization-response.d.ts +1 -0
  152. package/dist/src/oauth/authorization-response.js +14 -0
  153. package/dist/src/oauth/authorization-response.js.map +1 -0
  154. package/dist/src/oauth/client-auth.d.ts +16 -0
  155. package/dist/src/oauth/client-auth.js +73 -0
  156. package/dist/src/oauth/client-auth.js.map +1 -0
  157. package/dist/src/oauth/config.d.ts +2 -0
  158. package/dist/src/oauth/config.js +37 -0
  159. package/dist/src/oauth/config.js.map +1 -1
  160. package/dist/src/oauth/endpoints/authorize.d.ts +1 -0
  161. package/dist/src/oauth/endpoints/authorize.js +361 -102
  162. package/dist/src/oauth/endpoints/authorize.js.map +1 -1
  163. package/dist/src/oauth/endpoints/callback.js +78 -41
  164. package/dist/src/oauth/endpoints/callback.js.map +1 -1
  165. package/dist/src/oauth/endpoints/index.d.ts +1 -0
  166. package/dist/src/oauth/endpoints/index.js +3 -1
  167. package/dist/src/oauth/endpoints/index.js.map +1 -1
  168. package/dist/src/oauth/endpoints/metadata.d.ts +1 -1
  169. package/dist/src/oauth/endpoints/metadata.js +23 -8
  170. package/dist/src/oauth/endpoints/metadata.js.map +1 -1
  171. package/dist/src/oauth/endpoints/register.d.ts +3 -2
  172. package/dist/src/oauth/endpoints/register.js +70 -19
  173. package/dist/src/oauth/endpoints/register.js.map +1 -1
  174. package/dist/src/oauth/endpoints/revoke.d.ts +2 -0
  175. package/dist/src/oauth/endpoints/revoke.js +97 -0
  176. package/dist/src/oauth/endpoints/revoke.js.map +1 -0
  177. package/dist/src/oauth/endpoints/token.js +136 -62
  178. package/dist/src/oauth/endpoints/token.js.map +1 -1
  179. package/dist/src/oauth/gitlab-device-flow.d.ts +27 -8
  180. package/dist/src/oauth/gitlab-device-flow.js +119 -57
  181. package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
  182. package/dist/src/oauth/gitlab-request-bound.d.ts +1 -0
  183. package/dist/src/oauth/gitlab-request-bound.js +6 -0
  184. package/dist/src/oauth/gitlab-request-bound.js.map +1 -0
  185. package/dist/src/oauth/gitlab-token-refresh.d.ts +6 -0
  186. package/dist/src/oauth/gitlab-token-refresh.js +130 -0
  187. package/dist/src/oauth/gitlab-token-refresh.js.map +1 -0
  188. package/dist/src/oauth/granted-scopes.d.ts +1 -0
  189. package/dist/src/oauth/granted-scopes.js +7 -0
  190. package/dist/src/oauth/granted-scopes.js.map +1 -0
  191. package/dist/src/oauth/index.d.ts +2 -2
  192. package/dist/src/oauth/index.js +4 -2
  193. package/dist/src/oauth/index.js.map +1 -1
  194. package/dist/src/oauth/instance-app.d.ts +4 -0
  195. package/dist/src/oauth/instance-app.js +45 -0
  196. package/dist/src/oauth/instance-app.js.map +1 -0
  197. package/dist/src/oauth/issued-tokens.d.ts +1 -0
  198. package/dist/src/oauth/issued-tokens.js +24 -0
  199. package/dist/src/oauth/issued-tokens.js.map +1 -0
  200. package/dist/src/oauth/oauth-app.d.ts +9 -0
  201. package/dist/src/oauth/oauth-app.js +14 -0
  202. package/dist/src/oauth/oauth-app.js.map +1 -0
  203. package/dist/src/oauth/request-params.d.ts +1 -0
  204. package/dist/src/oauth/request-params.js +17 -0
  205. package/dist/src/oauth/request-params.js.map +1 -0
  206. package/dist/src/oauth/resource.d.ts +12 -0
  207. package/dist/src/oauth/resource.js +66 -0
  208. package/dist/src/oauth/resource.js.map +1 -0
  209. package/dist/src/oauth/routes.d.ts +2 -0
  210. package/dist/src/oauth/routes.js +31 -0
  211. package/dist/src/oauth/routes.js.map +1 -0
  212. package/dist/src/oauth/session-store.d.ts +44 -36
  213. package/dist/src/oauth/session-store.js +125 -253
  214. package/dist/src/oauth/session-store.js.map +1 -1
  215. package/dist/src/oauth/storage/factory.js +1 -1
  216. package/dist/src/oauth/storage/factory.js.map +1 -1
  217. package/dist/src/oauth/storage/file.d.ts +23 -1
  218. package/dist/src/oauth/storage/file.js +168 -36
  219. package/dist/src/oauth/storage/file.js.map +1 -1
  220. package/dist/src/oauth/storage/memory.d.ts +23 -1
  221. package/dist/src/oauth/storage/memory.js +120 -22
  222. package/dist/src/oauth/storage/memory.js.map +1 -1
  223. package/dist/src/oauth/storage/types.d.ts +17 -1
  224. package/dist/src/oauth/storage/types.js.map +1 -1
  225. package/dist/src/oauth/tool-auth.d.ts +12 -0
  226. package/dist/src/oauth/tool-auth.js +108 -0
  227. package/dist/src/oauth/tool-auth.js.map +1 -0
  228. package/dist/src/oauth/types.d.ts +30 -0
  229. package/dist/src/profiles/scope-enforcer.d.ts +8 -0
  230. package/dist/src/profiles/scope-enforcer.js +86 -24
  231. package/dist/src/profiles/scope-enforcer.js.map +1 -1
  232. package/dist/src/profiles/types.js +4 -1
  233. package/dist/src/profiles/types.js.map +1 -1
  234. package/dist/src/registry-manager.d.ts +16 -4
  235. package/dist/src/registry-manager.js +115 -33
  236. package/dist/src/registry-manager.js.map +1 -1
  237. package/dist/src/server.js +66 -39
  238. package/dist/src/server.js.map +1 -1
  239. package/dist/src/services/ConnectionManager.d.ts +2 -1
  240. package/dist/src/services/ConnectionManager.js +26 -19
  241. package/dist/src/services/ConnectionManager.js.map +1 -1
  242. package/dist/src/services/TokenScopeDetector.d.ts +5 -1
  243. package/dist/src/services/TokenScopeDetector.js +19 -0
  244. package/dist/src/services/TokenScopeDetector.js.map +1 -1
  245. package/dist/src/session-manager.d.ts +3 -1
  246. package/dist/src/session-manager.js +35 -10
  247. package/dist/src/session-manager.js.map +1 -1
  248. package/dist/src/types.d.ts +3 -2
  249. package/dist/src/types.js.map +1 -1
  250. package/dist/src/utils/bounded-map.d.ts +1 -0
  251. package/dist/src/utils/bounded-map.js +23 -0
  252. package/dist/src/utils/bounded-map.js.map +1 -0
  253. package/dist/src/utils/fetch.d.ts +0 -1
  254. package/dist/src/utils/fetch.js +2 -12
  255. package/dist/src/utils/fetch.js.map +1 -1
  256. package/dist/src/utils/gitlab-api.js +2 -1
  257. package/dist/src/utils/gitlab-api.js.map +1 -1
  258. package/dist/src/utils/gitlab-base-url.d.ts +2 -0
  259. package/dist/src/utils/gitlab-base-url.js +30 -0
  260. package/dist/src/utils/gitlab-base-url.js.map +1 -0
  261. package/dist/src/utils/html.d.ts +1 -0
  262. package/dist/src/utils/html.js +12 -0
  263. package/dist/src/utils/html.js.map +1 -0
  264. package/dist/src/utils/namespace.d.ts +1 -0
  265. package/dist/src/utils/namespace.js +72 -24
  266. package/dist/src/utils/namespace.js.map +1 -1
  267. package/dist/src/utils/schema-utils.d.ts +5 -3
  268. package/dist/src/utils/schema-utils.js +50 -22
  269. package/dist/src/utils/schema-utils.js.map +1 -1
  270. package/dist/src/utils/smart-user-search.js +2 -1
  271. package/dist/src/utils/smart-user-search.js.map +1 -1
  272. package/dist/src/utils/sync-directory.d.ts +1 -0
  273. package/dist/src/utils/sync-directory.js +49 -0
  274. package/dist/src/utils/sync-directory.js.map +1 -0
  275. package/dist/src/utils/tool-result.d.ts +4 -0
  276. package/dist/src/utils/tool-result.js +41 -0
  277. package/dist/src/utils/tool-result.js.map +1 -0
  278. package/dist/tsconfig.build.tsbuildinfo +1 -1
  279. package/package.json +60 -13
  280. package/skills/gitlab-ci/SKILL.md +16 -0
  281. package/skills/gitlab-discovery/SKILL.md +15 -0
  282. package/skills/gitlab-review/SKILL.md +16 -0
  283. package/skills/gitlab-setup/SKILL.md +16 -0
  284. package/skills/gitlab-work-items/SKILL.md +16 -0
@@ -3,10 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.callbackHandler = callbackHandler;
4
4
  const config_1 = require("../config");
5
5
  const session_store_1 = require("../session-store");
6
+ const issued_tokens_1 = require("../issued-tokens");
6
7
  const gitlab_device_flow_1 = require("../gitlab-device-flow");
7
8
  const token_utils_1 = require("../token-utils");
8
9
  const logger_1 = require("../../logger");
9
10
  const config_2 = require("../../config");
11
+ const granted_scopes_1 = require("../granted-scopes");
12
+ const resource_1 = require("../resource");
13
+ const authorization_response_1 = require("../authorization-response");
14
+ const instance_app_1 = require("../instance-app");
15
+ const authorize_1 = require("./authorize");
10
16
  async function callbackHandler(req, res) {
11
17
  const config = (0, config_1.loadOAuthConfig)();
12
18
  if (!config) {
@@ -20,18 +26,16 @@ async function callbackHandler(req, res) {
20
26
  if (error) {
21
27
  (0, logger_1.logWarn)('GitLab authorization error', { error, error_description });
22
28
  if (state) {
23
- const flow = session_store_1.sessionStore.getAuthCodeFlow(state);
29
+ const flow = await session_store_1.sessionStore.consumeAuthCodeFlow(state).catch((err) => {
30
+ (0, logger_1.logError)('Failed to read authorization flow', { err: err });
31
+ return undefined;
32
+ });
24
33
  if (flow) {
25
- session_store_1.sessionStore.deleteAuthCodeFlow(state);
26
- const redirectUrl = new URL(flow.clientRedirectUri);
27
- redirectUrl.searchParams.set('error', error);
28
- if (error_description) {
29
- redirectUrl.searchParams.set('error_description', error_description);
30
- }
31
- if (flow.clientState) {
32
- redirectUrl.searchParams.set('state', flow.clientState);
33
- }
34
- res.redirect(redirectUrl.toString());
34
+ res.redirect((0, authorization_response_1.authorizationRedirect)(flow.clientRedirectUri, config.issuer, {
35
+ error,
36
+ error_description,
37
+ state: flow.clientState,
38
+ }));
35
39
  return;
36
40
  }
37
41
  }
@@ -55,7 +59,18 @@ async function callbackHandler(req, res) {
55
59
  });
56
60
  return;
57
61
  }
58
- const flow = session_store_1.sessionStore.getAuthCodeFlow(state);
62
+ let flow;
63
+ try {
64
+ flow = await session_store_1.sessionStore.getAuthCodeFlow(state);
65
+ }
66
+ catch (err) {
67
+ (0, logger_1.logError)('Failed to read authorization flow', { err: err });
68
+ res.status(503).json({
69
+ error: 'temporarily_unavailable',
70
+ error_description: 'Authorization storage is unavailable. Please try again.',
71
+ });
72
+ return;
73
+ }
59
74
  if (!flow) {
60
75
  res.status(400).json({
61
76
  error: 'invalid_request',
@@ -64,7 +79,7 @@ async function callbackHandler(req, res) {
64
79
  return;
65
80
  }
66
81
  if (Date.now() > flow.expiresAt) {
67
- session_store_1.sessionStore.deleteAuthCodeFlow(state);
82
+ await session_store_1.sessionStore.deleteAuthCodeFlow(state).catch(() => false);
68
83
  res.status(400).json({
69
84
  error: 'invalid_request',
70
85
  error_description: 'Authorization flow expired. Please start again.',
@@ -72,21 +87,16 @@ async function callbackHandler(req, res) {
72
87
  return;
73
88
  }
74
89
  try {
75
- const gitlabTokens = await (0, gitlab_device_flow_1.exchangeGitLabAuthCode)(code, flow.callbackUri, config);
76
- const userInfo = await (0, gitlab_device_flow_1.getGitLabUser)(gitlabTokens.access_token);
90
+ const app = await (0, instance_app_1.oauthAppFor)(config, flow.selectedInstance);
91
+ if (!app) {
92
+ throw new Error('GitLab instance is no longer configured');
93
+ }
94
+ const gitlabTokens = flow.gitlabTokens ?? (await exchangeCode(state, flow, code, config, app));
95
+ const userInfo = await (0, gitlab_device_flow_1.getGitLabUser)(gitlabTokens.access_token, app.baseUrl);
77
96
  const sessionId = (0, token_utils_1.generateSessionId)();
78
97
  const now = Date.now();
79
98
  const mcpAuthCode = (0, token_utils_1.generateAuthorizationCode)();
80
- session_store_1.sessionStore.storeAuthCode({
81
- code: mcpAuthCode,
82
- sessionId,
83
- clientId: flow.clientId,
84
- codeChallenge: flow.codeChallenge,
85
- codeChallengeMethod: flow.codeChallengeMethod,
86
- redirectUri: flow.clientRedirectUri,
87
- expiresAt: now + 10 * 60 * 1000,
88
- });
89
- session_store_1.sessionStore.createSession({
99
+ await session_store_1.sessionStore.createSession({
90
100
  id: sessionId,
91
101
  mcpAccessToken: '',
92
102
  mcpRefreshToken: '',
@@ -94,41 +104,68 @@ async function callbackHandler(req, res) {
94
104
  gitlabAccessToken: gitlabTokens.access_token,
95
105
  gitlabRefreshToken: gitlabTokens.refresh_token,
96
106
  gitlabTokenExpiry: (0, token_utils_1.calculateTokenExpiry)(gitlabTokens.expires_in),
107
+ gitlabScopes: (0, granted_scopes_1.grantedGitlabScopes)(gitlabTokens.scope, flow.requestedGitlabScopes),
97
108
  gitlabUserId: userInfo.id,
98
109
  gitlabUsername: userInfo.username,
99
110
  gitlabApiUrl: flow.selectedInstance ?? config_2.GITLAB_BASE_URL,
100
111
  instanceLabel: flow.selectedInstanceLabel,
101
112
  clientId: flow.clientId,
102
- scopes: ['mcp:tools', 'mcp:resources'],
113
+ scopes: flow.scopes ?? [...resource_1.MCP_SCOPES],
114
+ resource: flow.resource,
103
115
  createdAt: now,
104
116
  updatedAt: now,
105
117
  });
106
- session_store_1.sessionStore.deleteAuthCodeFlow(state);
118
+ await session_store_1.sessionStore.storeAuthCode({
119
+ code: mcpAuthCode,
120
+ sessionId,
121
+ clientId: flow.clientId,
122
+ codeChallenge: flow.codeChallenge,
123
+ codeChallengeMethod: flow.codeChallengeMethod,
124
+ redirectUri: flow.clientRedirectUri,
125
+ expiresAt: now + 10 * 60 * 1000,
126
+ });
127
+ if (!(await session_store_1.sessionStore.consumeAuthCodeFlow(state))) {
128
+ await (0, authorize_1.discardCompletion)(sessionId, mcpAuthCode);
129
+ res.status(400).json({
130
+ error: 'invalid_request',
131
+ error_description: 'Authorization was already completed.',
132
+ });
133
+ return;
134
+ }
107
135
  (0, logger_1.logInfo)('Authorization Code Flow completed successfully', {
108
136
  sessionId: (0, logger_1.truncateId)(sessionId),
109
137
  userId: userInfo.id,
110
138
  username: userInfo.username,
111
139
  });
112
- const redirectUrl = new URL(flow.clientRedirectUri);
113
- redirectUrl.searchParams.set('code', mcpAuthCode);
114
- if (flow.clientState) {
115
- redirectUrl.searchParams.set('state', flow.clientState);
116
- }
117
140
  (0, logger_1.logDebug)('Redirecting to client with authorization code', {
118
141
  redirectUri: flow.clientRedirectUri,
119
142
  });
120
- res.redirect(redirectUrl.toString());
143
+ res.redirect((0, authorization_response_1.authorizationRedirect)(flow.clientRedirectUri, config.issuer, {
144
+ code: mcpAuthCode,
145
+ state: flow.clientState,
146
+ }));
121
147
  }
122
148
  catch (error) {
123
149
  (0, logger_1.logError)('Failed to complete authorization code flow', { err: error });
124
- session_store_1.sessionStore.deleteAuthCodeFlow(state);
125
- const redirectUrl = new URL(flow.clientRedirectUri);
126
- redirectUrl.searchParams.set('error', 'server_error');
127
- redirectUrl.searchParams.set('error_description', error instanceof Error ? error.message : 'Failed to complete authorization');
128
- if (flow.clientState) {
129
- redirectUrl.searchParams.set('state', flow.clientState);
130
- }
131
- res.redirect(redirectUrl.toString());
150
+ res.redirect((0, authorization_response_1.authorizationRedirect)(flow.clientRedirectUri, config.issuer, {
151
+ error: 'server_error',
152
+ error_description: error instanceof Error ? error.message : 'Failed to complete authorization',
153
+ state: flow.clientState,
154
+ }));
155
+ }
156
+ }
157
+ async function exchangeCode(state, flow, code, config, app) {
158
+ let tokens;
159
+ try {
160
+ tokens = await (0, gitlab_device_flow_1.exchangeGitLabAuthCode)(code, flow.callbackUri, config, app);
161
+ }
162
+ catch (error) {
163
+ const current = await session_store_1.sessionStore.getAuthCodeFlow(state);
164
+ if (current?.gitlabTokens)
165
+ return current.gitlabTokens;
166
+ throw error;
132
167
  }
168
+ await (0, issued_tokens_1.keepIssuedTokens)(() => session_store_1.sessionStore.storeAuthCodeFlow(state, { ...flow, gitlabTokens: tokens }));
169
+ return tokens;
133
170
  }
134
171
  //# sourceMappingURL=callback.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"callback.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/callback.ts"],"names":[],"mappings":"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"}
@@ -3,3 +3,4 @@ export { authorizeHandler, pollHandler } from './authorize';
3
3
  export { callbackHandler } from './callback';
4
4
  export { tokenHandler } from './token';
5
5
  export { registerHandler, getRegisteredClient, isValidRedirectUri } from './register';
6
+ export { revokeHandler } from './revoke';
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isValidRedirectUri = exports.getRegisteredClient = exports.registerHandler = exports.tokenHandler = exports.callbackHandler = exports.pollHandler = exports.authorizeHandler = exports.getBaseUrl = exports.protectedResourceHandler = exports.metadataHandler = void 0;
3
+ exports.revokeHandler = exports.isValidRedirectUri = exports.getRegisteredClient = exports.registerHandler = exports.tokenHandler = exports.callbackHandler = exports.pollHandler = exports.authorizeHandler = exports.getBaseUrl = exports.protectedResourceHandler = exports.metadataHandler = void 0;
4
4
  var metadata_1 = require("./metadata");
5
5
  Object.defineProperty(exports, "metadataHandler", { enumerable: true, get: function () { return metadata_1.metadataHandler; } });
6
6
  Object.defineProperty(exports, "protectedResourceHandler", { enumerable: true, get: function () { return metadata_1.protectedResourceHandler; } });
@@ -16,4 +16,6 @@ var register_1 = require("./register");
16
16
  Object.defineProperty(exports, "registerHandler", { enumerable: true, get: function () { return register_1.registerHandler; } });
17
17
  Object.defineProperty(exports, "getRegisteredClient", { enumerable: true, get: function () { return register_1.getRegisteredClient; } });
18
18
  Object.defineProperty(exports, "isValidRedirectUri", { enumerable: true, get: function () { return register_1.isValidRedirectUri; } });
19
+ var revoke_1 = require("./revoke");
20
+ Object.defineProperty(exports, "revokeHandler", { enumerable: true, get: function () { return revoke_1.revokeHandler; } });
19
21
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/index.ts"],"names":[],"mappings":";;;AAMA,uCAAmF;AAA1E,2GAAA,eAAe,OAAA;AAAE,oHAAA,wBAAwB,OAAA;AAAE,sGAAA,UAAU,OAAA;AAC9D,yCAA4D;AAAnD,6GAAA,gBAAgB,OAAA;AAAE,wGAAA,WAAW,OAAA;AACtC,uCAA6C;AAApC,2GAAA,eAAe,OAAA;AACxB,iCAAuC;AAA9B,qGAAA,YAAY,OAAA;AACrB,uCAAsF;AAA7E,2GAAA,eAAe,OAAA;AAAE,+GAAA,mBAAmB,OAAA;AAAE,8GAAA,kBAAkB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/index.ts"],"names":[],"mappings":";;;AAMA,uCAAmF;AAA1E,2GAAA,eAAe,OAAA;AAAE,oHAAA,wBAAwB,OAAA;AAAE,sGAAA,UAAU,OAAA;AAC9D,yCAA4D;AAAnD,6GAAA,gBAAgB,OAAA;AAAE,wGAAA,WAAW,OAAA;AACtC,uCAA6C;AAApC,2GAAA,eAAe,OAAA;AACxB,iCAAuC;AAA9B,qGAAA,YAAY,OAAA;AACrB,uCAAsF;AAA7E,2GAAA,eAAe,OAAA;AAAE,+GAAA,mBAAmB,OAAA;AAAE,8GAAA,kBAAkB,OAAA;AACjE,mCAAyC;AAAhC,uGAAA,aAAa,OAAA"}
@@ -1,5 +1,5 @@
1
1
  import { Request, Response } from 'express';
2
2
  export declare const MCP_PROTOCOL_VERSION = "2025-03-26";
3
3
  export declare function getBaseUrl(req: Request): string;
4
- export declare function metadataHandler(req: Request, res: Response): void;
4
+ export declare function metadataHandler(_req: Request, res: Response): void;
5
5
  export declare function protectedResourceHandler(req: Request, res: Response): void;
@@ -5,6 +5,8 @@ exports.getBaseUrl = getBaseUrl;
5
5
  exports.metadataHandler = metadataHandler;
6
6
  exports.protectedResourceHandler = protectedResourceHandler;
7
7
  const config_1 = require("../../config");
8
+ const config_2 = require("../config");
9
+ const resource_1 = require("../resource");
8
10
  exports.MCP_PROTOCOL_VERSION = '2025-03-26';
9
11
  function getBaseUrl(req) {
10
12
  const forwardedProto = req.get('x-forwarded-proto');
@@ -13,8 +15,13 @@ function getBaseUrl(req) {
13
15
  const host = forwardedHost ?? req.get('host') ?? `${config_1.HOST}:${config_1.PORT}`;
14
16
  return `${protocol}://${host}`;
15
17
  }
16
- function metadataHandler(req, res) {
17
- const baseUrl = getBaseUrl(req);
18
+ function metadataHandler(_req, res) {
19
+ const config = (0, config_2.loadOAuthConfig)();
20
+ if (!config) {
21
+ res.status(500).json({ error: 'server_error', error_description: 'OAuth not configured' });
22
+ return;
23
+ }
24
+ const baseUrl = config.issuer;
18
25
  const metadata = {
19
26
  issuer: baseUrl,
20
27
  authorization_endpoint: `${baseUrl}/authorize`,
@@ -22,19 +29,27 @@ function metadataHandler(req, res) {
22
29
  response_types_supported: ['code'],
23
30
  grant_types_supported: ['authorization_code', 'refresh_token'],
24
31
  code_challenge_methods_supported: ['S256'],
25
- token_endpoint_auth_methods_supported: ['none'],
26
- scopes_supported: ['mcp:tools', 'mcp:resources'],
32
+ token_endpoint_auth_methods_supported: resource_1.TOKEN_ENDPOINT_AUTH_METHODS,
33
+ scopes_supported: resource_1.MCP_SCOPES,
34
+ authorization_response_iss_parameter_supported: true,
27
35
  registration_endpoint: `${baseUrl}/register`,
36
+ revocation_endpoint: `${baseUrl}/revoke`,
37
+ revocation_endpoint_auth_methods_supported: resource_1.TOKEN_ENDPOINT_AUTH_METHODS,
28
38
  mcp_version: exports.MCP_PROTOCOL_VERSION,
29
39
  };
30
40
  res.json(metadata);
31
41
  }
32
42
  function protectedResourceHandler(req, res) {
33
- const baseUrl = getBaseUrl(req);
43
+ const config = (0, config_2.loadOAuthConfig)();
44
+ if (!config) {
45
+ res.status(500).json({ error: 'server_error', error_description: 'OAuth not configured' });
46
+ return;
47
+ }
48
+ const [root, mcp] = (0, resource_1.protectedResources)(config.issuer);
34
49
  const metadata = {
35
- resource: baseUrl,
36
- authorization_servers: [baseUrl],
37
- scopes_supported: ['mcp:tools', 'mcp:resources'],
50
+ resource: (0, resource_1.resourceForMetadataPath)(config.issuer, req.path) ?? (req.path.endsWith('/mcp') ? mcp : root),
51
+ authorization_servers: [config.issuer],
52
+ scopes_supported: resource_1.MCP_SCOPES,
38
53
  bearer_methods_supported: ['header'],
39
54
  };
40
55
  res.json(metadata);
@@ -1 +1 @@
1
- {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/metadata.ts"],"names":[],"mappings":";;;AA0BA,gCAUC;AAaD,0CAsCC;AAWD,4DAmBC;AA3GD,yCAA0C;AAM7B,QAAA,oBAAoB,GAAG,YAAY,CAAC;AAUjD,SAAgB,UAAU,CAAC,GAAY;IAErC,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,cAAc,IAAI,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC;IAG1D,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,aAAa,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,aAAI,IAAI,aAAI,EAAE,CAAC;IAEnE,OAAO,GAAG,QAAQ,MAAM,IAAI,EAAE,CAAC;AACjC,CAAC;AAaD,SAAgB,eAAe,CAAC,GAAY,EAAE,GAAa;IACzD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAGhC,MAAM,QAAQ,GAAG;QAEf,MAAM,EAAE,OAAO;QAGf,sBAAsB,EAAE,GAAG,OAAO,YAAY;QAG9C,cAAc,EAAE,GAAG,OAAO,QAAQ;QAGlC,wBAAwB,EAAE,CAAC,MAAM,CAAC;QAGlC,qBAAqB,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;QAG9D,gCAAgC,EAAE,CAAC,MAAM,CAAC;QAI1C,qCAAqC,EAAE,CAAC,MAAM,CAAC;QAG/C,gBAAgB,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;QAGhD,qBAAqB,EAAE,GAAG,OAAO,WAAW;QAG5C,WAAW,EAAE,4BAAoB;KAClC,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACrB,CAAC;AAWD,SAAgB,wBAAwB,CAAC,GAAY,EAAE,GAAa;IAClE,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAGhC,MAAM,QAAQ,GAAG;QAEf,QAAQ,EAAE,OAAO;QAGjB,qBAAqB,EAAE,CAAC,OAAO,CAAC;QAGhC,gBAAgB,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;QAGhD,wBAAwB,EAAE,CAAC,QAAQ,CAAC;KACrC,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACrB,CAAC"}
1
+ {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/metadata.ts"],"names":[],"mappings":";;;AAiCA,gCAUC;AAaD,0CAoDC;AAWD,4DA0BC;AAvID,yCAA0C;AAC1C,sCAA4C;AAC5C,0CAKqB;AAMR,QAAA,oBAAoB,GAAG,YAAY,CAAC;AAUjD,SAAgB,UAAU,CAAC,GAAY;IAErC,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,cAAc,IAAI,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC;IAG1D,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,aAAa,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,aAAI,IAAI,aAAI,EAAE,CAAC;IAEnE,OAAO,GAAG,QAAQ,MAAM,IAAI,EAAE,CAAC;AACjC,CAAC;AAaD,SAAgB,eAAe,CAAC,IAAa,EAAE,GAAa;IAC1D,MAAM,MAAM,GAAG,IAAA,wBAAe,GAAE,CAAC;IACjC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAC3F,OAAO;IACT,CAAC;IAGD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IAG9B,MAAM,QAAQ,GAAG;QAEf,MAAM,EAAE,OAAO;QAGf,sBAAsB,EAAE,GAAG,OAAO,YAAY;QAG9C,cAAc,EAAE,GAAG,OAAO,QAAQ;QAGlC,wBAAwB,EAAE,CAAC,MAAM,CAAC;QAGlC,qBAAqB,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;QAG9D,gCAAgC,EAAE,CAAC,MAAM,CAAC;QAI1C,qCAAqC,EAAE,sCAA2B;QAGlE,gBAAgB,EAAE,qBAAU;QAG5B,8CAA8C,EAAE,IAAI;QAGpD,qBAAqB,EAAE,GAAG,OAAO,WAAW;QAG5C,mBAAmB,EAAE,GAAG,OAAO,SAAS;QACxC,0CAA0C,EAAE,sCAA2B;QAGvE,WAAW,EAAE,4BAAoB;KAClC,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACrB,CAAC;AAWD,SAAgB,wBAAwB,CAAC,GAAY,EAAE,GAAa;IAClE,MAAM,MAAM,GAAG,IAAA,wBAAe,GAAE,CAAC;IACjC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAC3F,OAAO;IACT,CAAC;IACD,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAGtD,MAAM,QAAQ,GAAG;QAGf,QAAQ,EACN,IAAA,kCAAuB,EAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;QAG9F,qBAAqB,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QAGtC,gBAAgB,EAAE,qBAAU;QAG5B,wBAAwB,EAAE,CAAC,QAAQ,CAAC;KACrC,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACrB,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { Request, Response } from 'express';
2
+ export declare const REGISTRATIONS_PER_SOURCE_PER_HOUR = 100;
2
3
  interface RegisteredClient {
3
4
  client_id: string;
4
5
  client_secret?: string;
@@ -10,6 +11,6 @@ interface RegisteredClient {
10
11
  created_at: number;
11
12
  }
12
13
  export declare function registerHandler(req: Request, res: Response): Promise<void>;
13
- export declare function getRegisteredClient(clientId: string): RegisteredClient | undefined;
14
- export declare function isValidRedirectUri(clientId: string, redirectUri: string): boolean;
14
+ export declare function getRegisteredClient(clientId: string): Promise<RegisteredClient | undefined>;
15
+ export declare function isValidRedirectUri(clientId: string, redirectUri: string): Promise<boolean>;
15
16
  export {};
@@ -1,15 +1,49 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.REGISTRATIONS_PER_SOURCE_PER_HOUR = void 0;
3
4
  exports.registerHandler = registerHandler;
4
5
  exports.getRegisteredClient = getRegisteredClient;
5
6
  exports.isValidRedirectUri = isValidRedirectUri;
6
- const crypto_1 = require("crypto");
7
+ const node_crypto_1 = require("node:crypto");
7
8
  const logger_1 = require("../../logger");
8
- const registeredClients = new Map();
9
+ const config_1 = require("../config");
10
+ const session_store_1 = require("../session-store");
11
+ const resource_1 = require("../resource");
12
+ exports.REGISTRATIONS_PER_SOURCE_PER_HOUR = 100;
13
+ const REGISTRATION_WINDOW_MS = 60 * 60 * 1000;
14
+ const UNUSED_REGISTRATION_TTL_MS = 24 * 60 * 60 * 1000;
15
+ function registrationSource(req, secret) {
16
+ const address = req.ip ?? req.socket?.remoteAddress ?? 'unknown';
17
+ return (0, node_crypto_1.createHmac)('sha256', secret).update(address).digest('base64url').slice(0, 22);
18
+ }
19
+ function toRegisteredClient(client) {
20
+ return {
21
+ client_id: client.clientId,
22
+ client_secret: client.clientSecret,
23
+ redirect_uris: client.redirectUris,
24
+ client_name: client.clientName,
25
+ token_endpoint_auth_method: client.tokenEndpointAuthMethod,
26
+ grant_types: client.grantTypes,
27
+ response_types: client.responseTypes,
28
+ created_at: client.createdAt,
29
+ };
30
+ }
9
31
  async function registerHandler(req, res) {
32
+ const config = (0, config_1.loadOAuthConfig)();
33
+ if (!config) {
34
+ res.status(500).json({ error: 'server_error', error_description: 'OAuth not configured' });
35
+ return;
36
+ }
10
37
  try {
11
38
  const body = req.body;
12
39
  const { redirect_uris, client_name, token_endpoint_auth_method = 'none', grant_types = ['authorization_code', 'refresh_token'], response_types = ['code'], } = body;
40
+ if (!resource_1.TOKEN_ENDPOINT_AUTH_METHODS.includes(token_endpoint_auth_method)) {
41
+ res.status(400).json({
42
+ error: 'invalid_client_metadata',
43
+ error_description: `token_endpoint_auth_method must be one of ${resource_1.TOKEN_ENDPOINT_AUTH_METHODS.join(', ')}`,
44
+ });
45
+ return;
46
+ }
13
47
  if (!redirect_uris || !Array.isArray(redirect_uris) || redirect_uris.length === 0) {
14
48
  res.status(400).json({
15
49
  error: 'invalid_client_metadata',
@@ -29,22 +63,35 @@ async function registerHandler(req, res) {
29
63
  return;
30
64
  }
31
65
  }
32
- const client_id = (0, crypto_1.randomUUID)();
66
+ const createdAt = Date.now();
67
+ const registeredFrom = registrationSource(req, config.sessionSecret);
68
+ const recent = await session_store_1.sessionStore.countClientsRegisteredSince(registeredFrom, createdAt - REGISTRATION_WINDOW_MS);
69
+ if (recent >= exports.REGISTRATIONS_PER_SOURCE_PER_HOUR) {
70
+ (0, logger_1.logWarn)('Client registration refused: hourly limit of the source reached', { recent });
71
+ res.set('Retry-After', String(REGISTRATION_WINDOW_MS / 1000));
72
+ res.status(429).json({
73
+ error: 'temporarily_unavailable',
74
+ error_description: 'Too many client registrations from this address; retry later',
75
+ });
76
+ return;
77
+ }
78
+ const client_id = (0, node_crypto_1.randomUUID)();
33
79
  let client_secret;
34
80
  if (token_endpoint_auth_method !== 'none') {
35
- client_secret = (0, crypto_1.randomUUID)() + (0, crypto_1.randomUUID)();
81
+ client_secret = (0, node_crypto_1.randomUUID)() + (0, node_crypto_1.randomUUID)();
36
82
  }
37
- const clientData = {
38
- client_id,
39
- client_secret,
40
- redirect_uris,
41
- client_name,
42
- token_endpoint_auth_method,
43
- grant_types,
44
- response_types,
45
- created_at: Date.now(),
46
- };
47
- registeredClients.set(client_id, clientData);
83
+ await session_store_1.sessionStore.storeClient({
84
+ clientId: client_id,
85
+ clientSecret: client_secret,
86
+ redirectUris: redirect_uris,
87
+ clientName: client_name,
88
+ tokenEndpointAuthMethod: token_endpoint_auth_method,
89
+ grantTypes: grant_types,
90
+ responseTypes: response_types,
91
+ createdAt,
92
+ registeredFrom,
93
+ expiresAt: createdAt + UNUSED_REGISTRATION_TTL_MS,
94
+ });
48
95
  (0, logger_1.logInfo)('New OAuth client registered via DCR', {
49
96
  client_id,
50
97
  client_name,
@@ -72,11 +119,15 @@ async function registerHandler(req, res) {
72
119
  });
73
120
  }
74
121
  }
75
- function getRegisteredClient(clientId) {
76
- return registeredClients.get(clientId);
122
+ async function getRegisteredClient(clientId) {
123
+ const client = await session_store_1.sessionStore.getClient(clientId);
124
+ if (!client || (client.expiresAt !== undefined && client.expiresAt < Date.now())) {
125
+ return undefined;
126
+ }
127
+ return toRegisteredClient(client);
77
128
  }
78
- function isValidRedirectUri(clientId, redirectUri) {
79
- const client = registeredClients.get(clientId);
129
+ async function isValidRedirectUri(clientId, redirectUri) {
130
+ const client = await getRegisteredClient(clientId);
80
131
  if (!client) {
81
132
  return true;
82
133
  }
@@ -1 +1 @@
1
- {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/register.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/oauth/endpoints/register.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import { Request, Response } from 'express';
2
+ export declare function revokeHandler(req: Request, res: Response): Promise<void>;
@@ -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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"}