@constructive-io/graphql-server 5.32.5 → 5.32.6

package/esm/middleware/auth.js

@@ -22,6 +22,14 @@ const parseCookieToken = (req, cookieName) => {
     const match = header.split(';').find((c) => c.trim().startsWith(`${cookieName}=`));
     return match ? decodeURIComponent(match.split('=')[1].trim()) : undefined;
 };
+/**
+ * The Bearer token `authenticate` would use, or undefined when it would fall
+ * back to the session cookie (no header, another scheme, or an empty token).
+ */
+export const getBearerToken = (req) => {
+    const [authType, authToken] = (req.headers.authorization ?? '').split(' ');
+    return authType?.toLowerCase() === 'bearer' && authToken ? authToken : undefined;
+};
 export const createAuthenticateMiddleware = (opts) => {
     return async (req, res, next) => {
         const api = req.api;
@@ -49,16 +57,15 @@ export const createAuthenticateMiddleware = (opts) => {
         log.info(`[auth] strictAuth=${opts.server?.strictAuth ?? false}, authFn=${authFn ?? 'none'}`);
         if (authFn && rlsModule.privateSchema.schemaName) {
             const { authorization = '' } = req.headers;
-            const [authType, authToken] = authorization.split(' ');
+            const [authType] = authorization.split(' ');
+            const bearerToken = getBearerToken(req);
             let token = {};
             log.info(`[auth] authorization header present=${!!authorization}, ` +
-                `authType=${authType ?? 'none'}, hasToken=${!!authToken}`);
+                `authType=${authType ?? 'none'}, hasToken=${!!bearerToken}`);
             // Resolve the credential: prefer Bearer header, fall back to session cookie
             const cookieToken = parseCookieToken(req, SESSION_COOKIE_NAME);
-            const effectiveToken = (authType?.toLowerCase() === 'bearer' && authToken)
-                ? authToken
-                : cookieToken;
-            const tokenSource = (authType?.toLowerCase() === 'bearer' && authToken) ? 'bearer' : (cookieToken ? 'cookie' : 'none');
+            const effectiveToken = bearerToken ?? cookieToken;
+            const tokenSource = bearerToken ? 'bearer' : (cookieToken ? 'cookie' : 'none');
             if (effectiveToken) {
                 log.info(`[auth] Processing ${tokenSource} authentication`);
                 const context = {

package/esm/server.js

@@ -16,7 +16,7 @@ import { startDebugSampler } from './diagnostics/debug-sampler';
 import { isDevelopmentObservabilityMode, isGraphqlObservabilityEnabled, isGraphqlObservabilityRequested, isLoopbackHost } from './diagnostics/observability';
 import { createAdmissionControlMiddleware } from './middleware/admission-control';
 import { createApiMiddleware } from './middleware/api';
-import { createAuthenticateMiddleware } from './middleware/auth';
+import { createAuthenticateMiddleware, getBearerToken } from './middleware/auth';
 // Auth cookie handling is done via AuthCookiePlugin in grafserv
 import { createCaptchaMiddleware } from './middleware/captcha';
 import { parseCookieValue, rejectInvalidSessionCookieHeader, SESSION_COOKIE_NAME } from './middleware/cookie';
@@ -168,9 +168,8 @@ class Server {
             }
         });
         const csrfProtect = (req, res, next) => {
-            // Skip CSRF for Bearer token auth
-            const auth = req.headers.authorization;
-            if (auth?.toLowerCase().startsWith('bearer ')) {
+            // Skip CSRF only when authenticate will use the Bearer token, not the cookie
+            if (getBearerToken(req)) {
                 return next();
             }
             // Skip if no session cookie (anonymous requests)
@@ -185,7 +184,9 @@ class Server {
             csrf.setToken(req, res, next);
         };
         app.use(csrfSetToken); // Set CSRF token cookie on all requests
-        app.use('/graphql', csrfProtect); // Enforce CSRF on GraphQL mutations
+        // Enforce CSRF on every cookie-authenticated route: GraphQL, the agentic
+        // router (/v1) and REST function invocation (/fn)
+        app.use(['/graphql', '/v1', '/fn'], csrfProtect);
         // The session-cookie opt-out does not bypass CSRF: it only stops sign-in
         // responses from setting cookies (see AuthCookiePlugin).
         app.use('/graphql', rejectInvalidSessionCookieHeader);

package/middleware/auth.d.ts

@@ -1,4 +1,9 @@
 import './types';
 import { PgpmOptions } from '@pgpmjs/types';
-import { RequestHandler } from 'express';
+import { Request, RequestHandler } from 'express';
+/**
+ * The Bearer token `authenticate` would use, or undefined when it would fall
+ * back to the session cookie (no header, another scheme, or an empty token).
+ */
+export declare const getBearerToken: (req: Request) => string | undefined;
 export declare const createAuthenticateMiddleware: (opts: PgpmOptions) => RequestHandler;

package/middleware/auth.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuthenticateMiddleware = void 0;
+exports.createAuthenticateMiddleware = exports.getBearerToken = void 0;
 require("./types"); // for Request type
 const errors_1 = require("@constructive-io/errors");
 const env_1 = require("@pgpmjs/env");
@@ -28,6 +28,15 @@ const parseCookieToken = (req, cookieName) => {
     const match = header.split(';').find((c) => c.trim().startsWith(`${cookieName}=`));
     return match ? decodeURIComponent(match.split('=')[1].trim()) : undefined;
 };
+/**
+ * The Bearer token `authenticate` would use, or undefined when it would fall
+ * back to the session cookie (no header, another scheme, or an empty token).
+ */
+const getBearerToken = (req) => {
+    const [authType, authToken] = (req.headers.authorization ?? '').split(' ');
+    return authType?.toLowerCase() === 'bearer' && authToken ? authToken : undefined;
+};
+exports.getBearerToken = getBearerToken;
 const createAuthenticateMiddleware = (opts) => {
     return async (req, res, next) => {
         const api = req.api;
@@ -55,16 +64,15 @@ const createAuthenticateMiddleware = (opts) => {
         log.info(`[auth] strictAuth=${opts.server?.strictAuth ?? false}, authFn=${authFn ?? 'none'}`);
         if (authFn && rlsModule.privateSchema.schemaName) {
             const { authorization = '' } = req.headers;
-            const [authType, authToken] = authorization.split(' ');
+            const [authType] = authorization.split(' ');
+            const bearerToken = (0, exports.getBearerToken)(req);
             let token = {};
             log.info(`[auth] authorization header present=${!!authorization}, ` +
-                `authType=${authType ?? 'none'}, hasToken=${!!authToken}`);
+                `authType=${authType ?? 'none'}, hasToken=${!!bearerToken}`);
             // Resolve the credential: prefer Bearer header, fall back to session cookie
             const cookieToken = parseCookieToken(req, SESSION_COOKIE_NAME);
-            const effectiveToken = (authType?.toLowerCase() === 'bearer' && authToken)
-                ? authToken
-                : cookieToken;
-            const tokenSource = (authType?.toLowerCase() === 'bearer' && authToken) ? 'bearer' : (cookieToken ? 'cookie' : 'none');
+            const effectiveToken = bearerToken ?? cookieToken;
+            const tokenSource = bearerToken ? 'bearer' : (cookieToken ? 'cookie' : 'none');
             if (effectiveToken) {
                 log.info(`[auth] Processing ${tokenSource} authentication`);
                 const context = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-server",
-  "version": "5.32.5",
+  "version": "5.32.6",
   "author": "Constructive <developers@constructive.io>",
   "description": "Constructive GraphQL Server",
   "main": "index.js",
@@ -100,5 +100,5 @@
     "supertest": "^7.2.2",
     "ts-node": "^10.9.2"
   },
-  "gitHead": "772d31b8f0afd8947d4f4df8b0ffee86414ec866"
+  "gitHead": "a94434095095bc1f1c06d8878e06f88d37b121b4"
 }

package/server.js

@@ -175,9 +175,8 @@ class Server {
             }
         });
         const csrfProtect = (req, res, next) => {
-            // Skip CSRF for Bearer token auth
-            const auth = req.headers.authorization;
-            if (auth?.toLowerCase().startsWith('bearer ')) {
+            // Skip CSRF only when authenticate will use the Bearer token, not the cookie
+            if ((0, auth_1.getBearerToken)(req)) {
                 return next();
             }
             // Skip if no session cookie (anonymous requests)
@@ -192,7 +191,9 @@ class Server {
             csrf.setToken(req, res, next);
         };
         app.use(csrfSetToken); // Set CSRF token cookie on all requests
-        app.use('/graphql', csrfProtect); // Enforce CSRF on GraphQL mutations
+        // Enforce CSRF on every cookie-authenticated route: GraphQL, the agentic
+        // router (/v1) and REST function invocation (/fn)
+        app.use(['/graphql', '/v1', '/fn'], csrfProtect);
         // The session-cookie opt-out does not bypass CSRF: it only stops sign-in
         // responses from setting cookies (see AuthCookiePlugin).
         app.use('/graphql', cookie_1.rejectInvalidSessionCookieHeader);