@google-cloud/cloud-run-mcp 1.8.0 → 1.9.0

package/lib/middleware/oauth.js

@@ -0,0 +1,92 @@
+import { getOAuthClient } from '../clients.js';
+import { extractAccessToken } from '../util/helpers.js';
+
+const TOOLS_CALL_METHOD = 'tools/call';
+
+/**
+ * Verifies the validity of an access token and checks the audience.
+ * @param {string} accessToken - The access token to verify.
+ * @param {string} [audience] - Audience to check against the token's audience.
+ * @returns {Promise<object>} - The token info if valid.
+ * @throws {Error} - If the token is invalid or the audience does not match.
+ */
+async function verifyAccessToken(accessToken, audience) {
+  try {
+    const client = await getOAuthClient(accessToken);
+    const tokenInfo = await client.getTokenInfo(accessToken);
+
+    //An expired token will not have audience
+    if (audience && tokenInfo.aud !== audience) {
+      throw new Error(`Invalid audience: expected ${audience}`);
+    }
+
+    console.log('Access token verified successfully.');
+    return tokenInfo;
+  } catch (error) {
+    console.error('Error verifying access token:', error);
+    throw error;
+  }
+}
+
+/**
+ * Ensures that a valid OAuth token is present in the request headers
+ * and verifies it against the configured audience.
+ * @param {object} req - The request object.
+ * @param {object} res - The response object.
+ * @throws {Error} - If the token is missing or invalid.
+ */
+async function ensureOAuthTokenInEnv(req, res) {
+  try {
+    const audience = process.env.GOOGLE_OAUTH_AUDIENCE;
+    console.log('Verifying token');
+    if (req.headers.authorization === undefined) {
+      console.log('No authorization header found in request');
+      throw new Error('No authorization header');
+    }
+    console.log('Authorization header found.. Verifying token');
+    await verifyAccessToken(
+      extractAccessToken(req.headers.authorization),
+      audience
+    );
+    console.log('Token verified');
+  } catch (error) {
+    console.error('Authentication failed: ', error);
+    throw error;
+  }
+}
+
+/**
+ * Middleware to check for OAuth token if OAuth is enabled.
+ * If OAUTH_ENABLED is 'true', it verifies the Authorization header.
+ *
+ * @param {import('express').Request} req
+ * @param {import('express').Response} res
+ * @param {import('express').NextFunction} next
+ */
+export const oauthMiddleware = async (req, res, next) => {
+  //If OAUTH_ENABLED is not true or the request is not a tools/call, skip the middleware
+  if (
+    process.env.OAUTH_ENABLED !== 'true' ||
+    req.body.method !== TOOLS_CALL_METHOD
+  ) {
+    return next();
+  }
+
+  try {
+    await ensureOAuthTokenInEnv(req, res);
+    next();
+  } catch (error) {
+    console.error('OAuth Middleware Error:', error);
+    // ensureOAuthTokenInEnv throws an error if auth fails.
+    // We catch it and send a 401 response.
+    res.status(401).json({
+      jsonrpc: '2.0',
+      error: {
+        code: -32001, // Custom auth error code or standard -32000
+        message: 'Authentication failed',
+        data: error.message,
+      },
+      id: null,
+    });
+  }
+};

package/lib/util/helpers.js

@@ -40,3 +40,15 @@ export async function logAndProgress(
     progressCallback({ level: severity, data: message });
   }
 }
+
+/**
+ * Extracts the access token from the Authorization header.
+ * @param {string} authorizationHeader - The Authorization header string.
+ * @returns {string | undefined} - The extracted access token or undefined if not found.
+ */
+export function extractAccessToken(authorizationHeader) {
+  if (!authorizationHeader) {
+    return undefined;
+  }
+  return authorizationHeader.split(' ')[1];
+}

package/mcp-server.js

@@ -28,7 +28,18 @@ import { SetLevelRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { registerPrompts } from './prompts.js';
 import { checkGCP } from './lib/cloud-api/metadata.js';
 import { ensureGCPCredentials } from './lib/cloud-api/auth.js';
-import 'dotenv/config';
+import { extractAccessToken } from './lib/util/helpers.js';
+import { oauthMiddleware } from './lib/middleware/oauth.js';
+import { config } from '@dotenvx/dotenvx';
+import {
+  SCOPES,
+  GCLOUD_AUTH,
+  BEARER_METHODS_SUPPORTED,
+  RESPONSE_TYPES_SUPPORTED,
+} from './constants.js';
+
+//Suppress the warning related to missing .env file in case of non-OAuth mode
+config({ quiet: true, ignore: ['MISSING_ENV_FILE'] });
 
 const gcpInfo = await checkGCP();
 let gcpCredentialsAvailable = false;
@@ -63,7 +74,7 @@ const allowedHosts = process.env.ALLOWED_HOSTS
   ? process.env.ALLOWED_HOSTS.split(',')
   : undefined;
 
-async function getServer() {
+async function getServer(accessToken = GCLOUD_AUTH) {
   // Create an MCP server with implementation details
   const server = new McpServer(
     {
@@ -97,6 +108,7 @@ async function getServer() {
       defaultServiceName,
       skipIamCheck,
       gcpCredentialsAvailable,
+      accessToken,
     });
   } else {
     console.log(
@@ -109,6 +121,7 @@ async function getServer() {
       defaultServiceName,
       skipIamCheck,
       gcpCredentialsAvailable,
+      accessToken,
     });
   }
 
@@ -118,7 +131,28 @@ async function getServer() {
   return server;
 }
 
-// stdio
+const getOAuthProtectedResource = (req, res) => {
+  res.json({
+    resource: process.env.OAUTH_PROTECTED_RESOURCE,
+    authorization_servers: [process.env.OAUTH_AUTHORIZATION_SERVER],
+    scopes_supported: [SCOPES.OPENID, SCOPES.EMAIL, SCOPES.CLOUD_PLATFORM],
+    bearer_methods_supported: [...BEARER_METHODS_SUPPORTED],
+  });
+  res.status(200).send();
+};
+
+const getOAuthAuthorizationServer = (req, res) => {
+  res.json({
+    issuer: process.env.OAUTH_PROTECTED_RESOURCE,
+    authorization_endpoint: process.env.OAUTH_AUTHORIZATION_ENDPOINT,
+    token_endpoint: process.env.OAUTH_TOKEN_ENDPOINT,
+    scopes_supported: [SCOPES.OPENID, SCOPES.EMAIL, SCOPES.CLOUD_PLATFORM],
+    response_types_supported: [...RESPONSE_TYPES_SUPPORTED],
+  });
+  res.status(200).send();
+};
+
+// stdio mode
 if (shouldStartStdio()) {
   gcpCredentialsAvailable = await ensureGCPCredentials();
   const stdioTransport = new StdioServerTransport();
@@ -128,7 +162,8 @@ if (shouldStartStdio()) {
 } else {
   // non-stdio mode
   console.log('Stdio transport mode is turned off.');
-  gcpCredentialsAvailable = await ensureGCPCredentials();
+  gcpCredentialsAvailable =
+    process.env.OAUTH_ENABLED === 'true' || (await ensureGCPCredentials());
 
   const app = enableHostValidation
     ? createMcpExpressApp({ allowedHosts })
@@ -141,9 +176,17 @@ if (shouldStartStdio()) {
     );
   }
 
-  app.post('/mcp', async (req, res) => {
+  app.get('/.well-known/oauth-protected-resource', getOAuthProtectedResource);
+
+  app.get(
+    '/.well-known/oauth-authorization-server',
+    getOAuthAuthorizationServer
+  );
+
+  app.post('/mcp', oauthMiddleware, async (req, res) => {
     console.log('/mcp Received:', req.body);
-    const server = await getServer();
+    const accessToken = extractAccessToken(req.headers.authorization);
+    const server = await getServer(accessToken);
     try {
       const transport = new StreamableHTTPServerTransport({
         sessionIdGenerator: undefined,
@@ -204,7 +247,8 @@ if (shouldStartStdio()) {
   // Legacy SSE endpoint for older clients
   app.get('/sse', async (req, res) => {
     console.log('/sse Received:', req.body);
-    const server = await getServer();
+    const accessToken = extractAccessToken(req.headers.authorization);
+    const server = await getServer(accessToken);
     // Create SSE transport for legacy clients
     const transport = new SSEServerTransport('/messages', res);
     sseTransports[transport.sessionId] = transport;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/cloud-run-mcp",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "type": "module",
   "description": "Cloud Run MCP deployment tool",
   "main": "mcp-server.js",
@@ -50,7 +50,7 @@
     "@google-cloud/storage": "^7.16.0",
     "@modelcontextprotocol/sdk": "^1.24.3",
     "archiver": "^7.0.1",
-    "dotenv": "^17.2.1",
+    "@dotenvx/dotenvx": "^1.52.0",
     "express": "^5.1.0",
     "google-proto-files": "^5.0.0",
     "zod": "^3.25.76"

package/test/local/clients.test.js

@@ -27,7 +27,9 @@ describe('getClient Helper', () => {
     assert.strictEqual(client.options.projectId, projectId);
     assert.ok(client.options.authClient);
 
-    const headers = client.options.authClient.getRequestHeaders();
+    const headers = await client.options.authClient.getRequestHeaders();
+    // 'run' is a gRPC service, so it should be wrapped to return a Map
+    assert.ok(headers instanceof Map);
     assert.strictEqual(headers.get('Authorization'), 'Bearer fake-token-1');
   });
 
@@ -96,10 +98,12 @@ describe('getClient Helper', () => {
 
     assert.notStrictEqual(client1, client2);
 
-    const h1 = client1.options.authClient.getRequestHeaders();
+    const h1 = await client1.options.authClient.getRequestHeaders();
+    assert.ok(h1 instanceof Map);
     assert.strictEqual(h1.get('Authorization'), 'Bearer token-A');
 
-    const h2 = client2.options.authClient.getRequestHeaders();
+    const h2 = await client2.options.authClient.getRequestHeaders();
+    assert.ok(h2 instanceof Map);
     assert.strictEqual(h2.get('Authorization'), 'Bearer token-B');
   });
 
@@ -126,6 +130,32 @@ describe('getClient Helper', () => {
     assert.notStrictEqual(runClient, storageClient); // Different maps
     assert.ok(runClient.options.authClient);
     assert.ok(storageClient.options.authClient);
+
+    const runHeaders = await runClient.options.authClient.getRequestHeaders();
+    assert.ok(runHeaders instanceof Map, 'Run client headers should be a Map');
+
+    const storageHeaders =
+      await storageClient.options.authClient.getRequestHeaders();
+    assert.ok(
+      !(storageHeaders instanceof Map),
+      'Storage client headers should NOT be a Map'
+    );
+    assert.strictEqual(storageHeaders.Authorization, `Bearer ${accessToken}`);
+
+    const loggingClient = await getClient(
+      'logging',
+      projectId + accessToken,
+      async () => MockClient,
+      { projectId },
+      accessToken
+    );
+    const loggingHeaders =
+      await loggingClient.options.authClient.getRequestHeaders();
+    assert.ok(
+      !(loggingHeaders instanceof Map),
+      'Logging client headers should NOT be a Map'
+    );
+    assert.strictEqual(loggingHeaders.Authorization, `Bearer ${accessToken}`);
   });
 
   test('passes additional options correctly', async () => {

package/test/local/mcp-server-stdio.test.js

@@ -13,7 +13,6 @@ describe('MCP Server stdio startup', () => {
       stderr = '';
       serverProcess = spawn('node', ['mcp-server.js'], {
         cwd: process.cwd(),
-        env: { ...process.env, GCP_STDIO: 'true' },
       });
       stderr = await waitForString(serverProcess.stderr, stdioMsg);
     });

package/test/local/mcp-server-streamable-http.test.js

@@ -4,6 +4,11 @@ import { test, describe, before, after } from 'node:test';
 import assert from 'node:assert/strict';
 import { spawn } from 'child_process';
 import { waitForString } from './test-utils.js';
+import {
+  SCOPES,
+  BEARER_METHODS_SUPPORTED,
+  RESPONSE_TYPES_SUPPORTED,
+} from '../../constants.js';
 
 class MCPClient {
   client = null;
@@ -59,3 +64,67 @@ describe('MCP Server in Streamble HTTP mode', () => {
     });
   });
 });
+
+describe('OAuth Endpoints', () => {
+  let serverProcess;
+  let stdout = '';
+  const httpMsg = 'Cloud Run MCP server listening on port 3001';
+  const oauthProtectedResource = 'https://example.com/resource';
+  const oauthAuthorizationServer = 'https://example.com/auth';
+  const oauthAuthorizationEndpoint = 'https://example.com/auth/authorize';
+  const oauthTokenEndpoint = 'https://example.com/auth/token';
+
+  before(async () => {
+    stdout = '';
+    serverProcess = spawn('node', ['mcp-server.js'], {
+      cwd: process.cwd(),
+      env: {
+        ...process.env,
+        GCP_STDIO: 'false',
+        PORT: '3001',
+        OAUTH_PROTECTED_RESOURCE: oauthProtectedResource,
+        OAUTH_AUTHORIZATION_SERVER: oauthAuthorizationServer,
+        OAUTH_AUTHORIZATION_ENDPOINT: oauthAuthorizationEndpoint,
+        OAUTH_TOKEN_ENDPOINT: oauthTokenEndpoint,
+      },
+    });
+    stdout = await waitForString(serverProcess.stdout, httpMsg);
+  });
+
+  after(() => {
+    if (serverProcess) {
+      serverProcess.kill();
+    }
+  });
+
+  test('should return correct OAuth protected resource configuration', async () => {
+    const response = await fetch(
+      'http://localhost:3001/.well-known/oauth-protected-resource'
+    );
+    assert.equal(response.status, 200);
+    const data = await response.json();
+
+    assert.deepStrictEqual(data, {
+      resource: oauthProtectedResource,
+      authorization_servers: [oauthAuthorizationServer],
+      scopes_supported: [SCOPES.OPENID, SCOPES.EMAIL, SCOPES.CLOUD_PLATFORM],
+      bearer_methods_supported: [...BEARER_METHODS_SUPPORTED],
+    });
+  });
+
+  test('should return correct OAuth authorization server configuration', async () => {
+    const response = await fetch(
+      'http://localhost:3001/.well-known/oauth-authorization-server'
+    );
+    assert.equal(response.status, 200);
+    const data = await response.json();
+
+    assert.deepStrictEqual(data, {
+      issuer: oauthProtectedResource,
+      authorization_endpoint: oauthAuthorizationEndpoint,
+      token_endpoint: oauthTokenEndpoint,
+      scopes_supported: [SCOPES.OPENID, SCOPES.EMAIL, SCOPES.CLOUD_PLATFORM],
+      response_types_supported: [...RESPONSE_TYPES_SUPPORTED],
+    });
+  });
+});

package/test/local/mcp-server.test.js

@@ -11,6 +11,7 @@ describe('MCP Server in stdio mode', () => {
     transport = new StdioClientTransport({
       command: 'node',
       args: ['mcp-server.js'],
+      env: { ...process.env, GCP_STDIO: 'true' },
     });
     client = new Client({
       name: 'test-client',

package/test/local/middleware/oauth.test.js

@@ -0,0 +1,156 @@
+import { describe, it, mock, beforeEach, afterEach } from 'node:test';
+import assert from 'node:assert/strict';
+import esmock from 'esmock';
+
+describe('oauthMiddleware', () => {
+  let req;
+  let res;
+  let next;
+  let originalEnv;
+
+  beforeEach(() => {
+    originalEnv = process.env;
+    process.env = { ...originalEnv };
+    req = {
+      headers: {},
+      body: {},
+    };
+    res = {
+      headersSent: false,
+      status: mock.fn(() => res),
+      json: mock.fn(),
+    };
+    next = mock.fn();
+  });
+
+  afterEach(() => {
+    process.env = originalEnv;
+    mock.restoreAll();
+  });
+
+  it('should call next() if OAUTH_ENABLED is not "true"', async () => {
+    process.env.OAUTH_ENABLED = 'false';
+    const { oauthMiddleware } = await esmock(
+      '../../../lib/middleware/oauth.js',
+      {}
+    );
+
+    await oauthMiddleware(req, res, next);
+
+    assert.strictEqual(next.mock.callCount(), 1);
+    assert.strictEqual(res.status.mock.callCount(), 0);
+  });
+
+  it('should call next() if method is not tools/call', async () => {
+    process.env.OAUTH_ENABLED = 'true';
+    req.body.method = 'other/method';
+
+    // We don't verify token if it's not a tool call (based on current implementation)
+    // So we don't need to mock successful verification here
+    const { oauthMiddleware } = await esmock(
+      '../../../lib/middleware/oauth.js',
+      {}
+    );
+
+    await oauthMiddleware(req, res, next);
+
+    assert.strictEqual(next.mock.callCount(), 1);
+  });
+
+  it('should return 401 if Authorization header is missing for tool call', async () => {
+    process.env.OAUTH_ENABLED = 'true';
+    req.body.method = 'tools/call';
+
+    const { oauthMiddleware } = await esmock(
+      '../../../lib/middleware/oauth.js',
+      {}
+    );
+
+    await oauthMiddleware(req, res, next);
+
+    assert.strictEqual(next.mock.callCount(), 0);
+    assert.strictEqual(res.status.mock.callCount(), 1);
+    assert.deepStrictEqual(res.status.mock.calls[0].arguments, [401]);
+    assert.strictEqual(res.json.mock.callCount(), 1);
+  });
+
+  it('should verify token and call next() for valid tool call', async () => {
+    process.env.OAUTH_ENABLED = 'true';
+    req.body.method = 'tools/call';
+    req.headers.authorization = 'Bearer valid-token';
+
+    const mockGetTokenInfo = mock.fn(async () => ({ aud: 'valid-audience' }));
+    const mockGetOAuthClient = mock.fn(async () => ({
+      getTokenInfo: mockGetTokenInfo,
+    }));
+
+    const { oauthMiddleware } = await esmock(
+      '../../../lib/middleware/oauth.js',
+      {
+        '../../../lib/clients.js': {
+          getOAuthClient: mockGetOAuthClient,
+        },
+      }
+    );
+
+    await oauthMiddleware(req, res, next);
+
+    assert.strictEqual(next.mock.callCount(), 1);
+    assert.strictEqual(mockGetOAuthClient.mock.callCount(), 1);
+    assert.strictEqual(mockGetTokenInfo.mock.callCount(), 1);
+  });
+
+  it('should return 401 if token verification fails', async () => {
+    process.env.OAUTH_ENABLED = 'true';
+    req.body.method = 'tools/call';
+    req.headers.authorization = 'Bearer invalid-token';
+
+    const mockGetOAuthClient = mock.fn(async () => ({
+      getTokenInfo: async () => {
+        throw new Error('Invalid token');
+      },
+    }));
+
+    const { oauthMiddleware } = await esmock(
+      '../../../lib/middleware/oauth.js',
+      {
+        '../../../lib/clients.js': {
+          getOAuthClient: mockGetOAuthClient,
+        },
+      }
+    );
+
+    await oauthMiddleware(req, res, next);
+
+    assert.strictEqual(next.mock.callCount(), 0);
+    assert.strictEqual(res.status.mock.callCount(), 1);
+    assert.deepStrictEqual(res.status.mock.calls[0].arguments, [401]);
+  });
+
+  it('should return 401 if audience does not match', async () => {
+    process.env.OAUTH_ENABLED = 'true';
+    process.env.GOOGLE_OAUTH_AUDIENCE = 'expected-audience';
+    req.body.method = 'tools/call';
+    req.headers.authorization = 'Bearer valid-token-wrong-audience';
+
+    const mockGetTokenInfo = mock.fn(async () => ({ aud: 'wrong-audience' }));
+    const mockGetOAuthClient = mock.fn(async () => ({
+      getTokenInfo: mockGetTokenInfo,
+    }));
+
+    const { oauthMiddleware } = await esmock(
+      '../../../lib/middleware/oauth.js',
+      {
+        '../../../lib/clients.js': {
+          getOAuthClient: mockGetOAuthClient,
+        },
+      }
+    );
+
+    await oauthMiddleware(req, res, next);
+
+    assert.strictEqual(next.mock.callCount(), 0);
+    assert.strictEqual(res.status.mock.callCount(), 1);
+    assert.deepStrictEqual(res.status.mock.calls[0].arguments, [401]);
+  });
+});

package/test/local/tools.test.js

@@ -42,7 +42,7 @@ describe('registerTools', () => {
         {},
         {
           '../../lib/cloud-api/projects.js': {
-            listProjects: () =>
+            listProjects: (token) =>
               Promise.resolve([{ id: 'project1' }, { id: 'project2' }]),
           },
         }
@@ -433,7 +433,7 @@ describe('registerTools', () => {
           content: [
             {
               type: 'text',
-              text: 'GCP credentials are not available. Please configure your environment.',
+              text: 'GCP credentials are not available. Please configure your environment using OAuth or `gcloud auth`.',
             },
           ],
         });

package/tools/register-tools.js

@@ -41,7 +41,7 @@ function gcpTool(gcpCredentialsAvailable, fn) {
       content: [
         {
           type: 'text',
-          text: 'GCP credentials are not available. Please configure your environment.',
+          text: 'GCP credentials are not available. Please configure your environment using OAuth or `gcloud auth`.',
         },
       ],
     });
@@ -59,7 +59,7 @@ function registerListProjectsTool(server, options) {
     },
     gcpTool(options.gcpCredentialsAvailable, async () => {
       try {
-        const projects = await listProjects();
+        const projects = await listProjects(options.accessToken);
         return {
           content: [
             {
@@ -113,7 +113,11 @@ function registerCreateProjectTool(server, options) {
         };
       }
       try {
-        const result = await createProjectAndAttachBilling(projectId);
+        const result = await createProjectAndAttachBilling(
+          projectId,
+          undefined,
+          options.accessToken
+        );
         return {
           content: [
             {
@@ -161,7 +165,7 @@ function registerListServicesTool(server, options) {
         };
       }
       try {
-        const allServices = await listServices(project);
+        const allServices = await listServices(project, options.accessToken);
         const content = [];
         for (const region of Object.keys(allServices)) {
           const serviceList = allServices[region];
@@ -230,7 +234,12 @@ function registerGetServiceTool(server, options) {
           };
         }
         try {
-          const serviceDetails = await getService(project, region, service);
+          const serviceDetails = await getService(
+            project,
+            region,
+            service,
+            options.accessToken
+          );
           if (serviceDetails) {
             return {
               content: [
@@ -299,6 +308,7 @@ function registerGetServiceLogTool(server, options) {
               project,
               region,
               service,
+              options.accessToken,
               requestOptions
             );
 
@@ -394,6 +404,7 @@ function registerDeployLocalFolderTool(server, options) {
             region: region,
             files: [folderPath],
             skipIamCheck: options.skipIamCheck, // Pass the new flag
+            accessToken: options.accessToken,
             progressCallback,
           });
           return {
@@ -495,6 +506,7 @@ function registerDeployFileContentsTool(server, options) {
             region: region,
             files: files,
             skipIamCheck: options.skipIamCheck, // Pass the new flag
+            accessToken: options.accessToken,
             progressCallback,
           });
           return {
@@ -575,6 +587,7 @@ function registerDeployContainerImageTool(server, options) {
             region: region,
             imageUrl: imageUrl,
             skipIamCheck: options.skipIamCheck,
+            accessToken: options.accessToken,
             progressCallback,
           });
           return {

package/.kokoro/kokoro_build.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Code under repo is checked out to ${KOKORO_ARTIFACTS_DIR}/git.
-# The final directory name in this path is determined by the scm name specified
-# in the job configuration.
-
-cd "${KOKORO_ARTIFACTS_DIR}/github/cloud-run-mcp"
-.kokoro/run_tests.sh