@azure-devops/mcp 2.7.0-nightly.20260618 → 2.7.0-nightly.20260619

package/dist/tools/wiki.js

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 import { z } from "zod";
-import { apiVersion, extractAdoStreamError } from "../utils.js";
+import { apiVersion, extractAdoStreamError, getOrgFromUrl } from "../utils.js";
 import { createExternalContentResponse } from "../shared/content-safety.js";
 const WIKI_TOOLS = {
     list_wikis: "wiki_list_wikis",
@@ -165,6 +165,22 @@ function configureWikiTools(server, tokenProvider, connectionProvider, userAgent
                 if ("error" in parsed) {
                     return { content: [{ type: "text", text: `Error fetching wiki page content: ${parsed.error}` }], isError: true };
                 }
+                // Guard against cross-organization requests: a user-supplied URL must target the
+                // same organization the server is connected to. Otherwise the org segment in the
+                // URL would be silently ignored and content fetched from the configured org instead.
+                const configuredOrg = getOrgFromUrl(connection.serverUrl);
+                const urlOrg = getOrgFromUrl(url);
+                if (configuredOrg && urlOrg !== configuredOrg) {
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: `Error fetching wiki page content: The provided URL targets organization '${urlOrg ?? "unknown"}', which does not match the configured organization '${configuredOrg}'. Cross-organization requests are not allowed.`,
+                            },
+                        ],
+                        isError: true,
+                    };
+                }
                 resolvedProject = parsed.project;
                 resolvedWiki = parsed.wikiIdentifier;
                 if (parsed.pagePath) {

package/dist/utils.js

@@ -90,6 +90,37 @@ export function extractAdoStreamError(content) {
     }
     return null;
 }
+/**
+ * Extracts the Azure DevOps organization identifier from a URL.
+ *
+ * Only recognized Azure DevOps hosts are accepted; any other host returns null
+ * so that callers can treat unrecognized URLs as a boundary violation.
+ *
+ * Supports both modern and legacy organization URL forms:
+ *  - https://dev.azure.com/{org}/...            -> org is the first path segment
+ *  - https://{org}.visualstudio.com/...         -> org is the host subdomain
+ *
+ * @param url Any Azure DevOps URL (e.g. a wiki page link or a connection serverUrl).
+ * @returns The lowercased organization name, or null if it cannot be determined.
+ */
+export function getOrgFromUrl(url) {
+    try {
+        const u = new URL(url);
+        const host = u.hostname.toLowerCase();
+        if (host === "visualstudio.com" || host.endsWith(".visualstudio.com")) {
+            const subdomain = host.split(".")[0];
+            return subdomain && subdomain !== "visualstudio" ? subdomain : null;
+        }
+        if (host === "dev.azure.com" || host.endsWith(".dev.azure.com")) {
+            const firstSegment = u.pathname.split("/").filter(Boolean)[0];
+            return firstSegment ? firstSegment.toLowerCase() : null;
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
 /**
  * Convert a Node.js ReadableStream to a string.
  * Shared utility for consistent stream handling across tools.

package/dist/version.js

@@ -1 +1 @@
-export const packageVersion = "2.7.0-nightly.20260618";
+export const packageVersion = "2.7.0-nightly.20260619";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-devops/mcp",
-  "version": "2.7.0-nightly.20260618",
+  "version": "2.7.0-nightly.20260619",
   "mcpName": "microsoft.com/azure-devops",
   "description": "MCP server for interacting with Azure DevOps",
   "license": "MIT",