@zereight/mcp-gitlab 2.2.5 → 2.2.6

package/README.ko.md

@@ -138,7 +138,7 @@ command = lib.getExe inputs.gitlab-mcp.packages.${system}.default;
 
 예시는 기존 `mcp-gitlab`보다 충돌 가능성이 낮은 `zereight-mcp-gitlab` 별칭을 사용합니다. MCP 클라이언트가 찾지 못하면 `which zereight-mcp-gitlab`의 절대 경로를 사용하세요.
 
-전역 설치를 쓰지 않으려면 `npx -y @zereight/mcp-gitlab@2.2.4`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
+전역 설치를 쓰지 않으려면 `npx -y @zereight/mcp-gitlab@2.2.5`처럼 직전 안정 버전(문서가 권장하는 버전)으로 고정하세요. 항상 최신 버전을 원하면 `npx -y @zereight/mcp-gitlab@latest`를 사용하세요. 새 버전이 나오면 서버가 시작 시 stderr로 알려줍니다(`GITLAB_DISABLE_VERSION_CHECK=true`로 비활성화 가능).
 
 #### CLI 인자 사용하기(환경 변수 문제가 있는 클라이언트용)
 

package/README.md

@@ -143,7 +143,7 @@ The store path is pinned by your lock file; update it with `nix flake update git
 
 The examples use `zereight-mcp-gitlab`, a less collision-prone alias for the legacy `mcp-gitlab` binary. If your MCP client cannot find it, use the absolute path from `which zereight-mcp-gitlab`.
 
-No global install? Pin `npx` to the previous stable release (the version these docs recommend), for example `npx -y @zereight/mcp-gitlab@2.2.4`. If you always want the newest release, use `npx -y @zereight/mcp-gitlab@latest` instead. The server prints a notice to stderr on startup when a newer version is available (disable with `GITLAB_DISABLE_VERSION_CHECK=true`).
+No global install? Pin `npx` to the previous stable release (the version these docs recommend), for example `npx -y @zereight/mcp-gitlab@2.2.5`. If you always want the newest release, use `npx -y @zereight/mcp-gitlab@latest` instead. The server prints a notice to stderr on startup when a newer version is available (disable with `GITLAB_DISABLE_VERSION_CHECK=true`).
 
 #### Using CLI Arguments (for clients with env var issues)
 

package/README.pt-BR.md

@@ -138,7 +138,7 @@ O caminho no store é fixado pelo seu lock file; atualize-o com `nix flake updat
 
 Os exemplos usam `zereight-mcp-gitlab`, um alias com menor chance de conflito que o binário legado `mcp-gitlab`. Se o seu cliente MCP não o encontrar, use o caminho absoluto retornado por `which zereight-mcp-gitlab`.
 
-Não quer instalar globalmente? Fixe o `npx` na versão estável anterior (a versão recomendada por esta documentação), por exemplo `npx -y @zereight/mcp-gitlab@2.2.4`. Se quiser sempre a versão mais recente, use `npx -y @zereight/mcp-gitlab@latest`. O servidor exibe um aviso no stderr durante a inicialização quando existe uma versão mais nova disponível (desative com `GITLAB_DISABLE_VERSION_CHECK=true`).
+Não quer instalar globalmente? Fixe o `npx` na versão estável anterior (a versão recomendada por esta documentação), por exemplo `npx -y @zereight/mcp-gitlab@2.2.5`. Se quiser sempre a versão mais recente, use `npx -y @zereight/mcp-gitlab@latest`. O servidor exibe um aviso no stderr durante a inicialização quando existe uma versão mais nova disponível (desative com `GITLAB_DISABLE_VERSION_CHECK=true`).
 
 #### Usando argumentos de CLI (para clientes com problemas com variáveis de ambiente)
 

package/README.zh-CN.md

@@ -138,7 +138,7 @@ command = lib.getExe inputs.gitlab-mcp.packages.${system}.default;
 
 示例使用 `zereight-mcp-gitlab`，这是比旧的 `mcp-gitlab` 更不容易冲突的别名。如果 MCP 客户端找不到它，请使用 `which zereight-mcp-gitlab` 输出的绝对路径。
 
-如果不想全局安装，请将 `npx` 固定到上一个稳定版本（即文档推荐的版本），例如 `npx -y @zereight/mcp-gitlab@2.2.4`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
+如果不想全局安装，请将 `npx` 固定到上一个稳定版本（即文档推荐的版本），例如 `npx -y @zereight/mcp-gitlab@2.2.5`。如果始终想使用最新版本，请改用 `npx -y @zereight/mcp-gitlab@latest`。有新版本发布时，服务器会在启动时通过 stderr 提示（可用 `GITLAB_DISABLE_VERSION_CHECK=true` 关闭）。
 
 #### 使用 CLI 参数（适用于环境变量有问题的客户端）
 

package/build/index.js

@@ -1186,6 +1186,27 @@ function getEffectiveAllowedProjectIds() {
     }
     return GITLAB_ALLOWED_PROJECT_IDS;
 }
+/**
+ * Keep a dynamic project scope bound to its session
+ * A request that omits X-GitLab-Allowed-Project-Ids keeps the session scope, and a
+ * request naming a different scope is refused (null). An unscoped session may be
+ * narrowed. Re-initialize to change the scope.
+ */
+function bindSessionProjectScope(requested, sessionScope) {
+    if (!sessionScope || sessionScope.length === 0) {
+        return requested;
+    }
+    if (requested === undefined) {
+        return sessionScope;
+    }
+    const want = new Set(requested);
+    const have = new Set(sessionScope);
+    return want.size === have.size && [...want].every(id => have.has(id)) ? sessionScope : null;
+}
+const SESSION_PROJECT_SCOPE_MISMATCH = {
+    error: "Project scope mismatch",
+    message: "X-GitLab-Allowed-Project-Ids does not match the project scope of this session. Re-initialize to change it.",
+};
 /**
  * Reject tools that cannot be limited to allowed projects when
  * ENABLE_STRICT_PROJECT_SCOPE is set and an allowlist is in effect
@@ -11694,6 +11715,9 @@ async function startStreamableHTTPServer() {
         const incomingSid = readMcpSessionIdHeader(req);
         const isInit = isInitializationRequestBody(req.body);
         const headerAuth = parseAuthHeaders(req);
+        const opened = incomingSid && looksLikeStatelessSessionId(incomingSid)
+            ? openSessionId(material, incomingSid, sessionTtlSeconds)
+            : null;
         // In GITLAB_MCP_OAUTH mode, req.auth may be populated by requireBearerAuth.
         // Use it when headerAuth is null (no Private-Token / JOB-TOKEN / Authorization).
         let effective = null;
@@ -11701,7 +11725,6 @@ async function startStreamableHTTPServer() {
         if (headerAuth) {
             let needsUpstreamValidation = isInit || !incomingSid;
             if (!needsUpstreamValidation && incomingSid && looksLikeStatelessSessionId(incomingSid)) {
-                const opened = openSessionId(material, incomingSid, sessionTtlSeconds);
                 needsUpstreamValidation =
                     !opened ||
                         opened.h !== headerAuth.header ||
@@ -11748,7 +11771,6 @@ async function startStreamableHTTPServer() {
         let sidPresentedButInvalid = false;
         if (!effective && incomingSid) {
             if (looksLikeStatelessSessionId(incomingSid)) {
-                const opened = openSessionId(material, incomingSid, sessionTtlSeconds);
                 if (opened) {
                     effective = {
                         header: opened.h,
@@ -11791,6 +11813,18 @@ async function startStreamableHTTPServer() {
             });
             return;
         }
+        // The project scope sealed into the sid belongs to the session: live headers
+        // may refresh the token but cannot drop or replace the scope.
+        if (ENABLE_DYNAMIC_PROJECT_SCOPE && freshAuthPresent && !isInit && opened) {
+            const allowedProjectIds = bindSessionProjectScope(effective.allowedProjectIds, opened.p);
+            if (allowedProjectIds === null) {
+                metrics.authFailures++;
+                metrics.statelessAuthFailures++;
+                res.status(401).json(SESSION_PROJECT_SCOPE_MISMATCH);
+                return;
+            }
+            effective.allowedProjectIds = allowedProjectIds;
+        }
         // Always mint a fresh sid so the embedded iat advances on every request.
         // This makes OAUTH_STATELESS_SESSION_TTL_SECONDS behave as an inactivity
         // timeout rather than an absolute-age cap — matching the legacy
@@ -12180,7 +12214,13 @@ async function startStreamableHTTPServer() {
                 }
             }
             else if (sessionId && authData) {
-                const result = await storeValidatedSessionAuth(sessionId, authData, publicBaseUrl, authBySession[sessionId], { skipIfUnchanged: true });
+                const allowedProjectIds = bindSessionProjectScope(authData.allowedProjectIds, authBySession[sessionId].allowedProjectIds);
+                if (allowedProjectIds === null) {
+                    metrics.authFailures++;
+                    res.status(401).json(SESSION_PROJECT_SCOPE_MISMATCH);
+                    return;
+                }
+                const result = await storeValidatedSessionAuth(sessionId, { ...authData, allowedProjectIds }, publicBaseUrl, authBySession[sessionId], { skipIfUnchanged: true });
                 if (result === "invalid") {
                     metrics.authFailures++;
                     res.status(401).json({
@@ -12193,6 +12233,10 @@ async function startStreamableHTTPServer() {
                 if (result === "stored") {
                     logger.debug(`Session ${sessionId}: updated ${authData.header} header`);
                 }
+                else {
+                    // Same token: keep the stored auth but let an unscoped session narrow.
+                    authBySession[sessionId].allowedProjectIds = allowedProjectIds;
+                }
             }
             else if (sessionId && authBySession[sessionId]) {
                 // Existing session with stored auth: update last used time and reset timeout
@@ -12218,7 +12262,13 @@ async function startStreamableHTTPServer() {
                         setAuthTimeout(sessionId);
                     }
                     else {
-                        authBySession[sessionId] = withPublicBaseUrl(headerAuthData, publicBaseUrl, authBySession[sessionId]);
+                        const allowedProjectIds = bindSessionProjectScope(headerAuthData.allowedProjectIds, authBySession[sessionId].allowedProjectIds);
+                        if (allowedProjectIds === null) {
+                            metrics.authFailures++;
+                            res.status(401).json(SESSION_PROJECT_SCOPE_MISMATCH);
+                            return;
+                        }
+                        authBySession[sessionId] = withPublicBaseUrl({ ...headerAuthData, allowedProjectIds }, publicBaseUrl, authBySession[sessionId]);
                         setAuthTimeout(sessionId);
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zereight/mcp-gitlab",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "mcpName": "io.github.zereight/gitlab-mcp",
   "description": "GitLab MCP server for projects, merge requests, issues, pipelines, wiki, releases, and more",
   "keywords": [