npm - @cloudgrid-io/mcp - Versions diffs - 0.2.4 → 0.2.6 - Mend

@cloudgrid-io/mcp 0.2.4 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@cloudgrid-io/mcp",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "MCP server for CloudGrid. Two editions: a local stdio server (full toolset) and a hosted web server (light, CLI-free toolset) over MCP Streamable HTTP.",
   "type": "module",
   "bin": {
@@ -20,6 +20,8 @@
     "smoke:login": "node test/smoke-login.mjs",
     "smoke:claim": "node test/smoke-claim.mjs",
     "smoke:web": "node test/smoke-web.mjs",
+    "smoke:redrop": "node test/smoke-redrop.mjs",
+    "smoke:oauth": "node test/smoke-oauth.mjs",
     "test:auth": "node test/auth.test.mjs"
   },
   "dependencies": {

package/src/oauth.js ADDED Viewed

@@ -0,0 +1,226 @@
+// MCP transport-level OAuth for the web edition.
+//
+// Implements the OAuth 2.1 surface the MCP authorization spec expects — metadata
+// discovery (RFC 8414 + RFC 9728), dynamic client registration (RFC 7591), and the
+// authorization-code flow with PKCE — as a thin BRIDGE over CloudGrid's existing
+// sign-in: /oauth/authorize shows an interstitial, the user completes the normal
+// api.cloudgrid.io/auth/login flow in a new tab, we poll /auth/status server-side,
+// then redirect back to the client with an authorization code. /oauth/token
+// exchanges it (PKCE-verified) for the CloudGrid JWT as the access token.
+//
+// No new identity provider. State is in-memory (single replica, like sessions).
+import { randomUUID, createHash } from "node:crypto";
+import { newLoginCode, buildLoginUrl, pollStatusOnce, decodeJwt } from "./auth.js";
+const CODE_TTL_MS = 5 * 60 * 1000; // authorize sessions + auth codes live 5 minutes
+// In-memory stores. { [id]: record } with created timestamps for TTL sweeps.
+const clients = new Map(); // client_id -> { redirect_uris }
+const authSessions = new Map(); // sid -> { cgCode, client_id, redirect_uri, state, code_challenge, created }
+const authCodes = new Map(); // code -> { jwt, client_id, redirect_uri, code_challenge, created }
+function sweep(map) {
+  const now = Date.now();
+  for (const [k, v] of map) if (now - v.created > CODE_TTL_MS) map.delete(k);
+}
+function b64url(buf) {
+  return buf.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+function corsOk(res) {
+  res.setHeader("Access-Control-Allow-Origin", "*");
+  res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
+  res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, mcp-protocol-version");
+}
+// The §23-voice interstitial. Opens the CloudGrid sign-in in a new tab and polls
+// until it completes, then returns the browser to the client app.
+function interstitialHtml(sid, loginUrl) {
+  return `<!doctype html>
+<html lang="en">
+<head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Connect CloudGrid</title>
+<style>
+  body { margin:0; min-height:100vh; display:grid; place-items:center;
+         font-family: Inter, system-ui, sans-serif; background:#0d0d0f; color:#fafafa; }
+  main { max-width:420px; padding:2.5rem; text-align:center; }
+  a.btn { display:inline-block; margin-top:1.25rem; padding:.75rem 1.5rem; border-radius:8px;
+          background:#fafafa; color:#0d0d0f; text-decoration:none; font-weight:600; }
+  p.status { margin-top:1.5rem; font-size:.9rem; opacity:.7; }
+</style></head>
+<body><main>
+  <h1>Connect CloudGrid</h1>
+  <p>Sign in with your CloudGrid account. This page returns to the app when you finish.</p>
+  <a class="btn" href="${loginUrl}" target="_blank" rel="noopener">Sign in to CloudGrid</a>
+  <p class="status" id="st">Waiting for sign-in.</p>
+</main>
+<script>
+  async function tick() {
+    try {
+      const r = await fetch("/oauth/authorize/poll?sid=${sid}");
+      const d = await r.json();
+      if (d.status === "ready") { location.href = d.redirect; return; }
+      if (d.status === "expired") { document.getElementById("st").textContent = "The sign-in window expired. Close this page and connect again."; return; }
+    } catch {}
+    setTimeout(tick, 2000);
+  }
+  tick();
+</script></body></html>`;
+}
+/**
+ * Mounts the OAuth surface on an express app.
+ * publicBase = this server's public origin (e.g. https://mcp.cloudgrid.io).
+ */
+export function mountOAuth(app, publicBase) {
+  const base = publicBase.replace(/\/+$/, "");
+  const asMetadata = {
+    issuer: base,
+    authorization_endpoint: `${base}/oauth/authorize`,
+    token_endpoint: `${base}/oauth/token`,
+    registration_endpoint: `${base}/oauth/register`,
+    response_types_supported: ["code"],
+    grant_types_supported: ["authorization_code"],
+    code_challenge_methods_supported: ["S256"],
+    token_endpoint_auth_methods_supported: ["none"],
+    scopes_supported: ["cloudgrid"],
+  };
+  app.options(/^\/(\.well-known|oauth)\/.*/, (_req, res) => {
+    corsOk(res);
+    res.status(204).end();
+  });
+  // RFC 9728 — the resource points at its authorization server (us).
+  app.get("/.well-known/oauth-protected-resource", (_req, res) => {
+    corsOk(res);
+    res.json({ resource: `${base}/mcp`, authorization_servers: [base], scopes_supported: ["cloudgrid"] });
+  });
+  app.get("/.well-known/oauth-protected-resource/mcp", (_req, res) => {
+    corsOk(res);
+    res.json({ resource: `${base}/mcp`, authorization_servers: [base], scopes_supported: ["cloudgrid"] });
+  });
+  // RFC 8414.
+  app.get("/.well-known/oauth-authorization-server", (_req, res) => {
+    corsOk(res);
+    res.json(asMetadata);
+  });
+  // RFC 7591 — dynamic client registration. Public clients, PKCE-only.
+  app.post("/oauth/register", (req, res) => {
+    corsOk(res);
+    const redirectUris = Array.isArray(req.body?.redirect_uris) ? req.body.redirect_uris : [];
+    if (redirectUris.length === 0) {
+      res.status(400).json({ error: "invalid_client_metadata", error_description: "redirect_uris is required." });
+      return;
+    }
+    const clientId = randomUUID();
+    clients.set(clientId, { redirect_uris: redirectUris, created: Date.now() });
+    res.status(201).json({
+      client_id: clientId,
+      token_endpoint_auth_method: "none",
+      grant_types: ["authorization_code"],
+      response_types: ["code"],
+      redirect_uris: redirectUris,
+    });
+  });
+  // Authorization endpoint — render the bridge interstitial.
+  app.get("/oauth/authorize", (req, res) => {
+    sweep(authSessions);
+    const { client_id, redirect_uri, state, code_challenge, code_challenge_method, response_type } = req.query;
+    const client = clients.get(String(client_id));
+    if (!client || !client.redirect_uris.includes(String(redirect_uri))) {
+      res.status(400).send("Unknown client or redirect_uri. Re-add the connector and try again.");
+      return;
+    }
+    if (response_type !== "code" || code_challenge_method !== "S256" || !code_challenge) {
+      res.status(400).send("This server requires response_type=code with PKCE (S256).");
+      return;
+    }
+    const sid = randomUUID();
+    const cgCode = newLoginCode();
+    authSessions.set(sid, {
+      cgCode,
+      client_id: String(client_id),
+      redirect_uri: String(redirect_uri),
+      state: state ? String(state) : "",
+      code_challenge: String(code_challenge),
+      created: Date.now(),
+    });
+    res.setHeader("Content-Type", "text/html; charset=utf-8");
+    res.send(interstitialHtml(sid, buildLoginUrl(cgCode)));
+  });
+  // The interstitial's poll — bridges to CloudGrid /auth/status.
+  app.get("/oauth/authorize/poll", async (req, res) => {
+    corsOk(res);
+    const sess = authSessions.get(String(req.query.sid));
+    if (!sess || Date.now() - sess.created > CODE_TTL_MS) {
+      res.json({ status: "expired" });
+      return;
+    }
+    let upstream;
+    try {
+      upstream = await pollStatusOnce(sess.cgCode);
+    } catch {
+      res.json({ status: "pending" });
+      return;
+    }
+    if (upstream.status === "authenticated" && upstream.jwt) {
+      const code = b64url(Buffer.from(randomUUID()));
+      authCodes.set(code, {
+        jwt: upstream.jwt,
+        client_id: sess.client_id,
+        redirect_uri: sess.redirect_uri,
+        code_challenge: sess.code_challenge,
+        created: Date.now(),
+      });
+      authSessions.delete(String(req.query.sid));
+      const sep = sess.redirect_uri.includes("?") ? "&" : "?";
+      const redirect = `${sess.redirect_uri}${sep}code=${encodeURIComponent(code)}${sess.state ? `&state=${encodeURIComponent(sess.state)}` : ""}`;
+      res.json({ status: "ready", redirect });
+      return;
+    }
+    if (upstream.status === "expired") {
+      res.json({ status: "expired" });
+      return;
+    }
+    res.json({ status: "pending" });
+  });
+  // Token endpoint — PKCE-verified exchange; the CloudGrid JWT is the access token.
+  app.post("/oauth/token", (req, res) => {
+    corsOk(res);
+    sweep(authCodes);
+    const { grant_type, code, code_verifier, redirect_uri, client_id } = req.body ?? {};
+    if (grant_type !== "authorization_code") {
+      res.status(400).json({ error: "unsupported_grant_type" });
+      return;
+    }
+    const rec = authCodes.get(String(code));
+    if (!rec || rec.client_id !== String(client_id) || rec.redirect_uri !== String(redirect_uri)) {
+      res.status(400).json({ error: "invalid_grant" });
+      return;
+    }
+    const challenge = b64url(createHash("sha256").update(String(code_verifier ?? "")).digest());
+    if (challenge !== rec.code_challenge) {
+      res.status(400).json({ error: "invalid_grant", error_description: "PKCE verification failed." });
+      return;
+    }
+    authCodes.delete(String(code)); // single use
+    const claims = decodeJwt(rec.jwt);
+    const expiresIn = claims.exp ? Math.max(60, claims.exp - Math.floor(Date.now() / 1000)) : 30 * 86400;
+    res.json({ access_token: rec.jwt, token_type: "Bearer", expires_in: expiresIn, scope: "cloudgrid" });
+  });
+}
+/** The WWW-Authenticate challenge for 401s when auth is required. */
+export function bearerChallenge(publicBase) {
+  const base = publicBase.replace(/\/+$/, "");
+  return `Bearer resource_metadata="${base}/.well-known/oauth-protected-resource"`;
+}

package/src/tools.js CHANGED Viewed

@@ -139,10 +139,12 @@ async function runDrop(ctx, { html, path: filePath, filename, anonymous, org, fr
   const form = new FormData();
   // Redrop (anon-redrop spec §6): a re-drop in the same session updates the previous
-  // drop in place — same URL, new version. `fresh: true` forces a new drop. The
-  // platform validates ownership and silently falls back to create, so this never
-  // hard-fails. Field appended before the artifact so streaming parsers see it.
-  if (isAnonymousCall && fresh !== true && ctx.state.lastDrop?.entity_id) {
+  // drop in place — same URL, new version. `fresh: true` forces a new drop. Sent for
+  // BOTH anonymous and authed callers: the platform validates ownership and silently
+  // falls back to create, so this never hard-fails (authed in-place lands when the
+  // platform extends the gate; until then the fallback equals today's behavior).
+  // Field appended before the artifact so streaming parsers see it.
+  if (fresh !== true && ctx.state.lastDrop?.entity_id) {
     form.append("previous_id", ctx.state.lastDrop.entity_id);
   }
   form.append("artifact", new Blob([bytes], { type }), name);
@@ -177,14 +179,7 @@ async function runDrop(ctx, { html, path: filePath, filename, anonymous, org, fr
     .find((c) => c.startsWith("cg_anon_session="));
   if (anonCookie) ctx.state.anonCookie = anonCookie;
-  if (data.owned_by === "authenticated") {
-    ctx.state.lastAnonClaim = null;
-    const lines = [`Published to your org: ${data.url}`, "Owned by you."];
-    if (data.expires_at) lines.push(`Expires ${data.expires_at}.`);
-    return lines.join("\n");
-  }
-  // Anonymous: remember the drop for redrop continuity (any 2xx outcome).
+  // Remember the drop for redrop continuity — any caller class, any 2xx outcome.
   if (data.entity_id || data.url) {
     ctx.state.lastDrop = {
       entity_id: data.entity_id ?? ctx.state.lastDrop?.entity_id ?? null,
@@ -200,7 +195,16 @@ async function runDrop(ctx, { html, path: filePath, filename, anonymous, org, fr
   if (res.status === 200) {
     // Updated in place: same URL, new version, views/reactions intact.
     const lines = [`Updated in place — same link: ${data.url ?? ctx.state.lastDrop?.url ?? ""}`.trim()];
+    if (data.owned_by === "authenticated") lines.push("Owned by you.");
+    if (data.expires_at) lines.push(`Expires ${data.expires_at}.`);
+    return lines.join("\n");
+  }
+  if (data.owned_by === "authenticated") {
+    ctx.state.lastAnonClaim = null;
+    const lines = [`Published to your org: ${data.url}`, "Owned by you."];
     if (data.expires_at) lines.push(`Expires ${data.expires_at}.`);
+    lines.push("Drop again in this session to update it in place (same link); pass fresh to start a new one.");
     return lines.join("\n");
   }

package/src/web.js CHANGED Viewed

@@ -6,6 +6,12 @@
 // token held in memory for the life of the MCP session (no local files on a
 // shared host).
 //
+// Transport-level OAuth (src/oauth.js): clients can complete the MCP-spec OAuth
+// connect — metadata discovery, dynamic registration, PKCE code flow — bridged to
+// CloudGrid's existing sign-in. A Bearer presented on /mcp requests becomes the
+// session's identity. MCP_REQUIRE_AUTH=1 makes the connect mandatory (401
+// challenge); default is anonymous-first with auth honored when presented.
+//
 // Run: PORT=8080 node src/web.js     Health: GET /healthz
 import { randomUUID } from "node:crypto";
@@ -14,15 +20,32 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
 import { registerTools, decodeJwt } from "./tools.js";
+import { mountOAuth, bearerChallenge } from "./oauth.js";
 const PORT = Number(process.env.PORT || 8080);
+// This server's public origin — used in OAuth metadata and the interstitial.
+const PUBLIC_BASE = (process.env.MCP_PUBLIC_URL || "https://mcp.cloudgrid.io").replace(/\/+$/, "");
+// MCP_REQUIRE_AUTH=1 turns on the 401 challenge: clients must complete the OAuth
+// connect before using tools. Default off — anonymous-first is the GTM posture.
+const REQUIRE_AUTH = process.env.MCP_REQUIRE_AUTH === "1";
 // The trusted-server credential, if this host is provisioned as one. Sent on
 // anonymous drops so the platform keys the anon-drop cap on the per-user id rather
 // than the shared cluster egress IP. Missing/bad secret falls back to the IP cap
 // server-side, so it is safe to leave unset.
 const TRUSTED_SERVER_SECRET = process.env.MCP_TRUSTED_SERVER_SECRET || null;
+// Transport-level identity per MCP session: a Bearer presented on /mcp requests
+// becomes the session's CloudGrid identity (takes precedence over in-tool login).
+const sessionAuth = Object.create(null); // sid -> jwt
+function bearerOf(req) {
+  const h = req.headers.authorization;
+  return h && /^Bearer\s+\S+/i.test(h) ? h.replace(/^Bearer\s+/i, "") : null;
+}
 // A web session: identity lives in memory for the session's lifetime only. The
 // session id doubles as the stable, opaque end-user id for the trusted-server cap.
 function makeWebContext(sessionId) {
@@ -31,7 +54,8 @@ function makeWebContext(sessionId) {
     edition: "web",
     state: { pendingLoginCode: null, lastAnonClaim: null, lastDrop: null, anonCookie: null },
     canOpenBrowser: false,
-    getToken: async () => sessionToken,
+    // Transport OAuth wins; the in-tool login flow is the fallback.
+    getToken: async () => sessionAuth[sessionId] ?? sessionToken,
     // No local config on a shared host. The user passes `org`, or the API returns
     // the list of orgs to choose from.
     getActiveOrg: async () => null,
@@ -48,43 +72,65 @@ function makeWebContext(sessionId) {
 const app = express();
 app.use(express.json({ limit: "8mb" }));
+app.use(express.urlencoded({ extended: false })); // OAuth token exchange is form-encoded
 app.get("/healthz", (_req, res) => res.json({ ok: true, edition: "web" }));
+mountOAuth(app, PUBLIC_BASE);
 // One transport per MCP session, keyed by the session id.
 const transports = Object.create(null);
 app.post("/mcp", async (req, res) => {
   const sessionId = req.headers["mcp-session-id"];
   let transport = sessionId ? transports[sessionId] : undefined;
+  const jwt = bearerOf(req);
-  if (!transport) {
-    if (sessionId || !isInitializeRequest(req.body)) {
-      res.status(400).json({
-        jsonrpc: "2.0",
-        error: { code: -32000, message: "No valid session. Send an initialize request first." },
-        id: null,
-      });
-      return;
-    }
-    // New session: fresh server + per-session identity context. Generate the session
-    // id up front so it is also the trusted-server end-user id. (Distinct name from the
-    // incoming `sessionId` header above.)
-    const newSessionId = randomUUID();
-    transport = new StreamableHTTPServerTransport({
-      sessionIdGenerator: () => newSessionId,
-      onsessioninitialized: (sid) => {
-        transports[sid] = transport;
-      },
+  if (REQUIRE_AUTH && !jwt) {
+    res.setHeader("WWW-Authenticate", bearerChallenge(PUBLIC_BASE));
+    res.status(401).json({
+      jsonrpc: "2.0",
+      error: { code: -32001, message: "Authorization required. Complete the OAuth connect." },
+      id: null,
+    });
+    return;
+  }
+  if (transport) {
+    if (jwt) sessionAuth[sessionId] = jwt;
+    await transport.handleRequest(req, res, req.body);
+    return;
+  }
+  if (sessionId || !isInitializeRequest(req.body)) {
+    res.status(400).json({
+      jsonrpc: "2.0",
+      error: { code: -32000, message: "No valid session. Send an initialize request first." },
+      id: null,
     });
-    transport.onclose = () => {
-      if (transport.sessionId) delete transports[transport.sessionId];
-    };
-    const server = new McpServer({ name: "cloudgrid-mcp-web", version: "0.2.4" });
-    registerTools(server, makeWebContext(newSessionId));
-    await server.connect(transport);
+    return;
   }
+  // New session: fresh server + per-session identity context. Generate the session
+  // id up front so it is also the trusted-server end-user id. (Distinct name from
+  // the incoming `sessionId` header above.)
+  const newSessionId = randomUUID();
+  if (jwt) sessionAuth[newSessionId] = jwt;
+  transport = new StreamableHTTPServerTransport({
+    sessionIdGenerator: () => newSessionId,
+    onsessioninitialized: (sid) => {
+      transports[sid] = transport;
+    },
+  });
+  transport.onclose = () => {
+    if (transport.sessionId) {
+      delete transports[transport.sessionId];
+      delete sessionAuth[transport.sessionId];
+    }
+  };
+  const server = new McpServer({ name: "cloudgrid-mcp-web", version: "0.2.6" });
+  registerTools(server, makeWebContext(newSessionId));
+  await server.connect(transport);
   await transport.handleRequest(req, res, req.body);
 });
@@ -96,6 +142,8 @@ async function handleSessionRequest(req, res) {
     res.status(400).send("Invalid or missing session id");
     return;
   }
+  const jwt = bearerOf(req);
+  if (jwt) sessionAuth[sessionId] = jwt;
   await transport.handleRequest(req, res);
 }
@@ -104,5 +152,7 @@ app.delete("/mcp", handleSessionRequest);
 app.listen(PORT, () => {
   // eslint-disable-next-line no-console
-  console.error(`cloudgrid-mcp web edition listening on :${PORT} (POST /mcp, GET /healthz)`);
+  console.error(
+    `cloudgrid-mcp web edition listening on :${PORT} (POST /mcp, GET /healthz, OAuth ${REQUIRE_AUTH ? "required" : "optional"})`,
+  );
 });