@upstash/context7-mcp 4.0.3 → 4.0.5

package/dist/index.js

@@ -12,9 +12,16 @@ import { AsyncLocalStorage } from "async_hooks";
 import { randomUUID } from "node:crypto";
 import { SERVER_VERSION, RESOURCE_URL, OAUTH_AUTH_SERVER_URL, EMA_ISSUER, OPENAI_APPS_CHALLENGE_TOKEN, } from "./lib/constants.js";
 import { maybeElicitAuthSignIn } from "./lib/auth/auth-prompt.js";
-import { getClientIp } from "./lib/client-ip.js";
+import { getMaxSubscriptions } from "./lib/subscriptions.js";
 /** Default HTTP server port */
 const DEFAULT_PORT = 3000;
+const CLAUDE_CODE_PLUGIN = "claude-code-plugin";
+function getPluginFromRequest(req) {
+    return req.query.client === CLAUDE_CODE_PLUGIN ? CLAUDE_CODE_PLUGIN : undefined;
+}
+function requiresAuthentication(req, plugin) {
+    return req.path === "/mcp/oauth" || Boolean(plugin);
+}
 // Parse CLI arguments using commander
 const program = new Command()
     .version(SERVER_VERSION, "-v, --version", "output the current version")
@@ -242,6 +249,9 @@ async function main() {
     if (TRANSPORT_TYPE === "http") {
         const initialPort = CLI_PORT ?? DEFAULT_PORT;
         const app = express();
+        // Only private/local infrastructure may supply forwarding headers. Express
+        // then walks the chain right-to-left and ignores attacker-added prefixes.
+        app.set("trust proxy", ["loopback", "linklocal", "uniquelocal", "100.64.0.0/10"]);
         app.use(express.json());
         app.use((req, res, next) => {
             res.setHeader("Access-Control-Allow-Origin", "*");
@@ -273,6 +283,7 @@ async function main() {
         };
         const extractApiKey = (req) => {
             return (extractBearerToken(req.headers.authorization) ||
+                extractHeaderValue(req.headers["x-context7-api-key"]) ||
                 extractHeaderValue(req.headers["context7-api-key"]) ||
                 extractHeaderValue(req.headers["x-api-key"]) ||
                 extractHeaderValue(req.headers["context7_api_key"]) ||
@@ -293,6 +304,7 @@ async function main() {
         // go idle and the gateway reaps them at streamIdleTimeout (300s).
         const mcpHandler = createMcpHandler(() => createMcpServer(), {
             keepAliveMs: 0,
+            maxSubscriptions: getMaxSubscriptions(),
             onerror: (error) => console.error("MCP handler error:", error),
         });
         // Without onerror, request-conversion / handler.fetch throws are answered
@@ -300,8 +312,9 @@ async function main() {
         const nodeHandler = toNodeHandler(mcpHandler, {
             onerror: (error) => console.error("MCP node adapter error:", error),
         });
-        const handleMcpRequest = async (req, res, requireAuth) => {
+        const handleMcpRequest = async (req, res) => {
             try {
+                const plugin = getPluginFromRequest(req);
                 const apiKey = extractApiKey(req);
                 const baseUrl = new URL(RESOURCE_URL).origin;
                 // OAuth discovery info header, used by MCP clients to discover the authorization server
@@ -310,7 +323,7 @@ async function main() {
                 // oauthMetadataResponse) — replace this hand-rolled header and the
                 // /.well-known/oauth-protected-resource route with them.
                 res.set("WWW-Authenticate", `Bearer resource_metadata="${baseUrl}/.well-known/oauth-protected-resource"`);
-                if (requireAuth) {
+                if (requiresAuthentication(req, plugin)) {
                     if (!apiKey) {
                         return res.status(401).json({
                             jsonrpc: "2.0",
@@ -336,9 +349,10 @@ async function main() {
                     }
                 }
                 const context = {
-                    clientIp: getClientIp(req),
-                    apiKey: apiKey,
+                    clientIp: req.ip,
+                    apiKey,
                     clientInfo: extractClientInfoFromUserAgent(req.headers["user-agent"]),
+                    plugin,
                     transport: "http",
                 };
                 await requestContext.run(context, async () => {
@@ -356,13 +370,12 @@ async function main() {
                 }
             }
         };
-        // Anonymous access endpoint - no authentication required
         app.all("/mcp", async (req, res) => {
-            await handleMcpRequest(req, res, false);
+            await handleMcpRequest(req, res);
         });
         // OAuth-protected endpoint - requires authentication
         app.all("/mcp/oauth", async (req, res) => {
-            await handleMcpRequest(req, res, true);
+            await handleMcpRequest(req, res);
         });
         app.get("/ping", (_req, res) => {
             res.json({ status: "ok", message: "pong" });

package/dist/lib/encryption.js

@@ -1,27 +1,43 @@
 import { createCipheriv, randomBytes } from "crypto";
+import { isIP } from "node:net";
 import { SERVER_VERSION } from "./constants.js";
-const DEFAULT_ENCRYPTION_KEY = "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f";
-const ENCRYPTION_KEY = process.env.CLIENT_IP_ENCRYPTION_KEY || DEFAULT_ENCRYPTION_KEY;
-const ALGORITHM = "aes-256-cbc";
+const ASSERTION_ALGORITHM = "aes-256-gcm";
+const ASSERTION_VERSION = "v1";
+let reportedInvalidAssertionKey = false;
 function validateEncryptionKey(key) {
     // Must be exactly 64 hex characters (32 bytes)
     return /^[0-9a-fA-F]{64}$/.test(key);
 }
-function encryptClientIp(clientIp) {
-    if (!validateEncryptionKey(ENCRYPTION_KEY)) {
-        console.error("Invalid encryption key format. Must be 64 hex characters.");
-        return clientIp; // Fallback to unencrypted
+function assertionKey() {
+    const key = process.env.MCP_CLIENT_IP_ASSERTION_KEY;
+    return key && validateEncryptionKey(key) ? Buffer.from(key, "hex") : null;
+}
+/**
+ * Create a short-lived, authenticated client-IP assertion.
+ * Format: v1:<unix timestamp seconds>:<12-byte nonce hex>:<ciphertext + tag hex>
+ */
+export function createClientIpAssertion(clientIp, nowMs = Date.now(), nonce = randomBytes(12)) {
+    const key = assertionKey();
+    if (!key) {
+        if (!reportedInvalidAssertionKey) {
+            reportedInvalidAssertionKey = true;
+            console.error("MCP_CLIENT_IP_ASSERTION_KEY is missing or invalid; client IP assertions are disabled.");
+        }
+        return null;
     }
+    if (nonce.length !== 12 || isIP(clientIp) === 0)
+        return null;
     try {
-        const iv = randomBytes(16);
-        const cipher = createCipheriv(ALGORITHM, Buffer.from(ENCRYPTION_KEY, "hex"), iv);
-        let encrypted = cipher.update(clientIp, "utf8", "hex");
-        encrypted += cipher.final("hex");
-        return iv.toString("hex") + ":" + encrypted;
+        const timestamp = Math.floor(nowMs / 1000).toString();
+        const aad = `${ASSERTION_VERSION}:${timestamp}`;
+        const cipher = createCipheriv(ASSERTION_ALGORITHM, key, nonce);
+        cipher.setAAD(Buffer.from(aad, "utf8"));
+        const ciphertext = Buffer.concat([cipher.update(clientIp, "utf8"), cipher.final()]);
+        const ciphertextAndTag = Buffer.concat([ciphertext, cipher.getAuthTag()]);
+        return `${aad}:${nonce.toString("hex")}:${ciphertextAndTag.toString("hex")}`;
     }
-    catch (error) {
-        console.error("Error encrypting client IP:", error);
-        return clientIp; // Fallback to unencrypted
+    catch {
+        return null;
     }
 }
 /**
@@ -34,7 +50,9 @@ export function generateHeaders(context) {
         "X-Context7-Server-Version": SERVER_VERSION,
     };
     if (context.clientIp) {
-        headers["mcp-client-ip"] = encryptClientIp(context.clientIp);
+        const assertion = createClientIpAssertion(context.clientIp);
+        if (assertion)
+            headers["mcp-client-ip-assertion"] = assertion;
     }
     if (context.sessionId) {
         headers["mcp-session-id"] = context.sessionId;
@@ -48,6 +66,9 @@ export function generateHeaders(context) {
     if (context.clientInfo?.version) {
         headers["X-Context7-Client-Version"] = context.clientInfo.version;
     }
+    if (context.plugin) {
+        headers["X-Context7-Plugin"] = context.plugin;
+    }
     if (context.transport) {
         headers["X-Context7-Transport"] = context.transport;
     }

package/dist/lib/subscriptions.js

@@ -0,0 +1,11 @@
+// 16k stayed near baseline latency in Docker; 32,768 raised tools/list p95 to ~39 ms.
+export const DEFAULT_MAX_SUBSCRIPTIONS = 16_000;
+export function getMaxSubscriptions(value = process.env.MCP_MAX_SUBSCRIPTIONS) {
+    if (value === undefined)
+        return DEFAULT_MAX_SUBSCRIPTIONS;
+    const parsed = Number(value);
+    if (Number.isSafeInteger(parsed) && parsed > 0)
+        return parsed;
+    console.warn(`Invalid MCP_MAX_SUBSCRIPTIONS; using the default of ${DEFAULT_MAX_SUBSCRIPTIONS}.`);
+    return DEFAULT_MAX_SUBSCRIPTIONS;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upstash/context7-mcp",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "mcpName": "io.github.upstash/context7",
   "description": "MCP server for Context7",
   "repository": {
@@ -45,6 +45,7 @@
   "devDependencies": {
     "@modelcontextprotocol/client": "2.0.0",
     "@types/node": "^25.0.3",
+    "esbuild": "^0.28.2",
     "typescript": "^5.8.2",
     "vitest": "^4.1.9"
   },
@@ -61,6 +62,7 @@
     "format:check": "prettier --check .",
     "dev": "tsc --watch",
     "start": "node dist/index.js --transport http",
-    "pack-mcpb": "pnpm install && pnpm run build && rm -rf node_modules && pnpm install --prod && cp mcpb/manifest.json manifest.json && cp mcpb/.mcpbignore .mcpbignore && cp ../../public/icon.png icon.png && mcpb validate manifest.json && mcpb pack . mcpb/context7.mcpb && rm manifest.json .mcpbignore icon.png && pnpm install"
+    "build:mcpb": "esbuild src/index.ts --bundle --platform=node --target=node20 --format=esm --outfile=mcpb/stage/server/dist/index.mjs --banner:js=\"import { createRequire } from 'node:module'; const require = createRequire(import.meta.url);\"",
+    "pack-mcpb": "rm -rf mcpb/stage && pnpm run build:mcpb && cp package.json mcpb/stage/package.json && cp mcpb/manifest.json mcpb/stage/manifest.json && cp ../../public/icon.png mcpb/stage/icon.png && mcpb validate mcpb/stage/manifest.json && mcpb pack mcpb/stage mcpb/context7.mcpb && rm -rf mcpb/stage"
   }
 }

package/dist/lib/client-ip.js

@@ -1,60 +0,0 @@
-function stripIpv4MappedPrefix(ip) {
-    return ip.replace(/^::ffff:/i, "");
-}
-/**
- * Returns true for RFC1918, CGNAT, loopback, link-local, and IPv6 private ranges.
- */
-export function isPrivateOrLocalIp(ip) {
-    const plainIp = stripIpv4MappedPrefix(ip).toLowerCase();
-    if (plainIp.includes(".")) {
-        return (plainIp.startsWith("10.") ||
-            plainIp.startsWith("192.168.") ||
-            /^172\.(1[6-9]|2[0-9]|3[0-1])\./.test(plainIp) ||
-            /^100\.(6[4-9]|[7-9][0-9]|1[01][0-9]|12[0-7])\./.test(plainIp) ||
-            plainIp.startsWith("127.") ||
-            plainIp.startsWith("169.254."));
-    }
-    // ::1 loopback in any textual form (e.g. "0::1", "0:0:0:0:0:0:0:1")
-    if (/^[0:]+1$/.test(plainIp)) {
-        return true;
-    }
-    // First hextets in fe80::/10 and fc00::/7 start with a non-zero digit, so a
-    // valid textual form always spells out all 4 digits.
-    // fe80::/10 link-local
-    if (/^fe[89ab][0-9a-f]:/.test(plainIp)) {
-        return true;
-    }
-    // fc00::/7 unique local
-    if (/^f[cd][0-9a-f]{2}:/.test(plainIp)) {
-        return true;
-    }
-    return false;
-}
-function pickClientIpFromForwardedList(ipList) {
-    for (const ip of ipList) {
-        const plainIp = stripIpv4MappedPrefix(ip);
-        if (!isPrivateOrLocalIp(plainIp)) {
-            return plainIp;
-        }
-    }
-    if (ipList.length === 0) {
-        return undefined;
-    }
-    return stripIpv4MappedPrefix(ipList[0]);
-}
-/**
- * Extract client IP address from request headers.
- * Handles X-Forwarded-For header for proxied requests.
- */
-export function getClientIp(req) {
-    const forwardedFor = req.headers["x-forwarded-for"] || req.headers["X-Forwarded-For"];
-    if (forwardedFor) {
-        const ips = Array.isArray(forwardedFor) ? forwardedFor[0] : forwardedFor;
-        const ipList = ips.split(",").map((ip) => ip.trim());
-        return pickClientIpFromForwardedList(ipList);
-    }
-    if (req.socket?.remoteAddress) {
-        return stripIpv4MappedPrefix(req.socket.remoteAddress);
-    }
-    return undefined;
-}