@softeria/ms-365-mcp-server 0.107.0 → 0.107.2

package/dist/lib/redirect-uri-validation.js

@@ -0,0 +1,33 @@
+const LOOPBACK_HOSTS = /* @__PURE__ */ new Set(["localhost", "127.0.0.1", "[::1]", "::1"]);
+function isLoopbackHost(host) {
+  return LOOPBACK_HOSTS.has(host.toLowerCase());
+}
+function parseAllowlist(raw) {
+  if (!raw) return null;
+  const list = raw.split(",").map((s) => s.trim()).filter(Boolean);
+  return list.length > 0 ? list : null;
+}
+function isAllowedRedirectUri(value, allowlist) {
+  if (typeof value !== "string" || value.length === 0) return false;
+  let url;
+  try {
+    url = new URL(value);
+  } catch {
+    return false;
+  }
+  if (url.protocol !== "http:" && url.protocol !== "https:") {
+    return false;
+  }
+  if (allowlist && allowlist.length > 0) {
+    return allowlist.includes(value);
+  }
+  if (url.protocol === "http:") {
+    return isLoopbackHost(url.hostname);
+  }
+  return true;
+}
+export {
+  isAllowedRedirectUri,
+  isLoopbackHost,
+  parseAllowlist
+};

package/dist/server.js

@@ -15,6 +15,7 @@ import {
   microsoftBearerTokenAuthMiddleware,
   refreshAccessToken
 } from "./lib/microsoft-auth.js";
+import { isAllowedRedirectUri, parseAllowlist } from "./lib/redirect-uri-validation.js";
 import { getSecrets } from "./secrets.js";
 import { getCloudEndpoints } from "./cloud-config.js";
 import { requestContext } from "./request-context.js";
@@ -169,7 +170,11 @@ class MicrosoftGraphServer {
         const protocol = req.secure ? "https" : "http";
         const requestOrigin = `${protocol}://${req.get("host")}`;
         const browserBase = publicBase ?? requestOrigin;
-        const scopes = buildScopesFromEndpoints(this.options.orgMode, this.options.enabledTools);
+        const scopes = buildScopesFromEndpoints(
+          this.options.orgMode,
+          this.options.enabledTools,
+          this.options.readOnly
+        );
         const metadata = {
           issuer: browserBase,
           authorization_endpoint: `${browserBase}/authorize`,
@@ -190,7 +195,11 @@ class MicrosoftGraphServer {
         const protocol = req.secure ? "https" : "http";
         const requestOrigin = `${protocol}://${req.get("host")}`;
         const browserBase = publicBase ?? requestOrigin;
-        const scopes = this.options.obo ? [`api://${this.secrets.clientId}/access_as_user`] : buildScopesFromEndpoints(this.options.orgMode, this.options.enabledTools);
+        const scopes = this.options.obo ? [`api://${this.secrets.clientId}/access_as_user`] : buildScopesFromEndpoints(
+          this.options.orgMode,
+          this.options.enabledTools,
+          this.options.readOnly
+        );
         res.json({
           resource: `${requestOrigin}/mcp`,
           authorization_servers: [browserBase],
@@ -226,6 +235,20 @@ class MicrosoftGraphServer {
         const clientCodeChallenge = url.searchParams.get("code_challenge");
         const clientCodeChallengeMethod = url.searchParams.get("code_challenge_method");
         const state = url.searchParams.get("state");
+        const redirectUriParam = url.searchParams.get("redirect_uri");
+        if (redirectUriParam) {
+          const allowlist = parseAllowlist(process.env.MS365_MCP_ALLOWED_REDIRECT_URIS);
+          if (!isAllowedRedirectUri(redirectUriParam, allowlist)) {
+            logger.warn("Rejected /authorize request with disallowed redirect_uri", {
+              redirect_uri: redirectUriParam
+            });
+            res.status(400).json({
+              error: "invalid_request",
+              error_description: "redirect_uri is not allowed"
+            });
+            return;
+          }
+        }
         const allowedParams = [
           "response_type",
           "redirect_uri",
@@ -281,19 +304,14 @@ class MicrosoftGraphServer {
           }
         }
         microsoftAuthUrl.searchParams.set("client_id", clientId);
-        if (!microsoftAuthUrl.searchParams.get("scope")) {
-          microsoftAuthUrl.searchParams.set(
-            "scope",
-            "User.Read Files.Read Mail.Read offline_access"
-          );
-        } else {
-          const scopeValue = microsoftAuthUrl.searchParams.get("scope");
-          const scopeList = scopeValue.split(/\s+/).filter(Boolean);
-          if (!scopeList.includes("offline_access")) {
-            scopeList.push("offline_access");
-            microsoftAuthUrl.searchParams.set("scope", scopeList.join(" "));
-          }
-        }
+        const clientScope = microsoftAuthUrl.searchParams.get("scope");
+        const baseScopes = clientScope ? clientScope.split(/\s+/).filter(Boolean) : buildScopesFromEndpoints(
+          this.options.orgMode,
+          this.options.enabledTools,
+          this.options.readOnly
+        );
+        const scopeSet = /* @__PURE__ */ new Set([...baseScopes, "User.Read", "offline_access"]);
+        microsoftAuthUrl.searchParams.set("scope", Array.from(scopeSet).join(" "));
         res.redirect(microsoftAuthUrl.toString());
       });
       app.post("/token", async (req, res) => {

package/docs/deployment.md

@@ -130,6 +130,28 @@ When deploying for an organization, create a dedicated app registration instead
 
 5. **Store credentials** in Key Vault (see [Azure Key Vault Integration](../README.md#azure-key-vault-integration))
 
+## Redirect URI Validation
+
+The /authorize endpoint defensively validates client-supplied `redirect_uri` values before forwarding them to Microsoft Entra (CWE-601, Open Redirect). Microsoft Entra also validates the URI against your app registration, but this server-side check rejects obviously dangerous schemes (`javascript:`, `data:`, `file:`, …) and arbitrary remote `http://` origins before the request leaves the server.
+
+Default behaviour (no explicit allowlist):
+
+- Only `http:` and `https:` schemes are accepted.
+- `http:` is only allowed for loopback hosts (`localhost`, `127.0.0.1`, `::1`).
+- All other `https://` origins are accepted (Entra still has the final say).
+
+For production deployments, configure an explicit allowlist via the `MS365_MCP_ALLOWED_REDIRECT_URIS` environment variable. It takes a comma-separated list of exact URIs; only exact string matches pass validation:
+
+```bash
+# Single redirect URI
+MS365_MCP_ALLOWED_REDIRECT_URIS=https://mcp.example.com/auth/callback
+
+# Multiple URIs (comma-separated, no spaces required)
+MS365_MCP_ALLOWED_REDIRECT_URIS=https://mcp.example.com/auth/callback,https://staging.example.com/auth/callback
+```
+
+The list should mirror the redirect URIs registered on your Azure AD app registration. Leaving the variable unset falls back to the default behaviour above, which is appropriate for local development but not recommended for shared/production deployments.
+
 ## Reverse Proxy / Custom Domain
 
 When running behind a reverse proxy, set `MS365_MCP_PUBLIC_URL` so that the OAuth authorize URL handed back to the user's browser is resolvable from outside the server's network:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softeria/ms-365-mcp-server",
-  "version": "0.107.0",
+  "version": "0.107.2",
   "description": " A Model Context Protocol (MCP) server for interacting with Microsoft 365 and Office services through the Graph API",
   "type": "module",
   "main": "dist/index.js",