@structured-world/gitlab-mcp 11.0.0 → 12.0.1
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 +4 -4
- package/README.md.in +1 -1
- package/dist/src/accounts/chat-accounts.d.ts +17 -0
- package/dist/src/accounts/chat-accounts.js +245 -0
- package/dist/src/accounts/chat-accounts.js.map +1 -0
- package/dist/src/accounts/instance-tokens.d.ts +2 -0
- package/dist/src/accounts/instance-tokens.js +43 -0
- package/dist/src/accounts/instance-tokens.js.map +1 -0
- package/dist/src/accounts/link.d.ts +16 -0
- package/dist/src/accounts/link.js +469 -0
- package/dist/src/accounts/link.js.map +1 -0
- package/dist/src/accounts/token-account.d.ts +6 -0
- package/dist/src/accounts/token-account.js +13 -0
- package/dist/src/accounts/token-account.js.map +1 -0
- package/dist/src/cli/init/config-generator.d.ts +3 -2
- package/dist/src/cli/init/config-generator.js +15 -0
- package/dist/src/cli/init/config-generator.js.map +1 -1
- package/dist/src/cli/init/types.d.ts +7 -2
- package/dist/src/cli/init/types.js +9 -0
- package/dist/src/cli/init/types.js.map +1 -1
- package/dist/src/cli/init/wizard.js +31 -1
- package/dist/src/cli/init/wizard.js.map +1 -1
- package/dist/src/cli/install/codex.d.ts +25 -0
- package/dist/src/cli/install/codex.js +261 -0
- package/dist/src/cli/install/codex.js.map +1 -0
- package/dist/src/cli/install/detector.js +22 -0
- package/dist/src/cli/install/detector.js.map +1 -1
- package/dist/src/cli/install/index.d.ts +2 -1
- package/dist/src/cli/install/index.js +3 -1
- package/dist/src/cli/install/index.js.map +1 -1
- package/dist/src/cli/install/install-command.d.ts +5 -2
- package/dist/src/cli/install/install-command.js +52 -8
- package/dist/src/cli/install/install-command.js.map +1 -1
- package/dist/src/cli/install/installers.d.ts +8 -8
- package/dist/src/cli/install/installers.js +18 -3
- package/dist/src/cli/install/installers.js.map +1 -1
- package/dist/src/cli/install/notes.d.ts +2 -0
- package/dist/src/cli/install/notes.js +8 -0
- package/dist/src/cli/install/notes.js.map +1 -0
- package/dist/src/cli/install/types.d.ts +1 -0
- package/dist/src/cli/install/types.js +12 -0
- package/dist/src/cli/install/types.js.map +1 -1
- package/dist/src/cli/plugin/build.d.ts +23 -0
- package/dist/src/cli/plugin/build.js +165 -0
- package/dist/src/cli/plugin/build.js.map +1 -0
- package/dist/src/cli/plugin/command.d.ts +4 -0
- package/dist/src/cli/plugin/command.js +89 -0
- package/dist/src/cli/plugin/command.js.map +1 -0
- package/dist/src/cli/plugin/index.d.ts +5 -0
- package/dist/src/cli/plugin/index.js +15 -0
- package/dist/src/cli/plugin/index.js.map +1 -0
- package/dist/src/cli/plugin/listing.d.ts +21 -0
- package/dist/src/cli/plugin/listing.js +44 -0
- package/dist/src/cli/plugin/listing.js.map +1 -0
- package/dist/src/cli/plugin/validate.d.ts +21 -0
- package/dist/src/cli/plugin/validate.js +496 -0
- package/dist/src/cli/plugin/validate.js.map +1 -0
- package/dist/src/cli/plugin/zip.d.ts +6 -0
- package/dist/src/cli/plugin/zip.js +83 -0
- package/dist/src/cli/plugin/zip.js.map +1 -0
- package/dist/src/cli/setup/flows/configure-existing.js +5 -0
- package/dist/src/cli/setup/flows/configure-existing.js.map +1 -1
- package/dist/src/cli/setup/flows/local-setup.js +3 -0
- package/dist/src/cli/setup/flows/local-setup.js.map +1 -1
- package/dist/src/cli-utils.d.ts +2 -0
- package/dist/src/cli-utils.js +6 -0
- package/dist/src/cli-utils.js.map +1 -1
- package/dist/src/config/instances-schema.d.ts +2 -0
- package/dist/src/config/instances-schema.js +5 -0
- package/dist/src/config/instances-schema.js.map +1 -1
- package/dist/src/config.d.ts +1 -1
- package/dist/src/config.js +6 -10
- package/dist/src/config.js.map +1 -1
- package/dist/src/configuration/default-project.d.ts +8 -0
- package/dist/src/configuration/default-project.js +83 -0
- package/dist/src/configuration/default-project.js.map +1 -0
- package/dist/src/configuration/operator-ownership.d.ts +7 -0
- package/dist/src/configuration/operator-ownership.js +216 -0
- package/dist/src/configuration/operator-ownership.js.map +1 -0
- package/dist/src/configuration/operator-projects.d.ts +16 -0
- package/dist/src/configuration/operator-projects.js +117 -0
- package/dist/src/configuration/operator-projects.js.map +1 -0
- package/dist/src/configuration/policy.d.ts +1 -0
- package/dist/src/configuration/policy.js +3 -0
- package/dist/src/configuration/policy.js.map +1 -1
- package/dist/src/configuration/scope-ids.js +5 -4
- package/dist/src/configuration/scope-ids.js.map +1 -1
- package/dist/src/configuration/scoped-execution.js +32 -10
- package/dist/src/configuration/scoped-execution.js.map +1 -1
- package/dist/src/configuration/service.d.ts +0 -1
- package/dist/src/configuration/service.js +0 -17
- package/dist/src/configuration/service.js.map +1 -1
- package/dist/src/contracts/storage.d.ts +2 -2
- package/dist/src/entities/access_tokens/registry.js +7 -6
- package/dist/src/entities/access_tokens/registry.js.map +1 -1
- package/dist/src/entities/audit_events/registry.js +5 -4
- package/dist/src/entities/audit_events/registry.js.map +1 -1
- package/dist/src/entities/context/accounts.d.ts +19 -0
- package/dist/src/entities/context/accounts.js +115 -0
- package/dist/src/entities/context/accounts.js.map +1 -0
- package/dist/src/entities/context/context-manager.d.ts +0 -1
- package/dist/src/entities/context/context-manager.js +0 -82
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/handlers.d.ts +3 -1
- package/dist/src/entities/context/handlers.js +9 -0
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/output-schema.d.ts +49 -1
- package/dist/src/entities/context/output-schema.js +28 -0
- package/dist/src/entities/context/output-schema.js.map +1 -1
- package/dist/src/entities/context/registry.js +1 -1
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +26 -0
- package/dist/src/entities/context/schema.js +30 -0
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/scope-search.js +5 -0
- package/dist/src/entities/context/scope-search.js.map +1 -1
- package/dist/src/entities/core/registry.js +8 -7
- package/dist/src/entities/core/registry.js.map +1 -1
- package/dist/src/entities/core/schema-readonly.d.ts +4 -4
- package/dist/src/entities/core/schema-readonly.js +1 -1
- package/dist/src/entities/core/schema-readonly.js.map +1 -1
- package/dist/src/entities/deploy-keys/registry.js +4 -3
- package/dist/src/entities/deploy-keys/registry.js.map +1 -1
- package/dist/src/entities/environments/registry.js +3 -2
- package/dist/src/entities/environments/registry.js.map +1 -1
- package/dist/src/entities/environments/schema-readonly.d.ts +1 -1
- package/dist/src/entities/files/registry.js +2 -1
- package/dist/src/entities/files/registry.js.map +1 -1
- package/dist/src/entities/integrations/registry.js +8 -7
- package/dist/src/entities/integrations/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/iterations/schema-readonly.js +1 -1
- package/dist/src/entities/iterations/schema-readonly.js.map +1 -1
- package/dist/src/entities/job-token-scope/registry.js +2 -1
- package/dist/src/entities/job-token-scope/registry.js.map +1 -1
- package/dist/src/entities/members/registry.js +13 -12
- package/dist/src/entities/members/registry.js.map +1 -1
- package/dist/src/entities/members/schema-readonly.js +2 -2
- package/dist/src/entities/members/schema-readonly.js.map +1 -1
- package/dist/src/entities/members/schema.d.ts +2 -2
- package/dist/src/entities/members/schema.js +10 -6
- package/dist/src/entities/members/schema.js.map +1 -1
- package/dist/src/entities/milestones/registry.js +8 -7
- package/dist/src/entities/milestones/registry.js.map +1 -1
- package/dist/src/entities/milestones/schema-readonly.js +1 -1
- package/dist/src/entities/milestones/schema-readonly.js.map +1 -1
- package/dist/src/entities/milestones/schema.js +1 -1
- package/dist/src/entities/milestones/schema.js.map +1 -1
- package/dist/src/entities/mrs/registry.js +26 -25
- package/dist/src/entities/mrs/registry.js.map +1 -1
- package/dist/src/entities/mrs/schema-readonly.js +3 -3
- package/dist/src/entities/mrs/schema-readonly.js.map +1 -1
- package/dist/src/entities/mrs/schema.d.ts +1 -1
- package/dist/src/entities/mrs/schema.js +9 -6
- package/dist/src/entities/mrs/schema.js.map +1 -1
- package/dist/src/entities/pipelines/registry.js +31 -39
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/entities/pipelines/schema-readonly.d.ts +8 -8
- package/dist/src/entities/pipelines/schema-readonly.js +10 -7
- package/dist/src/entities/pipelines/schema-readonly.js.map +1 -1
- package/dist/src/entities/pipelines/schema.js +2 -2
- package/dist/src/entities/pipelines/schema.js.map +1 -1
- package/dist/src/entities/pipelines/trace.d.ts +20 -0
- package/dist/src/entities/pipelines/trace.js +156 -0
- package/dist/src/entities/pipelines/trace.js.map +1 -0
- package/dist/src/entities/refs/registry.js +3 -2
- package/dist/src/entities/refs/registry.js.map +1 -1
- package/dist/src/entities/releases/registry.js +5 -3
- package/dist/src/entities/releases/registry.js.map +1 -1
- package/dist/src/entities/releases/schema.js +1 -1
- package/dist/src/entities/releases/schema.js.map +1 -1
- package/dist/src/entities/runners/project-access.js +7 -2
- package/dist/src/entities/runners/project-access.js.map +1 -1
- package/dist/src/entities/runners/registry.js +2 -1
- package/dist/src/entities/runners/registry.js.map +1 -1
- package/dist/src/entities/snippets/registry.js +10 -8
- package/dist/src/entities/snippets/registry.js.map +1 -1
- package/dist/src/entities/snippets/schema-readonly.js +1 -1
- package/dist/src/entities/snippets/schema-readonly.js.map +1 -1
- package/dist/src/entities/snippets/schema.js +2 -2
- package/dist/src/entities/snippets/schema.js.map +1 -1
- package/dist/src/entities/utils.d.ts +1 -0
- package/dist/src/entities/utils.js +2 -1
- package/dist/src/entities/utils.js.map +1 -1
- package/dist/src/entities/webhooks/registry.js +10 -8
- package/dist/src/entities/webhooks/registry.js.map +1 -1
- package/dist/src/entities/webhooks/schema-readonly.js +1 -1
- package/dist/src/entities/webhooks/schema-readonly.js.map +1 -1
- package/dist/src/entities/webhooks/schema.js +3 -3
- package/dist/src/entities/webhooks/schema.js.map +1 -1
- package/dist/src/handlers.js +175 -65
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/main.js +23 -5
- package/dist/src/main.js.map +1 -1
- package/dist/src/mcp-server-context.d.ts +3 -0
- package/dist/src/mcp-server-context.js +13 -0
- package/dist/src/mcp-server-context.js.map +1 -0
- package/dist/src/middleware/oauth-auth.js +5 -2
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/oauth/code-exchange.d.ts +7 -0
- package/dist/src/oauth/code-exchange.js +38 -0
- package/dist/src/oauth/code-exchange.js.map +1 -0
- package/dist/src/oauth/endpoints/callback.js +15 -17
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/revoke.js +2 -21
- package/dist/src/oauth/endpoints/revoke.js.map +1 -1
- package/dist/src/oauth/gitlab-token-refresh.d.ts +1 -0
- package/dist/src/oauth/gitlab-token-refresh.js +17 -0
- package/dist/src/oauth/gitlab-token-refresh.js.map +1 -1
- package/dist/src/oauth/grant-revocation.d.ts +10 -0
- package/dist/src/oauth/grant-revocation.js +179 -0
- package/dist/src/oauth/grant-revocation.js.map +1 -0
- package/dist/src/oauth/session-store.d.ts +8 -1
- package/dist/src/oauth/session-store.js +36 -3
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +7 -2
- package/dist/src/oauth/storage/file.js +30 -10
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.d.ts +13 -2
- package/dist/src/oauth/storage/memory.js +211 -14
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +21 -1
- package/dist/src/oauth/storage/types.js +6 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/oauth/types.d.ts +11 -0
- package/dist/src/profiles/scope-enforcer.d.ts +2 -0
- package/dist/src/profiles/scope-enforcer.js +37 -15
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/registry-manager.js +7 -0
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +21 -16
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/AdminDetector.d.ts +1 -1
- package/dist/src/services/AdminDetector.js +4 -4
- package/dist/src/services/AdminDetector.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +0 -1
- package/dist/src/services/ConnectionManager.js +18 -52
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/HealthMonitor.js +4 -2
- package/dist/src/services/HealthMonitor.js.map +1 -1
- package/dist/src/services/NamespaceTierDetector.js +26 -27
- package/dist/src/services/NamespaceTierDetector.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.d.ts +1 -1
- package/dist/src/services/TokenScopeDetector.js +3 -3
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/session-manager.d.ts +1 -1
- package/dist/src/session-manager.js +13 -5
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/utils/api-path.d.ts +5 -0
- package/dist/src/utils/api-path.js +54 -0
- package/dist/src/utils/api-path.js.map +1 -0
- package/dist/src/utils/fetch.d.ts +1 -1
- package/dist/src/utils/fetch.js +12 -5
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/gitlab-api.d.ts +6 -0
- package/dist/src/utils/gitlab-api.js +22 -4
- package/dist/src/utils/gitlab-api.js.map +1 -1
- package/dist/src/utils/gitlab-base-url.js +4 -0
- package/dist/src/utils/gitlab-base-url.js.map +1 -1
- package/dist/src/utils/namespace.js +2 -1
- package/dist/src/utils/namespace.js.map +1 -1
- package/dist/src/utils/projectIdentifier.js +10 -12
- package/dist/src/utils/projectIdentifier.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +28 -22
- package/plugin/assets/composer-icon-dark.png +0 -0
- package/plugin/assets/composer-icon-dark.svg +17 -0
- package/plugin/assets/composer-icon.png +0 -0
- package/plugin/assets/composer-icon.svg +17 -0
- package/plugin/assets/logo.png +0 -0
- package/plugin/assets/screenshot-1.png +0 -0
- package/plugin/assets/screenshot-2.png +0 -0
- package/plugin/schemas/mcp.schema.json +120 -0
- package/plugin/schemas/plugin.schema.json +65 -0
|
@@ -1,11 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MemoryStorageBackend = void 0;
|
|
4
|
+
const node_crypto_1 = require("node:crypto");
|
|
5
|
+
const types_1 = require("./types");
|
|
4
6
|
const logger_1 = require("../../logger");
|
|
5
|
-
|
|
7
|
+
const CLEANUP_BATCH = 5;
|
|
8
|
+
async function inBatches(items, run, from = 0) {
|
|
9
|
+
if (from >= items.length)
|
|
10
|
+
return;
|
|
11
|
+
await Promise.all(items.slice(from, from + CLEANUP_BATCH).map((item) => run(item)));
|
|
12
|
+
return inBatches(items, run, from + CLEANUP_BATCH);
|
|
13
|
+
}
|
|
14
|
+
function deleteExpired(entries, now, retained) {
|
|
6
15
|
let removed = 0;
|
|
7
16
|
for (const [key, entry] of entries) {
|
|
8
17
|
if (entry.expiresAt !== undefined && entry.expiresAt < now) {
|
|
18
|
+
if (retained?.has(key))
|
|
19
|
+
continue;
|
|
9
20
|
entries.delete(key);
|
|
10
21
|
removed++;
|
|
11
22
|
}
|
|
@@ -17,6 +28,7 @@ class MemoryStorageBackend {
|
|
|
17
28
|
sessions = new Map();
|
|
18
29
|
deviceFlows = new Map();
|
|
19
30
|
authCodeFlows = new Map();
|
|
31
|
+
abandonedFlowsInProgress = new Set();
|
|
20
32
|
authCodes = new Map();
|
|
21
33
|
tokenToSession = new Map();
|
|
22
34
|
refreshTokenToSession = new Map();
|
|
@@ -25,6 +37,8 @@ class MemoryStorageBackend {
|
|
|
25
37
|
accountSettings = new Map();
|
|
26
38
|
gitlabRefreshLeases = new Map();
|
|
27
39
|
cleanupIntervalId = null;
|
|
40
|
+
abandonedFlowGrant;
|
|
41
|
+
expiredSession;
|
|
28
42
|
silent;
|
|
29
43
|
constructor(options) {
|
|
30
44
|
this.silent = options?.silent ?? false;
|
|
@@ -35,14 +49,99 @@ class MemoryStorageBackend {
|
|
|
35
49
|
(0, logger_1.logInfo)('Memory storage backend initialized');
|
|
36
50
|
}
|
|
37
51
|
}
|
|
38
|
-
|
|
52
|
+
insertSession(session) {
|
|
53
|
+
if (this.sessions.has(session.id))
|
|
54
|
+
throw new Error(`Session ${session.id} already exists`);
|
|
39
55
|
this.sessions.set(session.id, session);
|
|
40
|
-
if (session.mcpAccessToken)
|
|
56
|
+
if (session.mcpAccessToken)
|
|
41
57
|
this.tokenToSession.set(session.mcpAccessToken, session.id);
|
|
42
|
-
|
|
43
|
-
if (session.mcpRefreshToken) {
|
|
58
|
+
if (session.mcpRefreshToken)
|
|
44
59
|
this.refreshTokenToSession.set(session.mcpRefreshToken, session.id);
|
|
60
|
+
}
|
|
61
|
+
restoreLinkedAccount({ account, internalState }, stored, previous, flow, accessOwner, refreshOwner) {
|
|
62
|
+
if (stored && previous) {
|
|
63
|
+
Object.assign(stored, previous);
|
|
64
|
+
stored.gitlabScopes = previous.gitlabScopes;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
this.sessions.delete(account.id);
|
|
68
|
+
if (account.mcpAccessToken) {
|
|
69
|
+
if (accessOwner === undefined)
|
|
70
|
+
this.tokenToSession.delete(account.mcpAccessToken);
|
|
71
|
+
else
|
|
72
|
+
this.tokenToSession.set(account.mcpAccessToken, accessOwner);
|
|
73
|
+
}
|
|
74
|
+
if (account.mcpRefreshToken) {
|
|
75
|
+
if (refreshOwner === undefined)
|
|
76
|
+
this.refreshTokenToSession.delete(account.mcpRefreshToken);
|
|
77
|
+
else
|
|
78
|
+
this.refreshTokenToSession.set(account.mcpRefreshToken, refreshOwner);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
this.authCodeFlows.set(internalState, flow);
|
|
82
|
+
}
|
|
83
|
+
async commitLinkedAccount(commit, persist) {
|
|
84
|
+
const { account, internalState, primaryLeaseUntil, existing } = commit;
|
|
85
|
+
const now = Date.now();
|
|
86
|
+
const parent = account.linkedToSessionId;
|
|
87
|
+
const flow = this.authCodeFlows.get(internalState);
|
|
88
|
+
if (!this.sessions.has(parent) ||
|
|
89
|
+
this.gitlabRefreshLeases.get(parent) !== primaryLeaseUntil ||
|
|
90
|
+
primaryLeaseUntil <= now ||
|
|
91
|
+
!flow ||
|
|
92
|
+
flow.expiresAt <= now ||
|
|
93
|
+
flow.link?.stage !== 'connect' ||
|
|
94
|
+
flow.link.sessionId !== parent ||
|
|
95
|
+
internalState.startsWith('cleanup:') ||
|
|
96
|
+
(flow.gitlabTokens &&
|
|
97
|
+
(flow.gitlabTokens.access_token !== account.gitlabAccessToken ||
|
|
98
|
+
flow.gitlabTokens.refresh_token !== account.gitlabRefreshToken)) ||
|
|
99
|
+
this.abandonedFlowsInProgress.has(internalState))
|
|
100
|
+
return false;
|
|
101
|
+
const stored = this.sessions.get(account.id);
|
|
102
|
+
let previous;
|
|
103
|
+
let previousAccessOwner;
|
|
104
|
+
let previousRefreshOwner;
|
|
105
|
+
if (existing) {
|
|
106
|
+
if (stored?.linkedToSessionId !== parent ||
|
|
107
|
+
stored.gitlabRefreshToken !== existing.refreshToken ||
|
|
108
|
+
this.gitlabRefreshLeases.get(account.id) !== existing.leaseUntil ||
|
|
109
|
+
existing.leaseUntil <= now)
|
|
110
|
+
return false;
|
|
111
|
+
if (persist)
|
|
112
|
+
previous = { ...stored };
|
|
113
|
+
Object.assign(stored, {
|
|
114
|
+
gitlabAccessToken: account.gitlabAccessToken,
|
|
115
|
+
gitlabRefreshToken: account.gitlabRefreshToken,
|
|
116
|
+
gitlabTokenExpiry: account.gitlabTokenExpiry,
|
|
117
|
+
gitlabScopes: account.gitlabScopes,
|
|
118
|
+
gitlabUsername: account.gitlabUsername,
|
|
119
|
+
updatedAt: now,
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
if (stored)
|
|
124
|
+
return false;
|
|
125
|
+
if (persist) {
|
|
126
|
+
previousAccessOwner = this.tokenToSession.get(account.mcpAccessToken);
|
|
127
|
+
previousRefreshOwner = this.refreshTokenToSession.get(account.mcpRefreshToken);
|
|
128
|
+
}
|
|
129
|
+
this.insertSession(account);
|
|
130
|
+
}
|
|
131
|
+
this.authCodeFlows.delete(internalState);
|
|
132
|
+
if (persist) {
|
|
133
|
+
try {
|
|
134
|
+
await persist();
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
this.restoreLinkedAccount(commit, stored, previous, flow, previousAccessOwner, previousRefreshOwner);
|
|
138
|
+
throw error;
|
|
139
|
+
}
|
|
45
140
|
}
|
|
141
|
+
return true;
|
|
142
|
+
}
|
|
143
|
+
async createSession(session) {
|
|
144
|
+
this.insertSession(session);
|
|
46
145
|
(0, logger_1.logDebug)('Session created', { sessionId: session.id, userId: session.gitlabUserId });
|
|
47
146
|
}
|
|
48
147
|
async getSession(sessionId) {
|
|
@@ -78,6 +177,8 @@ class MemoryStorageBackend {
|
|
|
78
177
|
const session = this.sessions.get(sessionId);
|
|
79
178
|
if (!session)
|
|
80
179
|
return false;
|
|
180
|
+
const linked = await this.getLinkedSessions(sessionId);
|
|
181
|
+
await Promise.all(linked.map((account) => this.deleteSession(account.id)));
|
|
81
182
|
if (session.mcpAccessToken) {
|
|
82
183
|
this.tokenToSession.delete(session.mcpAccessToken);
|
|
83
184
|
}
|
|
@@ -92,6 +193,11 @@ class MemoryStorageBackend {
|
|
|
92
193
|
async getAllSessions() {
|
|
93
194
|
return Array.from(this.sessions.values());
|
|
94
195
|
}
|
|
196
|
+
getLinkedSessions(sessionId) {
|
|
197
|
+
return Promise.resolve(Array.from(this.sessions.values())
|
|
198
|
+
.filter((session) => session.linkedToSessionId === sessionId)
|
|
199
|
+
.sort((a, b) => a.createdAt - b.createdAt));
|
|
200
|
+
}
|
|
95
201
|
async storeDeviceFlow(state, flow) {
|
|
96
202
|
this.deviceFlows.set(state, flow);
|
|
97
203
|
(0, logger_1.logDebug)('Device flow stored', { state, userCode: flow.userCode });
|
|
@@ -112,14 +218,64 @@ class MemoryStorageBackend {
|
|
|
112
218
|
(0, logger_1.logDebug)('Device flow deleted', { state });
|
|
113
219
|
return deleted;
|
|
114
220
|
}
|
|
221
|
+
async cacheLinkedFlowTokens(flow, tokens, persist) {
|
|
222
|
+
if (!flow.link)
|
|
223
|
+
throw new Error('An account-link flow is required');
|
|
224
|
+
const now = Date.now();
|
|
225
|
+
const current = this.authCodeFlows.get(flow.internalState);
|
|
226
|
+
const active = current &&
|
|
227
|
+
current.expiresAt > now &&
|
|
228
|
+
!flow.internalState.startsWith('cleanup:') &&
|
|
229
|
+
!this.abandonedFlowsInProgress.has(flow.internalState) &&
|
|
230
|
+
current.link?.sessionId === flow.link.sessionId &&
|
|
231
|
+
current.link.stage === flow.link.stage;
|
|
232
|
+
if (active &&
|
|
233
|
+
current.gitlabTokens?.access_token === tokens.access_token &&
|
|
234
|
+
current.gitlabTokens.refresh_token === tokens.refresh_token)
|
|
235
|
+
return true;
|
|
236
|
+
let state;
|
|
237
|
+
let pending;
|
|
238
|
+
if (active && !current.gitlabTokens) {
|
|
239
|
+
state = flow.internalState;
|
|
240
|
+
pending = { ...current, gitlabTokens: tokens };
|
|
241
|
+
}
|
|
242
|
+
else {
|
|
243
|
+
const grant = (0, node_crypto_1.createHash)('sha256')
|
|
244
|
+
.update(JSON.stringify([tokens.access_token, tokens.refresh_token]))
|
|
245
|
+
.digest('hex');
|
|
246
|
+
state = `cleanup:issued:${flow.internalState}:${grant}`;
|
|
247
|
+
if (this.authCodeFlows.has(state))
|
|
248
|
+
return false;
|
|
249
|
+
pending = { ...flow, internalState: state, expiresAt: now - 1, gitlabTokens: tokens };
|
|
250
|
+
}
|
|
251
|
+
const previous = this.authCodeFlows.get(state);
|
|
252
|
+
this.authCodeFlows.set(state, pending);
|
|
253
|
+
try {
|
|
254
|
+
await persist?.();
|
|
255
|
+
}
|
|
256
|
+
catch (error) {
|
|
257
|
+
if (previous)
|
|
258
|
+
this.authCodeFlows.set(state, previous);
|
|
259
|
+
else
|
|
260
|
+
this.authCodeFlows.delete(state);
|
|
261
|
+
throw error;
|
|
262
|
+
}
|
|
263
|
+
return state === flow.internalState;
|
|
264
|
+
}
|
|
115
265
|
async storeAuthCodeFlow(internalState, flow) {
|
|
116
266
|
this.authCodeFlows.set(internalState, flow);
|
|
117
267
|
(0, logger_1.logDebug)('Auth code flow stored', { internalState: (0, logger_1.truncateId)(internalState) });
|
|
118
268
|
}
|
|
119
269
|
async getAuthCodeFlow(internalState) {
|
|
270
|
+
if (internalState.startsWith('cleanup:'))
|
|
271
|
+
return undefined;
|
|
272
|
+
if (this.abandonedFlowsInProgress.has(internalState))
|
|
273
|
+
return undefined;
|
|
120
274
|
return this.authCodeFlows.get(internalState);
|
|
121
275
|
}
|
|
122
276
|
async deleteAuthCodeFlow(internalState) {
|
|
277
|
+
if (this.abandonedFlowsInProgress.has(internalState))
|
|
278
|
+
return false;
|
|
123
279
|
const deleted = this.authCodeFlows.delete(internalState);
|
|
124
280
|
if (deleted) {
|
|
125
281
|
(0, logger_1.logDebug)('Auth code flow deleted', { internalState: (0, logger_1.truncateId)(internalState) });
|
|
@@ -208,6 +364,10 @@ class MemoryStorageBackend {
|
|
|
208
364
|
return record;
|
|
209
365
|
}
|
|
210
366
|
async consumeAuthCodeFlow(internalState) {
|
|
367
|
+
if (internalState.startsWith('cleanup:'))
|
|
368
|
+
return undefined;
|
|
369
|
+
if (this.abandonedFlowsInProgress.has(internalState))
|
|
370
|
+
return undefined;
|
|
211
371
|
const record = this.authCodeFlows.get(internalState);
|
|
212
372
|
if (record)
|
|
213
373
|
this.authCodeFlows.delete(internalState);
|
|
@@ -247,18 +407,54 @@ class MemoryStorageBackend {
|
|
|
247
407
|
}
|
|
248
408
|
return this.updateSession(sessionId, updates);
|
|
249
409
|
}
|
|
410
|
+
onAbandonedFlowGrant(handler, leaseMs) {
|
|
411
|
+
if (!Number.isSafeInteger(leaseMs) || leaseMs <= 0) {
|
|
412
|
+
throw new Error('Abandoned-flow cleanup requires a positive integer lease duration');
|
|
413
|
+
}
|
|
414
|
+
this.abandonedFlowGrant = handler;
|
|
415
|
+
}
|
|
416
|
+
onExpiredSession(handler) {
|
|
417
|
+
this.expiredSession = handler;
|
|
418
|
+
}
|
|
419
|
+
async expire(session) {
|
|
420
|
+
await this.expiredSession?.(session).catch((error) => {
|
|
421
|
+
(0, logger_1.logWarn)('Could not end the grants of an expired session', { err: error });
|
|
422
|
+
});
|
|
423
|
+
await this.deleteSession(session.id);
|
|
424
|
+
}
|
|
250
425
|
async cleanup() {
|
|
251
426
|
const now = Date.now();
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
await this.deleteSession(id);
|
|
257
|
-
expiredSessions++;
|
|
258
|
-
}
|
|
259
|
-
}
|
|
427
|
+
const expired = [...this.sessions.values()].filter((session) => (0, types_1.isPastAgeLimit)(session, now) &&
|
|
428
|
+
!(session.linkedToSessionId && this.sessions.has(session.linkedToSessionId)));
|
|
429
|
+
await inBatches(expired, (session) => this.expire(session));
|
|
430
|
+
const expiredSessions = expired.length;
|
|
260
431
|
const expiredDeviceFlows = deleteExpired(this.deviceFlows, now);
|
|
261
|
-
const
|
|
432
|
+
const handler = this.abandonedFlowGrant;
|
|
433
|
+
const abandoned = handler
|
|
434
|
+
? [...this.authCodeFlows].filter(([state, flow]) => flow.gitlabTokens && flow.expiresAt < now && !this.abandonedFlowsInProgress.has(state))
|
|
435
|
+
: [];
|
|
436
|
+
for (const [state] of abandoned)
|
|
437
|
+
this.abandonedFlowsInProgress.add(state);
|
|
438
|
+
let expiredAuthCodeFlows = deleteExpired(this.authCodeFlows, now, this.abandonedFlowsInProgress);
|
|
439
|
+
if (handler) {
|
|
440
|
+
await inBatches(abandoned, async ([state, flow]) => {
|
|
441
|
+
try {
|
|
442
|
+
await handler(flow, async (tokens) => {
|
|
443
|
+
flow.gitlabTokens = tokens;
|
|
444
|
+
this.authCodeFlows.set(state, flow);
|
|
445
|
+
});
|
|
446
|
+
this.authCodeFlows.delete(state);
|
|
447
|
+
expiredAuthCodeFlows++;
|
|
448
|
+
}
|
|
449
|
+
catch (error) {
|
|
450
|
+
(0, logger_1.logWarn)('Could not end the grant of an abandoned flow', { err: error });
|
|
451
|
+
this.authCodeFlows.set(state, flow);
|
|
452
|
+
}
|
|
453
|
+
finally {
|
|
454
|
+
this.abandonedFlowsInProgress.delete(state);
|
|
455
|
+
}
|
|
456
|
+
});
|
|
457
|
+
}
|
|
262
458
|
const expiredAuthCodes = deleteExpired(this.authCodes, now);
|
|
263
459
|
const expiredClients = deleteExpired(this.clients, now);
|
|
264
460
|
if (expiredSessions > 0 ||
|
|
@@ -329,6 +525,7 @@ class MemoryStorageBackend {
|
|
|
329
525
|
this.accountSettings.set(record.accountKey, record);
|
|
330
526
|
}
|
|
331
527
|
this.sessions.clear();
|
|
528
|
+
this.gitlabRefreshLeases.clear();
|
|
332
529
|
this.deviceFlows.clear();
|
|
333
530
|
this.authCodeFlows.clear();
|
|
334
531
|
this.authCodes.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../src/oauth/storage/memory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../src/oauth/storage/memory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,20 @@
|
|
|
1
|
-
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode, RegisteredOAuthClient } from '../types';
|
|
1
|
+
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode, RegisteredOAuthClient, GitLabTokenResponse } from '../types';
|
|
2
2
|
import type { AccountSettings, AccountSettingsRecord } from '../../configuration/types';
|
|
3
|
+
export declare const SESSION_MAX_AGE_MS: number;
|
|
4
|
+
export declare function isPastAgeLimit(session: OAuthSession, now?: number): boolean;
|
|
5
|
+
export type AbandonedFlowGrantHandler = (flow: AuthCodeFlowState, persistTokens: (tokens: GitLabTokenResponse) => Promise<void>, leaseUntil?: number) => Promise<void>;
|
|
6
|
+
export type ExpiredSessionHandler = (session: OAuthSession) => Promise<void>;
|
|
7
|
+
export interface LinkedAccountCommit {
|
|
8
|
+
internalState: string;
|
|
9
|
+
primaryLeaseUntil: number;
|
|
10
|
+
account: OAuthSession & {
|
|
11
|
+
linkedToSessionId: string;
|
|
12
|
+
};
|
|
13
|
+
existing?: {
|
|
14
|
+
refreshToken: string;
|
|
15
|
+
leaseUntil: number;
|
|
16
|
+
};
|
|
17
|
+
}
|
|
3
18
|
export interface SessionStorageBackend {
|
|
4
19
|
readonly type: 'memory' | 'file' | 'postgresql' | 'redis';
|
|
5
20
|
createSession(session: OAuthSession): Promise<void>;
|
|
@@ -9,6 +24,9 @@ export interface SessionStorageBackend {
|
|
|
9
24
|
updateSession(sessionId: string, updates: Partial<OAuthSession>): Promise<boolean>;
|
|
10
25
|
deleteSession(sessionId: string): Promise<boolean>;
|
|
11
26
|
getAllSessions(): Promise<OAuthSession[]>;
|
|
27
|
+
getLinkedSessions(sessionId: string): Promise<OAuthSession[]>;
|
|
28
|
+
commitLinkedAccount?(commit: LinkedAccountCommit): Promise<boolean>;
|
|
29
|
+
cacheLinkedFlowTokens?(flow: AuthCodeFlowState, tokens: GitLabTokenResponse): Promise<boolean>;
|
|
12
30
|
storeDeviceFlow(state: string, flow: DeviceFlowState): Promise<void>;
|
|
13
31
|
getDeviceFlow(state: string): Promise<DeviceFlowState | undefined>;
|
|
14
32
|
getDeviceFlowByDeviceCode(deviceCode: string): Promise<DeviceFlowState | undefined>;
|
|
@@ -37,6 +55,8 @@ export interface SessionStorageBackend {
|
|
|
37
55
|
putAccountSettings(accountKey: string, settings: AccountSettings, expectedVersion: number): Promise<AccountSettingsRecord | undefined>;
|
|
38
56
|
initialize(): Promise<void>;
|
|
39
57
|
cleanup(): Promise<void>;
|
|
58
|
+
onAbandonedFlowGrant?(handler: AbandonedFlowGrantHandler, leaseMs: number): void;
|
|
59
|
+
onExpiredSession?(handler: ExpiredSessionHandler): void;
|
|
40
60
|
close(): Promise<void>;
|
|
41
61
|
getStats(): Promise<SessionStorageStats>;
|
|
42
62
|
}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.STORAGE_DATA_VERSION = void 0;
|
|
3
|
+
exports.STORAGE_DATA_VERSION = exports.SESSION_MAX_AGE_MS = void 0;
|
|
4
|
+
exports.isPastAgeLimit = isPastAgeLimit;
|
|
5
|
+
exports.SESSION_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
|
|
6
|
+
function isPastAgeLimit(session, now = Date.now()) {
|
|
7
|
+
return session.createdAt + exports.SESSION_MAX_AGE_MS < now;
|
|
8
|
+
}
|
|
4
9
|
exports.STORAGE_DATA_VERSION = 1;
|
|
5
10
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/oauth/storage/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/oauth/storage/types.ts"],"names":[],"mappings":";;;AAqBA,wCAEC;AALY,QAAA,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAG1D,SAAgB,cAAc,CAAC,OAAqB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACpE,OAAO,OAAO,CAAC,SAAS,GAAG,0BAAkB,GAAG,GAAG,CAAC;AACtD,CAAC;AAoPY,QAAA,oBAAoB,GAAG,CAAC,CAAC"}
|
|
@@ -19,9 +19,19 @@ export interface OAuthSession {
|
|
|
19
19
|
clientId: string;
|
|
20
20
|
scopes: string[];
|
|
21
21
|
resource?: string;
|
|
22
|
+
linkedToSessionId?: string;
|
|
22
23
|
createdAt: number;
|
|
23
24
|
updatedAt: number;
|
|
24
25
|
}
|
|
26
|
+
export interface AccountLinkStep {
|
|
27
|
+
sessionId: string;
|
|
28
|
+
stage: 'verify' | 'connect';
|
|
29
|
+
instance: string;
|
|
30
|
+
instanceLabel?: string;
|
|
31
|
+
browserBinding?: string;
|
|
32
|
+
mcpSessionId?: string;
|
|
33
|
+
elicitationId?: string;
|
|
34
|
+
}
|
|
25
35
|
export interface RegisteredOAuthClient {
|
|
26
36
|
clientId: string;
|
|
27
37
|
clientSecret?: string;
|
|
@@ -49,6 +59,7 @@ export interface AuthCodeFlowState {
|
|
|
49
59
|
scopes?: string[];
|
|
50
60
|
resource?: string;
|
|
51
61
|
gitlabTokens?: GitLabTokenResponse;
|
|
62
|
+
link?: AccountLinkStep;
|
|
52
63
|
}
|
|
53
64
|
export interface DeviceFlowState {
|
|
54
65
|
requestedGitlabScopes?: string[];
|
|
@@ -12,6 +12,7 @@ export declare class ScopeEnforcer {
|
|
|
12
12
|
private readonly allowedProjectsSet;
|
|
13
13
|
private readonly allowedGroupsSet;
|
|
14
14
|
private readonly includeSubgroups;
|
|
15
|
+
private readonly namespace?;
|
|
15
16
|
constructor(scope: ScopeConfig);
|
|
16
17
|
static fromPreset(preset: ProjectPreset): ScopeEnforcer | null;
|
|
17
18
|
isAllowed(projectPath: string): boolean;
|
|
@@ -25,6 +26,7 @@ export declare class ScopeEnforcer {
|
|
|
25
26
|
hasGroupRestrictions(): boolean;
|
|
26
27
|
hasRestrictions(): boolean;
|
|
27
28
|
}
|
|
29
|
+
export declare function hasExplicitScopeTarget(args: Record<string, unknown>, declared: ReadonlySet<string>): boolean;
|
|
28
30
|
export declare function extractProjectsFromArgs(args: Record<string, unknown>): string[];
|
|
29
31
|
export declare function extractGroupsFromArgs(args: Record<string, unknown>): string[];
|
|
30
32
|
export type NumericTargetKind = 'project' | 'group' | 'either';
|
|
@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ScopeEnforcer = exports.ScopeViolationError = void 0;
|
|
4
4
|
exports.decodePath = decodePath;
|
|
5
5
|
exports.isInNamespace = isInNamespace;
|
|
6
|
+
exports.hasExplicitScopeTarget = hasExplicitScopeTarget;
|
|
6
7
|
exports.extractProjectsFromArgs = extractProjectsFromArgs;
|
|
7
8
|
exports.extractGroupsFromArgs = extractGroupsFromArgs;
|
|
8
9
|
exports.numericTargets = numericTargets;
|
|
9
10
|
exports.enforceArgsScope = enforceArgsScope;
|
|
10
11
|
const logger_1 = require("../logger");
|
|
12
|
+
const api_path_1 = require("../utils/api-path");
|
|
11
13
|
class ScopeViolationError extends Error {
|
|
12
14
|
attemptedTarget;
|
|
13
15
|
allowedScope;
|
|
@@ -51,7 +53,7 @@ function getScopeDescription(scope) {
|
|
|
51
53
|
return parts.length > 0 ? parts.join('; ') : 'unrestricted';
|
|
52
54
|
}
|
|
53
55
|
function normalizeProjectPath(path) {
|
|
54
|
-
const trimmed = trimSlashes(
|
|
56
|
+
const trimmed = trimSlashes((0, api_path_1.canonicalProjectPath)(path));
|
|
55
57
|
if (/^\d+$/.test(trimmed)) {
|
|
56
58
|
return trimmed;
|
|
57
59
|
}
|
|
@@ -67,14 +69,7 @@ function trimSlashes(path) {
|
|
|
67
69
|
return path.slice(start, end);
|
|
68
70
|
}
|
|
69
71
|
function decodePath(path) {
|
|
70
|
-
|
|
71
|
-
return path;
|
|
72
|
-
try {
|
|
73
|
-
return decodeURIComponent(path);
|
|
74
|
-
}
|
|
75
|
-
catch {
|
|
76
|
-
return path;
|
|
77
|
-
}
|
|
72
|
+
return (0, api_path_1.canonicalProjectPath)(path);
|
|
78
73
|
}
|
|
79
74
|
function isInNamespace(projectPath, namespace) {
|
|
80
75
|
const normalizedProject = normalizeProjectPath(projectPath);
|
|
@@ -87,9 +82,11 @@ class ScopeEnforcer {
|
|
|
87
82
|
allowedProjectsSet;
|
|
88
83
|
allowedGroupsSet;
|
|
89
84
|
includeSubgroups;
|
|
85
|
+
namespace;
|
|
90
86
|
constructor(scope) {
|
|
91
87
|
this.scope = scope;
|
|
92
88
|
this.includeSubgroups = scope.includeSubgroups !== false;
|
|
89
|
+
this.namespace = scope.namespace ? normalizeProjectPath(scope.namespace) : undefined;
|
|
93
90
|
this.allowedProjectsSet = new Set((scope.projects ?? []).map((p) => normalizeProjectPath(p)));
|
|
94
91
|
if (scope.project) {
|
|
95
92
|
this.allowedProjectsSet.add(normalizeProjectPath(scope.project));
|
|
@@ -112,20 +109,27 @@ class ScopeEnforcer {
|
|
|
112
109
|
return new ScopeEnforcer(preset.scope);
|
|
113
110
|
}
|
|
114
111
|
isAllowed(projectPath) {
|
|
112
|
+
let normalized;
|
|
113
|
+
try {
|
|
114
|
+
normalized = normalizeProjectPath(projectPath);
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
115
119
|
if (!this.hasProjectRestrictions()) {
|
|
116
120
|
return true;
|
|
117
121
|
}
|
|
118
|
-
const normalized = normalizeProjectPath(projectPath);
|
|
119
122
|
if (this.allowedProjectsSet.size > 0 && this.allowedProjectsSet.has(normalized)) {
|
|
120
123
|
return true;
|
|
121
124
|
}
|
|
122
|
-
if (this.
|
|
125
|
+
if (this.namespace &&
|
|
126
|
+
(normalized === this.namespace || normalized.startsWith(this.namespace + '/'))) {
|
|
123
127
|
return true;
|
|
124
128
|
}
|
|
125
129
|
if (this.allowedGroupsSet.size > 0) {
|
|
126
130
|
for (const allowedGroup of this.allowedGroupsSet) {
|
|
127
131
|
if (this.includeSubgroups) {
|
|
128
|
-
if (
|
|
132
|
+
if (normalized === allowedGroup || normalized.startsWith(allowedGroup + '/')) {
|
|
129
133
|
return true;
|
|
130
134
|
}
|
|
131
135
|
}
|
|
@@ -149,21 +153,28 @@ class ScopeEnforcer {
|
|
|
149
153
|
return false;
|
|
150
154
|
}
|
|
151
155
|
isGroupAllowed(groupPath) {
|
|
156
|
+
let normalized;
|
|
157
|
+
try {
|
|
158
|
+
normalized = normalizeProjectPath(groupPath);
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
return false;
|
|
162
|
+
}
|
|
152
163
|
if (!this.hasGroupRestrictions()) {
|
|
153
164
|
return !this.hasProjectRestrictions();
|
|
154
165
|
}
|
|
155
|
-
const normalized = normalizeProjectPath(groupPath);
|
|
156
166
|
if (this.allowedGroupsSet.size > 0 && this.allowedGroupsSet.has(normalized)) {
|
|
157
167
|
return true;
|
|
158
168
|
}
|
|
159
169
|
if (this.includeSubgroups && this.allowedGroupsSet.size > 0) {
|
|
160
170
|
for (const allowedGroup of this.allowedGroupsSet) {
|
|
161
|
-
if (
|
|
171
|
+
if (normalized === allowedGroup || normalized.startsWith(allowedGroup + '/')) {
|
|
162
172
|
return true;
|
|
163
173
|
}
|
|
164
174
|
}
|
|
165
175
|
}
|
|
166
|
-
if (this.
|
|
176
|
+
if (this.namespace &&
|
|
177
|
+
(normalized === this.namespace || normalized.startsWith(this.namespace + '/'))) {
|
|
167
178
|
return true;
|
|
168
179
|
}
|
|
169
180
|
if (/^\d+$/.test(normalized)) {
|
|
@@ -249,6 +260,17 @@ const GROUP_FIELDS = [
|
|
|
249
260
|
'namespace_path',
|
|
250
261
|
'namespace_id',
|
|
251
262
|
];
|
|
263
|
+
function hasExplicitScopeTarget(args, declared) {
|
|
264
|
+
for (const field of PROJECT_FIELDS) {
|
|
265
|
+
if (declared.has(field) && args[field] !== undefined)
|
|
266
|
+
return true;
|
|
267
|
+
}
|
|
268
|
+
for (const field of GROUP_FIELDS) {
|
|
269
|
+
if (declared.has(field) && args[field] !== undefined)
|
|
270
|
+
return true;
|
|
271
|
+
}
|
|
272
|
+
return false;
|
|
273
|
+
}
|
|
252
274
|
function extractProjectsFromArgs(args) {
|
|
253
275
|
const projects = [];
|
|
254
276
|
for (const field of PROJECT_FIELDS) {
|