@zereight/mcp-gitlab 2.1.67 → 2.1.69

package/build/test/oauth-startup.test.js

@@ -0,0 +1,204 @@
+/**
+ * OAuth startup tests.
+ *
+ * - isAuthInvalidTokenResponse: pure classifier — refresh failures that mean
+ *   "re-login would fix it" vs transient/config errors that must not open a browser.
+ * - ensureOAuthToken: lazy first-use delivery — the caller must receive the
+ *   token even when the on-disk token is still valid (regression: returning
+ *   early on hasValidToken() alone leaves requests unauthenticated).
+ *
+ * Temp token files + a loopback mock for /oauth/token only; no MCP server.
+ * The missing-token and invalid_grant paths start the interactive browser
+ * flow and are deliberately not covered here.
+ */
+import { describe, test, afterEach } from "node:test";
+import assert from "node:assert";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as http from "node:http";
+import { GitLabOAuth, ensureOAuthToken, isAuthInvalidTokenResponse } from "../oauth.js";
+const validTokenFile = {
+    access_token: "cached-access-token",
+    refresh_token: "cached-refresh-token",
+    expires_in: 7200,
+    created_at: Date.now(),
+    token_type: "Bearer",
+};
+const expiredTokenFile = {
+    ...validTokenFile,
+    created_at: Date.now() - 10 * 3600 * 1000,
+};
+const tmpDirs = [];
+const servers = [];
+afterEach(async () => {
+    for (const server of servers.splice(0)) {
+        await new Promise(resolve => server.close(() => resolve()));
+    }
+    for (const dir of tmpDirs.splice(0)) {
+        fs.rmSync(dir, { recursive: true, force: true });
+    }
+});
+function makeTokenFile(data) {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "oauth-startup-"));
+    tmpDirs.push(dir);
+    const file = path.join(dir, "token.json");
+    fs.writeFileSync(file, JSON.stringify(data));
+    return file;
+}
+function makeClient(tokenStoragePath, gitlabUrl, extra) {
+    return new GitLabOAuth({
+        clientId: "test-client",
+        redirectUri: "http://127.0.0.1:8888/callback",
+        gitlabUrl,
+        scopes: ["api"],
+        tokenStoragePath,
+        ...extra,
+    });
+}
+async function startTokenServer(handler) {
+    const bodies = [];
+    const server = http.createServer((req, res) => {
+        let body = "";
+        req.on("data", (chunk) => {
+            body += chunk.toString();
+        });
+        req.on("end", () => {
+            bodies.push(body);
+            const { status, json } = handler();
+            res.writeHead(status, { "Content-Type": "application/json" });
+            res.end(JSON.stringify(json));
+        });
+    });
+    servers.push(server);
+    await new Promise(resolve => server.listen(0, "127.0.0.1", () => resolve()));
+    const addr = server.address();
+    assert(addr && typeof addr !== "string");
+    return { url: `http://127.0.0.1:${addr.port}`, bodies };
+}
+describe("isAuthInvalidTokenResponse", () => {
+    test("400 invalid_grant is auth-invalid", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(400, '{"error":"invalid_grant"}'), true);
+    });
+    test("400 invalid_token is auth-invalid", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(400, '{"error":"invalid_token"}'), true);
+    });
+    test("401 invalid_grant is auth-invalid", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(401, '{"error":"invalid_grant"}'), true);
+    });
+    test("400 invalid_client is not auth-invalid (config error)", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(400, '{"error":"invalid_client"}'), false);
+    });
+    test("400 invalid_request is not auth-invalid (config error)", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(400, '{"error":"invalid_request"}'), false);
+    });
+    test("500 server_error is not auth-invalid (transient)", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(500, '{"error":"server_error"}'), false);
+    });
+    test("429 is not auth-invalid (rate limited)", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(429, '{"error":"invalid_grant"}'), false);
+    });
+    test("non-JSON body is not auth-invalid", () => {
+        assert.strictEqual(isAuthInvalidTokenResponse(400, "gateway timeout"), false);
+    });
+});
+describe("ensureOAuthToken", () => {
+    test("null client is a no-op", async () => {
+        const delivered = [];
+        await ensureOAuthToken(null, null, t => {
+            delivered.push(t);
+        });
+        await ensureOAuthToken(undefined, undefined, t => {
+            delivered.push(t);
+        });
+        assert.deepStrictEqual(delivered, []);
+    });
+    test("first call with valid cached token delivers it without network", async () => {
+        // Closed port: any fetch attempt fails, proving the cached path is network-free.
+        const client = makeClient(makeTokenFile(validTokenFile), "http://127.0.0.1:9");
+        const delivered = [];
+        await ensureOAuthToken(client, null, t => {
+            delivered.push(t);
+        });
+        assert.deepStrictEqual(delivered, ["cached-access-token"]);
+    });
+    test("already-held valid token is not re-delivered", async () => {
+        const client = makeClient(makeTokenFile(validTokenFile), "http://127.0.0.1:9");
+        const delivered = [];
+        await ensureOAuthToken(client, "cached-access-token", t => {
+            delivered.push(t);
+        });
+        assert.deepStrictEqual(delivered, []);
+    });
+    test("expired token refreshes via /oauth/token and persists", async () => {
+        const { url, bodies } = await startTokenServer(() => ({
+            status: 200,
+            json: {
+                access_token: "fresh-token",
+                refresh_token: "fresh-refresh",
+                expires_in: 7200,
+                token_type: "Bearer",
+            },
+        }));
+        const file = makeTokenFile(expiredTokenFile);
+        const client = makeClient(file, url);
+        const delivered = [];
+        await ensureOAuthToken(client, null, t => {
+            delivered.push(t);
+        });
+        assert.deepStrictEqual(delivered, ["fresh-token"]);
+        assert.strictEqual(bodies.length, 1);
+        assert.match(bodies[0], /grant_type=refresh_token/);
+        assert.match(bodies[0], /refresh_token=cached-refresh-token/);
+        const saved = JSON.parse(fs.readFileSync(file, "utf8"));
+        assert.strictEqual(saved.access_token, "fresh-token");
+    });
+    test("transient refresh failure propagates without opening a browser", async () => {
+        const { url } = await startTokenServer(() => ({ status: 500, json: { error: "server_error" } }));
+        const client = makeClient(makeTokenFile(expiredTokenFile), url);
+        const delivered = [];
+        // Rejection (not a browser popup) proves the no-browser path.
+        await assert.rejects(() => ensureOAuthToken(client, null, t => {
+            delivered.push(t);
+        }), /Token refresh failed: 500/);
+        assert.deepStrictEqual(delivered, []);
+    });
+    test("token script resolves once, then fast path holds", async () => {
+        const dir = fs.mkdtempSync(path.join(os.tmpdir(), "oauth-startup-"));
+        tmpDirs.push(dir);
+        const client = makeClient(path.join(dir, "token.json"), "http://127.0.0.1:9", {
+            tokenScript: "echo script-token-1",
+        });
+        const delivered = [];
+        await ensureOAuthToken(client, null, t => {
+            delivered.push(t);
+        });
+        assert.deepStrictEqual(delivered, ["script-token-1"]);
+        await ensureOAuthToken(client, delivered[0], t => {
+            delivered.push(t);
+        });
+        assert.deepStrictEqual(delivered, ["script-token-1"]);
+    });
+    test("concurrent calls coalesce into a single refresh request", async () => {
+        const { url, bodies } = await startTokenServer(() => ({
+            status: 200,
+            json: {
+                access_token: "coalesced-token",
+                refresh_token: "new-refresh",
+                expires_in: 7200,
+                token_type: "Bearer",
+            },
+        }));
+        const file = makeTokenFile(expiredTokenFile);
+        const client = makeClient(file, url);
+        const deliveredA = [];
+        const deliveredB = [];
+        await Promise.all([
+            ensureOAuthToken(client, null, t => deliveredA.push(t)),
+            ensureOAuthToken(client, null, t => deliveredB.push(t)),
+        ]);
+        assert.deepStrictEqual(deliveredA, ["coalesced-token"]);
+        assert.deepStrictEqual(deliveredB, ["coalesced-token"]);
+        assert.strictEqual(bodies.length, 1);
+    });
+});

package/build/test/test-dynamic-project-scope.js

@@ -5,6 +5,22 @@ import { MockGitLabServer, findMockServerPort } from "./utils/mock-gitlab-server
 import { CustomHeaderClient } from "./clients/custom-header-client.js";
 const MOCK_TOKEN = "glpat-dynamic-scope-token";
 const SCOPE_HEADER = "x-gitlab-allowed-project-ids";
+function parseToolJson(result) {
+    assert.ok(result.isError !== true, "tool should succeed");
+    const first = result.content[0];
+    assert.ok(first !== undefined && first.type === "text");
+    return JSON.parse(first.text);
+}
+function snippetTitleFrom(value) {
+    if (value === null || typeof value !== "object" || !("title" in value)) {
+        assert.fail("expected a snippet object with title");
+    }
+    const title = value.title;
+    if (typeof title !== "string") {
+        assert.fail("expected snippet title to be a string");
+    }
+    return title;
+}
 async function connectClient(mcpUrl, scope) {
     const headers = { authorization: `Bearer ${MOCK_TOKEN}` };
     if (scope !== undefined) {
@@ -63,6 +79,7 @@ describe("Dynamic project scope", { concurrency: 1 }, () => {
                     ENABLE_DYNAMIC_PROJECT_SCOPE: "true",
                     ENABLE_STRICT_PROJECT_SCOPE: "true",
                     GITLAB_API_URL: `${mockGitLab.getUrl()}/api/v4`,
+                    GITLAB_TOOLS: "execute_graphql",
                     GITLAB_ALLOWED_PROJECT_IDS: "1,2",
                 },
             });
@@ -270,6 +287,7 @@ describe("Dynamic project scope", { concurrency: 1 }, () => {
                     REMOTE_AUTHORIZATION: "true",
                     ENABLE_DYNAMIC_PROJECT_SCOPE: "true",
                     GITLAB_API_URL: `${mockGitLab.getUrl()}/api/v4`,
+                    GITLAB_TOOLS: "execute_graphql,get_vulnerability",
                 },
             });
             servers.push(server);
@@ -323,6 +341,150 @@ describe("Dynamic project scope", { concurrency: 1 }, () => {
             }
         });
     });
+    describe("with session-scoped snippet tools", () => {
+        let mockGitLab;
+        const servers = [];
+        let mcpUrl;
+        const snippetHits = [];
+        before(async () => {
+            const mockPort = await findMockServerPort();
+            mockGitLab = new MockGitLabServer({ port: mockPort, validTokens: [MOCK_TOKEN] });
+            mockGitLab.addMockHandler("get", "/snippets", (_req, res) => {
+                snippetHits.push("personal:list");
+                res.json([{ id: 99, title: "personal snippet of the token owner" }]);
+            });
+            mockGitLab.addMockHandler("get", "/projects/5/snippets", (_req, res) => {
+                snippetHits.push("project:list");
+                res.json([{ id: 42, title: "project snippet" }]);
+            });
+            mockGitLab.addMockHandler("get", "/projects/5/snippets/42", (_req, res) => {
+                snippetHits.push("project:get");
+                res.json({ id: 42, title: "project snippet" });
+            });
+            mockGitLab.addMockHandler("get", "/snippets/42", (_req, res) => {
+                snippetHits.push("personal:get");
+                res.json({ id: 42, title: "personal snippet of the token owner" });
+            });
+            mockGitLab.addMockHandler("delete", "/snippets/99", (_req, res) => {
+                snippetHits.push("personal:delete");
+                res.status(204).end();
+            });
+            mockGitLab.addMockHandler("delete", "/projects/5/snippets/42", (_req, res) => {
+                snippetHits.push("project:delete");
+                res.status(204).end();
+            });
+            mockGitLab.addMockHandler("post", "/snippets", (_req, res) => {
+                snippetHits.push("personal:create");
+                res.json({ id: 99, title: "personal snippet of the token owner" });
+            });
+            mockGitLab.addMockHandler("post", "/projects/5/snippets", (_req, res) => {
+                snippetHits.push("project:create");
+                res.json({ id: 42, title: "project snippet" });
+            });
+            mockGitLab.addMockHandler("put", "/snippets/42", (_req, res) => {
+                snippetHits.push("personal:update");
+                res.json({ id: 42, title: "updated personal snippet" });
+            });
+            mockGitLab.addMockHandler("put", "/projects/5/snippets/42", (_req, res) => {
+                snippetHits.push("project:update");
+                res.json({ id: 42, title: "updated project snippet" });
+            });
+            await mockGitLab.start();
+            const mcpPort = await findAvailablePort(3200);
+            const server = await launchServer({
+                mode: TransportMode.STREAMABLE_HTTP,
+                port: mcpPort,
+                timeout: 5000,
+                env: {
+                    STREAMABLE_HTTP: "true",
+                    REMOTE_AUTHORIZATION: "true",
+                    ENABLE_DYNAMIC_PROJECT_SCOPE: "true",
+                    GITLAB_TOOLSETS: "snippets",
+                    GITLAB_API_URL: `${mockGitLab.getUrl()}/api/v4`,
+                },
+            });
+            servers.push(server);
+            mcpUrl = `http://${HOST}:${mcpPort}/mcp`;
+        });
+        after(async () => {
+            cleanupServers(servers);
+            await mockGitLab?.stop();
+        });
+        test("list_snippets without project_id stays within the session scope", async () => {
+            snippetHits.length = 0;
+            const client = await connectClient(mcpUrl, "5");
+            try {
+                const result = await client.callTool("list_snippets", {});
+                assert.ok(result.content, "Should have content");
+                const content = result.content[0];
+                assert.ok("text" in content, "Content should have text");
+                const snippets = JSON.parse(content.text);
+                assert.strictEqual(snippets[0].title, "project snippet");
+            }
+            finally {
+                await client.disconnect();
+            }
+            assert.deepStrictEqual(snippetHits, ["project:list"], "must route to the scoped project, not the personal /snippets endpoint");
+        });
+        test("delete_snippet without project_id stays within the session scope", async () => {
+            snippetHits.length = 0;
+            const client = await connectClient(mcpUrl, "5");
+            try {
+                await client.callTool("delete_snippet", { snippet_id: 42 });
+            }
+            finally {
+                await client.disconnect();
+            }
+            assert.deepStrictEqual(snippetHits, ["project:delete"], "must route to the scoped project, not the personal /snippets endpoint");
+        });
+        test("get_snippet without project_id stays within the session scope", async () => {
+            snippetHits.length = 0;
+            const client = await connectClient(mcpUrl, "5");
+            try {
+                const result = await client.callTool("get_snippet", { snippet_id: 42 });
+                assert.ok(result.content, "Should have content");
+                const content = result.content[0];
+                assert.ok("text" in content, "Content should have text");
+                const snippet = JSON.parse(content.text);
+                assert.strictEqual(snippet.title, "project snippet");
+            }
+            finally {
+                await client.disconnect();
+            }
+            assert.deepStrictEqual(snippetHits, ["project:get"], "must route to the scoped project, not the personal /snippets endpoint");
+        });
+        test("create_snippet without project_id stays within the session scope", async () => {
+            snippetHits.length = 0;
+            const client = await connectClient(mcpUrl, "5");
+            try {
+                const result = await client.callTool("create_snippet", {
+                    title: "scoped create",
+                    file_name: "note.md",
+                    content: "hi",
+                });
+                assert.strictEqual(snippetTitleFrom(parseToolJson(result)), "project snippet");
+            }
+            finally {
+                await client.disconnect();
+            }
+            assert.deepStrictEqual(snippetHits, ["project:create"], "must route to the scoped project, not the personal /snippets endpoint");
+        });
+        test("update_snippet without project_id stays within the session scope", async () => {
+            snippetHits.length = 0;
+            const client = await connectClient(mcpUrl, "5");
+            try {
+                const result = await client.callTool("update_snippet", {
+                    snippet_id: 42,
+                    title: "scoped update",
+                });
+                assert.strictEqual(snippetTitleFrom(parseToolJson(result)), "updated project snippet");
+            }
+            finally {
+                await client.disconnect();
+            }
+            assert.deepStrictEqual(snippetHits, ["project:update"], "must route to the scoped project, not the personal /snippets endpoint");
+        });
+    });
     describe("with ENABLE_DYNAMIC_PROJECT_SCOPE disabled", () => {
         let mockGitLab;
         const servers = [];

package/build/test/test-geteffectiveprojectid.js

@@ -168,6 +168,7 @@ describe('getEffectiveProjectId', { concurrency: 1 }, () => {
                     GITLAB_API_URL: `${mockGitLabUrl}/api/v4`,
                     GITLAB_PROJECT_ID: DEFAULT_PROJECT_ID,
                     GITLAB_READ_ONLY_MODE: 'false',
+                    GITLAB_TOOLSETS: 'all',
                 }
             });
             servers.push(server);
@@ -318,6 +319,7 @@ describe('getEffectiveProjectId', { concurrency: 1 }, () => {
                     GITLAB_PROJECT_ID: DEFAULT_PROJECT_ID,
                     GITLAB_ALLOWED_PROJECT_IDS: DEFAULT_PROJECT_ID,
                     GITLAB_READ_ONLY_MODE: 'true',
+                    GITLAB_TOOLSETS: 'all',
                 }
             });
             servers.push(server);
@@ -484,7 +486,7 @@ describe('getEffectiveProjectId', { concurrency: 1 }, () => {
                     REMOTE_AUTHORIZATION: 'true',
                     GITLAB_API_URL: `${mockGitLabUrl}/api/v4`,
                     GITLAB_PROJECT_ID: DEFAULT_PROJECT_ID,
-                    GITLAB_TOOLSETS: 'variables',
+                    GITLAB_TOOLSETS: 'variables,repositories,groups,projects',
                 }
             });
             servers.push(server);
@@ -582,7 +584,7 @@ describe('getEffectiveProjectId', { concurrency: 1 }, () => {
                     REMOTE_AUTHORIZATION: 'true',
                     GITLAB_API_URL: `${mockGitLabUrl}/api/v4`,
                     GITLAB_ALLOWED_PROJECT_IDS: DEFAULT_PROJECT_ID,
-                    GITLAB_TOOLSETS: 'variables,merge_requests,issues,pipelines',
+                    GITLAB_TOOLSETS: 'variables,merge_requests,issues,pipelines,repositories,groups,projects',
                 }
             });
             servers.push(server);

package/build/test/test-permission-mode.js

@@ -31,6 +31,8 @@ async function launchMcpServer(extraEnv = {}) {
             REMOTE_AUTHORIZATION: "true",
             GITLAB_API_URL: `${mockGitLabUrl}/api/v4`,
             GITLAB_TOOLSETS: "all",
+            // execute_graphql is in no toolset; opt in so the guards under test are reachable.
+            GITLAB_TOOLS: "execute_graphql",
             ...extraEnv,
         },
     });
@@ -83,6 +85,7 @@ const DELETE_SAMPLE_TOOLS = [
     "delete_group_milestone",
     "delete_project_variable",
     "delete_webhook",
+    "delete_snippet",
 ];
 // Destructive teardown tools whose names do not start with `delete_`. All five are listed
 // here (list-hiding) and exercised with explicit `callTool` literals below (call-rejection),
@@ -279,6 +282,90 @@ describe("Permission Mode", { concurrency: 1 }, () => {
             }
         });
     });
+    describe("call-time enforcement of list filters (modify mode)", () => {
+        const servers = [];
+        after(() => cleanupServers(servers));
+        /** Calls a tool on a fresh client and returns the serialized result, or the error message. */
+        async function callOutcome(server, name, args) {
+            const client = await connectClient(server);
+            try {
+                return JSON.stringify(await client.callTool(name, args));
+            }
+            catch (error) {
+                return error instanceof Error ? error.message : String(error);
+            }
+            finally {
+                await client.disconnect();
+            }
+        }
+        test("rejects a regex-denied tool and an execute_graphql with no GITLAB_TOOLS entry", async () => {
+            const server = await launchMcpServer({
+                GITLAB_PERMISSION_MODE: "modify",
+                GITLAB_TOOLS: "",
+                GITLAB_DENIED_TOOLS_REGEX: "^merge_merge_request$",
+            });
+            servers.push(server);
+            const names = await getToolNames(server);
+            assert.ok(!names.includes("merge_merge_request"), "regex-denied tool must be unlisted");
+            assert.ok(!names.includes("execute_graphql"), "execute_graphql must be unlisted");
+            const merge = await callOutcome(server, "merge_merge_request", {
+                project_id: "1",
+                merge_request_iid: 1,
+            });
+            assert.ok(merge.includes("not available"), `merge_merge_request: ${merge}`);
+            const graphql = await callOutcome(server, "execute_graphql", {
+                query: "query { currentUser { id } }",
+            });
+            assert.ok(graphql.includes("not available"), `execute_graphql: ${graphql}`);
+        });
+        test("policy-hidden tool is unlisted but still callable", async () => {
+            const server = await launchMcpServer({
+                GITLAB_PERMISSION_MODE: "modify",
+                GITLAB_TOOL_POLICY_HIDDEN: "list_issues",
+            });
+            servers.push(server);
+            const names = await getToolNames(server);
+            assert.ok(!names.includes("list_issues"), "hidden tool must be unlisted");
+            const outcome = await callOutcome(server, "list_issues", { project_id: "1" });
+            assert.ok(!outcome.includes("not available"), `hidden tool must stay callable: ${outcome}`);
+        });
+        test("policy-hidden tool that is also regex-denied is rejected", async () => {
+            const server = await launchMcpServer({
+                GITLAB_PERMISSION_MODE: "modify",
+                GITLAB_TOOL_POLICY_HIDDEN: "list_issues",
+                GITLAB_DENIED_TOOLS_REGEX: "^list_issues$",
+            });
+            servers.push(server);
+            const names = await getToolNames(server);
+            assert.ok(!names.includes("list_issues"), "hidden tool must be unlisted");
+            const outcome = await callOutcome(server, "list_issues", { project_id: "1" });
+            assert.ok(outcome.includes("not available"), `regex denial must win over hidden exemption: ${outcome}`);
+        });
+        test("tool outside the enabled toolsets is rejected until discover_tools activates it", async () => {
+            const server = await launchMcpServer({
+                GITLAB_PERMISSION_MODE: "modify",
+                GITLAB_TOOLSETS: "issues",
+            });
+            servers.push(server);
+            const client = await connectClient(server);
+            try {
+                const before = await client
+                    .callTool("list_pipelines", { project_id: "1" })
+                    .then(r => JSON.stringify(r))
+                    .catch((e) => e.message);
+                assert.ok(before.includes("not available"), `before activation: ${before}`);
+                await client.callTool("discover_tools", { category: "pipelines" });
+                const after = await client
+                    .callTool("list_pipelines", { project_id: "1" })
+                    .then(r => JSON.stringify(r))
+                    .catch((e) => e.message);
+                assert.ok(!after.includes("not available"), `after activation: ${after}`);
+            }
+            finally {
+                await client.disconnect();
+            }
+        });
+    });
     describe("readonly mode via GITLAB_PERMISSION_MODE", () => {
         let server;
         const servers = [];