@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
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.liveGitLabAccessToken = liveGitLabAccessToken;
|
|
4
|
+
exports.revokeGitLabGrant = revokeGitLabGrant;
|
|
5
|
+
exports.endSession = endSession;
|
|
6
|
+
exports.endAbandonedFlowGrant = endAbandonedFlowGrant;
|
|
7
|
+
exports.revokeAbandonedFlowGrant = revokeAbandonedFlowGrant;
|
|
8
|
+
exports.startSessionStore = startSessionStore;
|
|
9
|
+
exports.discardAuthCodeFlow = discardAuthCodeFlow;
|
|
10
|
+
const instance_app_1 = require("./instance-app");
|
|
11
|
+
const gitlab_device_flow_1 = require("./gitlab-device-flow");
|
|
12
|
+
const gitlab_token_refresh_1 = require("./gitlab-token-refresh");
|
|
13
|
+
const session_store_1 = require("./session-store");
|
|
14
|
+
const gitlab_request_bound_1 = require("./gitlab-request-bound");
|
|
15
|
+
const logger_1 = require("../logger");
|
|
16
|
+
async function liveGitLabAccessToken(session, config) {
|
|
17
|
+
try {
|
|
18
|
+
return ((await (0, gitlab_token_refresh_1.withFreshGitLabToken)(session, config))?.gitlabAccessToken ?? session.gitlabAccessToken);
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
(0, logger_1.logWarn)('Could not refresh the GitLab grant before revoking it', { err: error });
|
|
22
|
+
return session.gitlabAccessToken;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
async function revokeGitLabGrant(session, accessToken, config) {
|
|
26
|
+
try {
|
|
27
|
+
const app = await (0, instance_app_1.oauthAppFor)(config, session.gitlabApiUrl);
|
|
28
|
+
if (app)
|
|
29
|
+
await (0, gitlab_device_flow_1.revokeGitLabToken)(accessToken, config, app);
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
(0, logger_1.logWarn)('GitLab token revocation failed', { err: error });
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
const REMOVAL_LEASE_MS = 15_000;
|
|
36
|
+
function releaseRemovalLease(sessionId, leaseUntil) {
|
|
37
|
+
return session_store_1.sessionStore.releaseGitLabRefresh(sessionId, leaseUntil).catch(() => undefined);
|
|
38
|
+
}
|
|
39
|
+
async function grantsToEnd(session, config) {
|
|
40
|
+
const links = session_store_1.sessionStore.linksAccounts();
|
|
41
|
+
const before = links ? await session_store_1.sessionStore.getLinkedSessions(session.id) : [];
|
|
42
|
+
const known = await Promise.all([session, ...before].map(async (account) => ({
|
|
43
|
+
session: account,
|
|
44
|
+
accessToken: await liveGitLabAccessToken(account, config),
|
|
45
|
+
})));
|
|
46
|
+
const leaseUntil = await (0, gitlab_token_refresh_1.claimSessionLease)(session.id, REMOVAL_LEASE_MS);
|
|
47
|
+
const current = leaseUntil === undefined ? undefined : await session_store_1.sessionStore.getSession(session.id);
|
|
48
|
+
if (!current || leaseUntil === undefined)
|
|
49
|
+
return { grants: known };
|
|
50
|
+
try {
|
|
51
|
+
const linked = links ? await session_store_1.sessionStore.getLinkedSessions(session.id) : [];
|
|
52
|
+
const grants = [current, ...linked].map((account) => ({
|
|
53
|
+
session: account,
|
|
54
|
+
accessToken: account.gitlabAccessToken,
|
|
55
|
+
}));
|
|
56
|
+
return { grants, leaseUntil };
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
await releaseRemovalLease(session.id, leaseUntil);
|
|
60
|
+
throw error;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
async function endSession(session, config) {
|
|
64
|
+
const { grants, leaseUntil } = await grantsToEnd(session, config);
|
|
65
|
+
if (leaseUntil !== undefined) {
|
|
66
|
+
try {
|
|
67
|
+
await session_store_1.sessionStore.deleteSession(session.id);
|
|
68
|
+
}
|
|
69
|
+
catch (error) {
|
|
70
|
+
await releaseRemovalLease(session.id, leaseUntil);
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
await Promise.all(grants.map(({ session: account, accessToken }) => revokeGitLabGrant(account, accessToken, config)));
|
|
75
|
+
}
|
|
76
|
+
const OWNERSHIP_CHECK_LEASE_MS = 5_000;
|
|
77
|
+
const FLOW_STORE_BUDGET_MS = 15_000;
|
|
78
|
+
const FLOW_CLEANUP_LEASE_MS = OWNERSHIP_CHECK_LEASE_MS + 2 * gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS + FLOW_STORE_BUDGET_MS;
|
|
79
|
+
function assertCleanupLease(leaseUntil, requiredMs) {
|
|
80
|
+
if (leaseUntil !== undefined && Date.now() + requiredMs > leaseUntil) {
|
|
81
|
+
throw new Error('Authorization-flow cleanup lease has insufficient time remaining');
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
async function linkedAccountHolds(flow) {
|
|
85
|
+
const tokens = flow.gitlabTokens;
|
|
86
|
+
if (!tokens || flow.link?.stage !== 'connect' || !session_store_1.sessionStore.linksAccounts())
|
|
87
|
+
return false;
|
|
88
|
+
const sessionId = flow.link.sessionId;
|
|
89
|
+
const turn = await (0, gitlab_token_refresh_1.claimSessionLease)(sessionId, OWNERSHIP_CHECK_LEASE_MS, Date.now() + OWNERSHIP_CHECK_LEASE_MS);
|
|
90
|
+
if (turn === undefined)
|
|
91
|
+
return false;
|
|
92
|
+
try {
|
|
93
|
+
const linked = await session_store_1.sessionStore.getLinkedSessions(sessionId);
|
|
94
|
+
return linked.some((account) => account.gitlabAccessToken === tokens.access_token ||
|
|
95
|
+
account.gitlabRefreshToken === tokens.refresh_token);
|
|
96
|
+
}
|
|
97
|
+
finally {
|
|
98
|
+
await session_store_1.sessionStore.releaseGitLabRefresh(sessionId, turn).catch(() => undefined);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
async function endAbandonedFlowGrant(flow, config, persistTokens, leaseUntil) {
|
|
102
|
+
if (!flow.gitlabTokens || (await linkedAccountHolds(flow)))
|
|
103
|
+
return;
|
|
104
|
+
const app = await (0, instance_app_1.oauthAppFor)(config, flow.selectedInstance);
|
|
105
|
+
if (!app)
|
|
106
|
+
return;
|
|
107
|
+
let tokens = flow.gitlabTokens;
|
|
108
|
+
if ((tokens.created_at + tokens.expires_in) * 1000 <= Date.now() + gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS) {
|
|
109
|
+
assertCleanupLease(leaseUntil, 2 * gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS + FLOW_STORE_BUDGET_MS);
|
|
110
|
+
tokens = await (0, gitlab_device_flow_1.refreshGitLabToken)(tokens.refresh_token, config, app);
|
|
111
|
+
flow.gitlabTokens = tokens;
|
|
112
|
+
const deadline = Date.now() + FLOW_STORE_BUDGET_MS;
|
|
113
|
+
for (let delay = 200;; delay *= 2) {
|
|
114
|
+
try {
|
|
115
|
+
await persistTokens(tokens);
|
|
116
|
+
break;
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
if (Date.now() + delay >= deadline) {
|
|
120
|
+
await (0, gitlab_device_flow_1.revokeGitLabToken)(tokens.access_token, config, app);
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
(0, logger_1.logWarn)('Could not persist refreshed abandoned-flow tokens, retrying', {
|
|
124
|
+
err: error,
|
|
125
|
+
});
|
|
126
|
+
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
assertCleanupLease(leaseUntil, gitlab_request_bound_1.GITLAB_REQUEST_MAX_MS);
|
|
131
|
+
await (0, gitlab_device_flow_1.revokeGitLabToken)(tokens.access_token, config, app);
|
|
132
|
+
}
|
|
133
|
+
async function revokeAbandonedFlowGrant(flow, config) {
|
|
134
|
+
const pending = { ...flow, expiresAt: Math.min(flow.expiresAt, Date.now() - 1) };
|
|
135
|
+
let persisted = false;
|
|
136
|
+
try {
|
|
137
|
+
await endAbandonedFlowGrant(pending, config, async (tokens) => {
|
|
138
|
+
pending.gitlabTokens = tokens;
|
|
139
|
+
await session_store_1.sessionStore.storeAuthCodeFlow(pending.internalState, pending);
|
|
140
|
+
persisted = true;
|
|
141
|
+
});
|
|
142
|
+
if (persisted)
|
|
143
|
+
await session_store_1.sessionStore.deleteAuthCodeFlow(pending.internalState);
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
(0, logger_1.logWarn)('Failed to revoke the GitLab grant of an abandoned authorization', {
|
|
147
|
+
err: error,
|
|
148
|
+
});
|
|
149
|
+
await session_store_1.sessionStore
|
|
150
|
+
.storeAuthCodeFlow(pending.internalState, pending)
|
|
151
|
+
.catch((restoreError) => {
|
|
152
|
+
(0, logger_1.logWarn)('Could not keep an abandoned authorization for cleanup', {
|
|
153
|
+
err: restoreError,
|
|
154
|
+
expiresAt: pending.expiresAt,
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
async function startSessionStore(config) {
|
|
160
|
+
await session_store_1.sessionStore.initialize();
|
|
161
|
+
session_store_1.sessionStore.onAbandonedFlowGrant((flow, persistTokens, leaseUntil) => endAbandonedFlowGrant(flow, config, persistTokens, leaseUntil), FLOW_CLEANUP_LEASE_MS);
|
|
162
|
+
session_store_1.sessionStore.onExpiredSession((session) => endSession(session, config));
|
|
163
|
+
session_store_1.sessionStore.cleanup().catch((error) => {
|
|
164
|
+
(0, logger_1.logWarn)('Startup session cleanup failed', { err: error });
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
async function discardAuthCodeFlow(state, flow, config) {
|
|
168
|
+
const taken = await session_store_1.sessionStore.consumeAuthCodeFlow(state).catch((error) => {
|
|
169
|
+
(0, logger_1.logWarn)('Could not take an abandoned authorization out of reach; cleanup ends its grant', {
|
|
170
|
+
err: error,
|
|
171
|
+
expiresAt: flow.expiresAt,
|
|
172
|
+
});
|
|
173
|
+
return undefined;
|
|
174
|
+
});
|
|
175
|
+
if (!taken)
|
|
176
|
+
return;
|
|
177
|
+
await revokeAbandonedFlowGrant({ ...taken, internalState: state }, config);
|
|
178
|
+
}
|
|
179
|
+
//# sourceMappingURL=grant-revocation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grant-revocation.js","sourceRoot":"","sources":["../../../src/oauth/grant-revocation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { OAuthSession, DeviceFlowState, AuthorizationCode, AuthCodeFlowState, RegisteredOAuthClient } from './types';
|
|
1
|
+
import { OAuthSession, DeviceFlowState, AuthorizationCode, AuthCodeFlowState, RegisteredOAuthClient, GitLabTokenResponse } from './types';
|
|
2
2
|
import { SessionStorageBackend } from './storage';
|
|
3
|
+
import type { AbandonedFlowGrantHandler, ExpiredSessionHandler, LinkedAccountCommit } from './storage/types';
|
|
3
4
|
import type { AccountSettings, AccountSettingsRecord } from '../configuration/types';
|
|
4
5
|
export declare class SessionStore {
|
|
5
6
|
private backend;
|
|
@@ -18,6 +19,9 @@ export declare class SessionStore {
|
|
|
18
19
|
releaseGitLabRefresh(sessionId: string, leaseUntil: number): Promise<void>;
|
|
19
20
|
deleteSession(sessionId: string): Promise<boolean>;
|
|
20
21
|
getAllSessions(): Promise<OAuthSession[]>;
|
|
22
|
+
linksAccounts(): boolean;
|
|
23
|
+
getLinkedSessions(sessionId: string): Promise<OAuthSession[]>;
|
|
24
|
+
commitLinkedAccount(commit: LinkedAccountCommit): Promise<boolean>;
|
|
21
25
|
getSessionCount(): Promise<number>;
|
|
22
26
|
storeDeviceFlow(state: string, flow: DeviceFlowState): Promise<void>;
|
|
23
27
|
getDeviceFlow(state: string): Promise<DeviceFlowState | undefined>;
|
|
@@ -27,6 +31,7 @@ export declare class SessionStore {
|
|
|
27
31
|
claimDevicePoll(state: string, now: number, nextPollAt: number): Promise<DeviceFlowState | undefined>;
|
|
28
32
|
getDeviceFlowCount(): Promise<number>;
|
|
29
33
|
storeAuthCodeFlow(internalState: string, flow: AuthCodeFlowState): Promise<void>;
|
|
34
|
+
cacheLinkedFlowTokens(flow: AuthCodeFlowState, tokens: GitLabTokenResponse): Promise<boolean>;
|
|
30
35
|
getAuthCodeFlow(internalState: string): Promise<AuthCodeFlowState | undefined>;
|
|
31
36
|
deleteAuthCodeFlow(internalState: string): Promise<boolean>;
|
|
32
37
|
consumeAuthCodeFlow(internalState: string): Promise<AuthCodeFlowState | undefined>;
|
|
@@ -47,6 +52,8 @@ export declare class SessionStore {
|
|
|
47
52
|
getSessionByMcpSessionId(mcpSessionId: string): Promise<OAuthSession | undefined>;
|
|
48
53
|
getGitLabTokenByMcpSessionId(mcpSessionId: string): Promise<string | undefined>;
|
|
49
54
|
removeMcpSessionAssociation(mcpSessionId: string): Promise<boolean>;
|
|
55
|
+
onAbandonedFlowGrant(handler: AbandonedFlowGrantHandler, leaseMs: number): void;
|
|
56
|
+
onExpiredSession(handler: ExpiredSessionHandler): void;
|
|
50
57
|
cleanup(): Promise<void>;
|
|
51
58
|
private startCleanupInterval;
|
|
52
59
|
stopCleanupInterval(): void;
|
|
@@ -2,8 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sessionStore = exports.SessionStore = void 0;
|
|
4
4
|
const storage_1 = require("./storage");
|
|
5
|
+
const types_1 = require("./storage/types");
|
|
5
6
|
const memory_1 = require("./storage/memory");
|
|
6
7
|
const logger_1 = require("../logger");
|
|
8
|
+
function withinAgeLimit(session) {
|
|
9
|
+
return session && !(0, types_1.isPastAgeLimit)(session) ? session : undefined;
|
|
10
|
+
}
|
|
7
11
|
class SessionStore {
|
|
8
12
|
backend;
|
|
9
13
|
initialized = false;
|
|
@@ -30,10 +34,10 @@ class SessionStore {
|
|
|
30
34
|
return this.backend.getSession(sessionId);
|
|
31
35
|
}
|
|
32
36
|
async getSessionByToken(token) {
|
|
33
|
-
return this.backend.getSessionByToken(token);
|
|
37
|
+
return withinAgeLimit(await this.backend.getSessionByToken(token));
|
|
34
38
|
}
|
|
35
39
|
async getSessionByRefreshToken(refreshToken) {
|
|
36
|
-
return this.backend.getSessionByRefreshToken(refreshToken);
|
|
40
|
+
return withinAgeLimit(await this.backend.getSessionByRefreshToken(refreshToken));
|
|
37
41
|
}
|
|
38
42
|
async updateSession(sessionId, updates) {
|
|
39
43
|
return this.backend.updateSession(sessionId, updates);
|
|
@@ -53,6 +57,21 @@ class SessionStore {
|
|
|
53
57
|
async getAllSessions() {
|
|
54
58
|
return this.backend.getAllSessions();
|
|
55
59
|
}
|
|
60
|
+
linksAccounts() {
|
|
61
|
+
const backend = this.backend;
|
|
62
|
+
return (typeof backend.getLinkedSessions === 'function' &&
|
|
63
|
+
typeof backend.commitLinkedAccount === 'function' &&
|
|
64
|
+
typeof backend.cacheLinkedFlowTokens === 'function');
|
|
65
|
+
}
|
|
66
|
+
async getLinkedSessions(sessionId) {
|
|
67
|
+
return this.backend.getLinkedSessions(sessionId);
|
|
68
|
+
}
|
|
69
|
+
async commitLinkedAccount(commit) {
|
|
70
|
+
if (!this.backend.commitLinkedAccount) {
|
|
71
|
+
throw new Error('The session storage backend cannot commit account links atomically');
|
|
72
|
+
}
|
|
73
|
+
return this.backend.commitLinkedAccount(commit);
|
|
74
|
+
}
|
|
56
75
|
async getSessionCount() {
|
|
57
76
|
return (await this.backend.getStats()).sessions;
|
|
58
77
|
}
|
|
@@ -80,6 +99,12 @@ class SessionStore {
|
|
|
80
99
|
async storeAuthCodeFlow(internalState, flow) {
|
|
81
100
|
await this.backend.storeAuthCodeFlow(internalState, flow);
|
|
82
101
|
}
|
|
102
|
+
async cacheLinkedFlowTokens(flow, tokens) {
|
|
103
|
+
if (!this.backend.cacheLinkedFlowTokens) {
|
|
104
|
+
throw new Error('The session storage backend cannot safely cache account-link tokens');
|
|
105
|
+
}
|
|
106
|
+
return this.backend.cacheLinkedFlowTokens(flow, tokens);
|
|
107
|
+
}
|
|
83
108
|
async getAuthCodeFlow(internalState) {
|
|
84
109
|
return this.backend.getAuthCodeFlow(internalState);
|
|
85
110
|
}
|
|
@@ -135,7 +160,7 @@ class SessionStore {
|
|
|
135
160
|
await this.backend.associateMcpSession(mcpSessionId, oauthSessionId);
|
|
136
161
|
}
|
|
137
162
|
async getSessionByMcpSessionId(mcpSessionId) {
|
|
138
|
-
return this.backend.getSessionByMcpSessionId(mcpSessionId);
|
|
163
|
+
return withinAgeLimit(await this.backend.getSessionByMcpSessionId(mcpSessionId));
|
|
139
164
|
}
|
|
140
165
|
async getGitLabTokenByMcpSessionId(mcpSessionId) {
|
|
141
166
|
const session = await this.getSessionByMcpSessionId(mcpSessionId);
|
|
@@ -144,6 +169,14 @@ class SessionStore {
|
|
|
144
169
|
async removeMcpSessionAssociation(mcpSessionId) {
|
|
145
170
|
return this.backend.removeMcpSessionAssociation(mcpSessionId);
|
|
146
171
|
}
|
|
172
|
+
onAbandonedFlowGrant(handler, leaseMs) {
|
|
173
|
+
const backend = this.backend;
|
|
174
|
+
backend.onAbandonedFlowGrant?.(handler, leaseMs);
|
|
175
|
+
}
|
|
176
|
+
onExpiredSession(handler) {
|
|
177
|
+
const backend = this.backend;
|
|
178
|
+
backend.onExpiredSession?.(handler);
|
|
179
|
+
}
|
|
147
180
|
async cleanup() {
|
|
148
181
|
await this.backend.cleanup();
|
|
149
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/oauth/session-store.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/oauth/session-store.ts"],"names":[],"mappings":";;;AAyBA,uCAAwE;AACxE,2CAAiD;AAOjD,6CAAwD;AACxD,sCAAwD;AAExD,SAAS,cAAc,CAAC,OAAiC;IACvD,OAAO,OAAO,IAAI,CAAC,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AACnE,CAAC;AAKD,MAAa,YAAY;IACf,OAAO,CAAwB;IAC/B,WAAW,GAAG,KAAK,CAAC;IAEpB,iBAAiB,GAA0C,IAAI,CAAC;IAExE,YAAY,OAA+B;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,IAAA,8BAAoB,GAAE,CAAC;IACnD,CAAC;IAKD,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAE7B,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QAGhC,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE5B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAA,gBAAO,EAAC,2BAA2B,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IAKD,cAAc;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IASD,KAAK,CAAC,aAAa,CAAC,OAAqB;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAA,iBAAQ,EAAC,iBAAiB,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IACvF,CAAC;IAKD,KAAK,CAAC,UAAU,CAAC,SAAiB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAMD,KAAK,CAAC,iBAAiB,CAAC,KAAa;QACnC,OAAO,cAAc,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IACrE,CAAC;IAKD,KAAK,CAAC,wBAAwB,CAAC,YAAoB;QACjD,OAAO,cAAc,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC,CAAC;IACnF,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,OAA8B;QACnE,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAMD,KAAK,CAAC,aAAa,CACjB,SAAiB,EACjB,oBAA4B,EAC5B,OAA8B;QAE9B,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;IAMD,KAAK,CAAC,kBAAkB,CACtB,SAAiB,EACjB,oBAA4B,EAC5B,GAAW,EACX,UAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,oBAAoB,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAC3F,CAAC;IAGD,KAAK,CAAC,oBAAoB,CAAC,SAAiB,EAAE,UAAkB;QAC9D,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACjE,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,SAAiB;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAC/C,CAAC;IAKD,KAAK,CAAC,cAAc;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IACvC,CAAC;IAMD,aAAa;QACX,MAAM,OAAO,GAAG,IAAI,CAAC,OAAyC,CAAC;QAC/D,OAAO,CACL,OAAO,OAAO,CAAC,iBAAiB,KAAK,UAAU;YAC/C,OAAO,OAAO,CAAC,mBAAmB,KAAK,UAAU;YACjD,OAAO,OAAO,CAAC,qBAAqB,KAAK,UAAU,CACpD,CAAC;IACJ,CAAC;IAGD,KAAK,CAAC,iBAAiB,CAAC,SAAiB;QACvC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IAGD,KAAK,CAAC,mBAAmB,CAAC,MAA2B;QACnD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;QACxF,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAKD,KAAK,CAAC,eAAe;QACnB,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC;IAClD,CAAC;IASD,KAAK,CAAC,eAAe,CAAC,KAAa,EAAE,IAAqB;QACxD,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,KAAa;QAC/B,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAKD,KAAK,CAAC,yBAAyB,CAAC,UAAkB;QAChD,OAAO,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;IAKD,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAKD,KAAK,CAAC,iBAAiB,CAAC,KAAa;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAMD,KAAK,CAAC,eAAe,CACnB,KAAa,EACb,GAAW,EACX,UAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;IAKD,KAAK,CAAC,kBAAkB;QACtB,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC;IACrD,CAAC;IASD,KAAK,CAAC,iBAAiB,CAAC,aAAqB,EAAE,IAAuB;QACpE,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,IAAuB,EACvB,MAA2B;QAE3B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAKD,KAAK,CAAC,eAAe,CAAC,aAAqB;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IACrD,CAAC;IAKD,KAAK,CAAC,kBAAkB,CAAC,aAAqB;QAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAKD,KAAK,CAAC,mBAAmB,CAAC,aAAqB;QAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACzD,CAAC;IAKD,KAAK,CAAC,oBAAoB;QACxB,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,aAAa,CAAC;IACvD,CAAC;IASD,KAAK,CAAC,aAAa,CAAC,IAAuB;QACzC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAKD,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAKD,KAAK,CAAC,cAAc,CAAC,IAAY;QAC/B,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAMD,KAAK,CAAC,eAAe,CAAC,IAAY;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAKD,KAAK,CAAC,gBAAgB;QACpB,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC;IACnD,CAAC;IASD,KAAK,CAAC,WAAW,CAAC,MAA6B;QAC7C,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAKD,KAAK,CAAC,SAAS,CAAC,QAAgB;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAGD,KAAK,CAAC,cAAc,CAAC,QAAgB;QACnC,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAGD,KAAK,CAAC,2BAA2B,CAAC,cAAsB,EAAE,KAAa;QACrE,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACzE,CAAC;IAUD,oBAAoB;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAyC,CAAC;QAC/D,OAAO,CACL,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;YAC9B,OAAO,OAAO,CAAC,kBAAkB,KAAK,UAAU;YAChD,OAAO,OAAO,CAAC,kBAAkB,KAAK,UAAU,CACjD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,UAAkB;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACrD,CAAC;IAGD,KAAK,CAAC,kBAAkB,CACtB,UAAkB,EAClB,QAAyB,EACzB,eAAuB;QAEvB,OAAO,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;IAChF,CAAC;IASD,KAAK,CAAC,mBAAmB,CAAC,YAAoB,EAAE,cAAsB;QACpE,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACvE,CAAC;IAKD,KAAK,CAAC,wBAAwB,CAAC,YAAoB;QACjD,OAAO,cAAc,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC,CAAC;IACnF,CAAC;IAKD,KAAK,CAAC,4BAA4B,CAAC,YAAoB;QACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAC;QAClE,OAAO,OAAO,EAAE,iBAAiB,CAAC;IACpC,CAAC;IAKD,KAAK,CAAC,2BAA2B,CAAC,YAAoB;QACpD,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAChE,CAAC;IAWD,oBAAoB,CAAC,OAAkC,EAAE,OAAe;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAyC,CAAC;QAC/D,OAAO,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAOD,gBAAgB,CAAC,OAA8B;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAyC,CAAC;QAC/D,OAAO,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAKD,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAKO,oBAAoB;QAC1B,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAClC,GAAG,EAAE;YACH,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,8BAA8B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QAC5F,CAAC,EACD,CAAC,GAAG,EAAE,GAAG,IAAI,CACd,CAAC;QAEF,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAKD,mBAAmB;QACjB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAChC,CAAC;IACH,CAAC;IAMD,KAAK;QACH,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,YAAY,6BAAoB,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,SAAS,CAAC,iDAAiD,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAA,iBAAQ,EAAC,uBAAuB,CAAC,CAAC;IACpC,CAAC;IAKD,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAA,gBAAO,EAAC,sBAAsB,CAAC,CAAC;IAClC,CAAC;IAKD,KAAK,CAAC,QAAQ;QAMZ,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC1F,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;IAC7D,CAAC;CACF;AA9dD,oCA8dC;AAOY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode, RegisteredOAuthClient } from '../types';
|
|
2
|
-
import { SessionStorageBackend, SessionStorageStats } from './types';
|
|
1
|
+
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode, RegisteredOAuthClient, GitLabTokenResponse } from '../types';
|
|
2
|
+
import { AbandonedFlowGrantHandler, ExpiredSessionHandler, LinkedAccountCommit, SessionStorageBackend, SessionStorageStats } from './types';
|
|
3
3
|
import type { AccountSettings, AccountSettingsRecord } from '../../configuration/types';
|
|
4
4
|
export interface FileStorageOptions {
|
|
5
5
|
filePath: string;
|
|
@@ -32,15 +32,18 @@ export declare class FileStorageBackend implements SessionStorageBackend {
|
|
|
32
32
|
private startSaveInterval;
|
|
33
33
|
createSession(session: OAuthSession): Promise<void>;
|
|
34
34
|
getSession(sessionId: string): Promise<OAuthSession | undefined>;
|
|
35
|
+
commitLinkedAccount(commit: LinkedAccountCommit): Promise<boolean>;
|
|
35
36
|
getSessionByToken(token: string): Promise<OAuthSession | undefined>;
|
|
36
37
|
getSessionByRefreshToken(refreshToken: string): Promise<OAuthSession | undefined>;
|
|
37
38
|
updateSession(sessionId: string, updates: Partial<OAuthSession>): Promise<boolean>;
|
|
38
39
|
deleteSession(sessionId: string): Promise<boolean>;
|
|
39
40
|
getAllSessions(): Promise<OAuthSession[]>;
|
|
41
|
+
getLinkedSessions(sessionId: string): Promise<OAuthSession[]>;
|
|
40
42
|
storeDeviceFlow(state: string, flow: DeviceFlowState): Promise<void>;
|
|
41
43
|
getDeviceFlow(state: string): Promise<DeviceFlowState | undefined>;
|
|
42
44
|
getDeviceFlowByDeviceCode(deviceCode: string): Promise<DeviceFlowState | undefined>;
|
|
43
45
|
deleteDeviceFlow(state: string): Promise<boolean>;
|
|
46
|
+
cacheLinkedFlowTokens(flow: AuthCodeFlowState, tokens: GitLabTokenResponse): Promise<boolean>;
|
|
44
47
|
storeAuthCodeFlow(internalState: string, flow: AuthCodeFlowState): Promise<void>;
|
|
45
48
|
getAuthCodeFlow(internalState: string): Promise<AuthCodeFlowState | undefined>;
|
|
46
49
|
deleteAuthCodeFlow(internalState: string): Promise<boolean>;
|
|
@@ -63,6 +66,8 @@ export declare class FileStorageBackend implements SessionStorageBackend {
|
|
|
63
66
|
claimGitLabRefresh(sessionId: string, expectedRefreshToken: string, now: number, leaseUntil: number): Promise<boolean>;
|
|
64
67
|
releaseGitLabRefresh(sessionId: string, leaseUntil: number): Promise<void>;
|
|
65
68
|
rotateSession(sessionId: string, expectedRefreshToken: string, updates: Partial<OAuthSession>): Promise<boolean>;
|
|
69
|
+
onAbandonedFlowGrant(handler: AbandonedFlowGrantHandler, leaseMs: number): void;
|
|
70
|
+
onExpiredSession(handler: ExpiredSessionHandler): void;
|
|
66
71
|
cleanup(): Promise<void>;
|
|
67
72
|
close(): Promise<void>;
|
|
68
73
|
getStats(): Promise<SessionStorageStats>;
|
|
@@ -118,12 +118,9 @@ class FileStorageBackend {
|
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
120
|
const now = Date.now();
|
|
121
|
-
const validSessions = data.sessions
|
|
122
|
-
const maxAge = 7 * 24 * 60 * 60 * 1000;
|
|
123
|
-
return s.createdAt + maxAge > now;
|
|
124
|
-
});
|
|
121
|
+
const validSessions = data.sessions;
|
|
125
122
|
const validDeviceFlows = data.deviceFlows.filter((d) => d.flow.expiresAt > now);
|
|
126
|
-
const validAuthCodeFlows = data.authCodeFlows.filter((a) => a.flow.expiresAt > now);
|
|
123
|
+
const validAuthCodeFlows = data.authCodeFlows.filter((a) => a.flow.expiresAt > now || a.flow.gitlabTokens !== undefined);
|
|
127
124
|
const validAuthCodes = data.authCodes.filter((a) => a.expiresAt > now);
|
|
128
125
|
const stored = data.accountSettings;
|
|
129
126
|
const listed = Array.isArray(stored);
|
|
@@ -146,7 +143,6 @@ class FileStorageBackend {
|
|
|
146
143
|
const stats = await this.memory.getStats();
|
|
147
144
|
(0, logger_1.logInfo)('Loaded sessions from file', {
|
|
148
145
|
loadedSessions: stats.sessions,
|
|
149
|
-
expiredSessions: data.sessions.length - validSessions.length,
|
|
150
146
|
loadedDeviceFlows: stats.deviceFlows,
|
|
151
147
|
loadedAuthCodes: stats.authCodes,
|
|
152
148
|
});
|
|
@@ -269,6 +265,10 @@ class FileStorageBackend {
|
|
|
269
265
|
async getSession(sessionId) {
|
|
270
266
|
return this.memory.getSession(sessionId);
|
|
271
267
|
}
|
|
268
|
+
commitLinkedAccount(commit) {
|
|
269
|
+
this.cancelPendingSave();
|
|
270
|
+
return this.enqueue(() => this.memory.commitLinkedAccount(commit, () => this.writeState()));
|
|
271
|
+
}
|
|
272
272
|
async getSessionByToken(token) {
|
|
273
273
|
return this.memory.getSessionByToken(token);
|
|
274
274
|
}
|
|
@@ -287,13 +287,20 @@ class FileStorageBackend {
|
|
|
287
287
|
}
|
|
288
288
|
deleteSession(sessionId) {
|
|
289
289
|
return this.transition(async () => {
|
|
290
|
-
const
|
|
290
|
+
const session = await this.memory.getSession(sessionId);
|
|
291
|
+
const linked = await this.memory.getLinkedSessions(sessionId);
|
|
292
|
+
const removed = session ? [session, ...linked] : undefined;
|
|
291
293
|
return (await this.memory.deleteSession(sessionId)) ? removed : undefined;
|
|
292
|
-
}, isPresent,
|
|
294
|
+
}, isPresent, async (removed) => {
|
|
295
|
+
await Promise.all(removed.map((session) => this.memory.createSession(session)));
|
|
296
|
+
}).then((removed) => removed !== undefined);
|
|
293
297
|
}
|
|
294
298
|
async getAllSessions() {
|
|
295
299
|
return this.memory.getAllSessions();
|
|
296
300
|
}
|
|
301
|
+
async getLinkedSessions(sessionId) {
|
|
302
|
+
return this.memory.getLinkedSessions(sessionId);
|
|
303
|
+
}
|
|
297
304
|
async storeDeviceFlow(state, flow) {
|
|
298
305
|
await this.memory.storeDeviceFlow(state, flow);
|
|
299
306
|
await this.persistNow();
|
|
@@ -310,6 +317,10 @@ class FileStorageBackend {
|
|
|
310
317
|
this.scheduleSave();
|
|
311
318
|
return result;
|
|
312
319
|
}
|
|
320
|
+
cacheLinkedFlowTokens(flow, tokens) {
|
|
321
|
+
this.cancelPendingSave();
|
|
322
|
+
return this.enqueue(() => this.memory.cacheLinkedFlowTokens(flow, tokens, () => this.writeState()));
|
|
323
|
+
}
|
|
313
324
|
async storeAuthCodeFlow(internalState, flow) {
|
|
314
325
|
await this.memory.storeAuthCodeFlow(internalState, flow);
|
|
315
326
|
await this.persistNow();
|
|
@@ -391,10 +402,10 @@ class FileStorageBackend {
|
|
|
391
402
|
return claimed;
|
|
392
403
|
}
|
|
393
404
|
async claimGitLabRefresh(sessionId, expectedRefreshToken, now, leaseUntil) {
|
|
394
|
-
return this.memory.claimGitLabRefresh(sessionId, expectedRefreshToken, now, leaseUntil);
|
|
405
|
+
return this.enqueue(() => this.memory.claimGitLabRefresh(sessionId, expectedRefreshToken, now, leaseUntil));
|
|
395
406
|
}
|
|
396
407
|
async releaseGitLabRefresh(sessionId, leaseUntil) {
|
|
397
|
-
await this.memory.releaseGitLabRefresh(sessionId, leaseUntil);
|
|
408
|
+
await this.enqueue(() => this.memory.releaseGitLabRefresh(sessionId, leaseUntil));
|
|
398
409
|
}
|
|
399
410
|
async rotateSession(sessionId, expectedRefreshToken, updates) {
|
|
400
411
|
const previous = {};
|
|
@@ -406,6 +417,15 @@ class FileStorageBackend {
|
|
|
406
417
|
return this.memory.rotateSession(sessionId, expectedRefreshToken, updates);
|
|
407
418
|
}, (rotated) => rotated, () => this.memory.updateSession(sessionId, previous));
|
|
408
419
|
}
|
|
420
|
+
onAbandonedFlowGrant(handler, leaseMs) {
|
|
421
|
+
this.memory.onAbandonedFlowGrant((flow, persistTokens, leaseUntil) => handler(flow, async (tokens) => {
|
|
422
|
+
await persistTokens(tokens);
|
|
423
|
+
await this.persistNow();
|
|
424
|
+
}, leaseUntil), leaseMs);
|
|
425
|
+
}
|
|
426
|
+
onExpiredSession(handler) {
|
|
427
|
+
this.memory.onExpiredSession(handler);
|
|
428
|
+
}
|
|
409
429
|
async cleanup() {
|
|
410
430
|
await this.memory.cleanup();
|
|
411
431
|
await this.saveToFile();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../src/oauth/storage/file.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../src/oauth/storage/file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode, RegisteredOAuthClient } from '../types';
|
|
2
|
-
import { SessionStorageBackend, SessionStorageStats } from './types';
|
|
1
|
+
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode, RegisteredOAuthClient, GitLabTokenResponse } from '../types';
|
|
2
|
+
import { AbandonedFlowGrantHandler, ExpiredSessionHandler, LinkedAccountCommit, SessionStorageBackend, SessionStorageStats } from './types';
|
|
3
3
|
import type { AccountSettings, AccountSettingsRecord } from '../../configuration/types';
|
|
4
4
|
export interface MemoryStorageOptions {
|
|
5
5
|
silent?: boolean;
|
|
@@ -9,6 +9,7 @@ export declare class MemoryStorageBackend implements SessionStorageBackend {
|
|
|
9
9
|
private sessions;
|
|
10
10
|
private deviceFlows;
|
|
11
11
|
private authCodeFlows;
|
|
12
|
+
private abandonedFlowsInProgress;
|
|
12
13
|
private authCodes;
|
|
13
14
|
private tokenToSession;
|
|
14
15
|
private refreshTokenToSession;
|
|
@@ -17,9 +18,14 @@ export declare class MemoryStorageBackend implements SessionStorageBackend {
|
|
|
17
18
|
private accountSettings;
|
|
18
19
|
private gitlabRefreshLeases;
|
|
19
20
|
private cleanupIntervalId;
|
|
21
|
+
private abandonedFlowGrant;
|
|
22
|
+
private expiredSession;
|
|
20
23
|
private silent;
|
|
21
24
|
constructor(options?: MemoryStorageOptions);
|
|
22
25
|
initialize(): Promise<void>;
|
|
26
|
+
private insertSession;
|
|
27
|
+
private restoreLinkedAccount;
|
|
28
|
+
commitLinkedAccount(commit: LinkedAccountCommit, persist?: () => Promise<void>): Promise<boolean>;
|
|
23
29
|
createSession(session: OAuthSession): Promise<void>;
|
|
24
30
|
getSession(sessionId: string): Promise<OAuthSession | undefined>;
|
|
25
31
|
getSessionByToken(token: string): Promise<OAuthSession | undefined>;
|
|
@@ -27,10 +33,12 @@ export declare class MemoryStorageBackend implements SessionStorageBackend {
|
|
|
27
33
|
updateSession(sessionId: string, updates: Partial<OAuthSession>): Promise<boolean>;
|
|
28
34
|
deleteSession(sessionId: string): Promise<boolean>;
|
|
29
35
|
getAllSessions(): Promise<OAuthSession[]>;
|
|
36
|
+
getLinkedSessions(sessionId: string): Promise<OAuthSession[]>;
|
|
30
37
|
storeDeviceFlow(state: string, flow: DeviceFlowState): Promise<void>;
|
|
31
38
|
getDeviceFlow(state: string): Promise<DeviceFlowState | undefined>;
|
|
32
39
|
getDeviceFlowByDeviceCode(deviceCode: string): Promise<DeviceFlowState | undefined>;
|
|
33
40
|
deleteDeviceFlow(state: string): Promise<boolean>;
|
|
41
|
+
cacheLinkedFlowTokens(flow: AuthCodeFlowState, tokens: GitLabTokenResponse, persist?: () => Promise<void>): Promise<boolean>;
|
|
34
42
|
storeAuthCodeFlow(internalState: string, flow: AuthCodeFlowState): Promise<void>;
|
|
35
43
|
getAuthCodeFlow(internalState: string): Promise<AuthCodeFlowState | undefined>;
|
|
36
44
|
deleteAuthCodeFlow(internalState: string): Promise<boolean>;
|
|
@@ -54,6 +62,9 @@ export declare class MemoryStorageBackend implements SessionStorageBackend {
|
|
|
54
62
|
claimGitLabRefresh(sessionId: string, expectedRefreshToken: string, now: number, leaseUntil: number): Promise<boolean>;
|
|
55
63
|
releaseGitLabRefresh(sessionId: string, leaseUntil: number): Promise<void>;
|
|
56
64
|
rotateSession(sessionId: string, expectedRefreshToken: string, updates: Partial<OAuthSession>): Promise<boolean>;
|
|
65
|
+
onAbandonedFlowGrant(handler: AbandonedFlowGrantHandler, leaseMs: number): void;
|
|
66
|
+
onExpiredSession(handler: ExpiredSessionHandler): void;
|
|
67
|
+
private expire;
|
|
57
68
|
cleanup(): Promise<void>;
|
|
58
69
|
close(): Promise<void>;
|
|
59
70
|
getStats(): Promise<SessionStorageStats>;
|