mcp-server-db2i 1.3.2 → 2.1.0

package/dist/tools/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/tools/query.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,GAAG,GAAG,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC;AAa3D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAAwB;IAQ7D,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC9C,MAAM,WAAW,GAAG,mBAAmB,EAAE,CAAC;IAC1C,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAEjE,GAAG,CAAC,KAAK,CACP,EAAE,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EACzH,wBAAwB,CACzB,CAAC;IAEF,qEAAqE;IACrE,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,UAAU,EAAE,EAAE,4CAA4C,CAAC,CAAC;QACpG,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,+BAA+B,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC9E,UAAU,EAAE,gBAAgB,CAAC,UAAU;SACxC,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,MAAmB,EAAE,SAAS,CAAC,CAAC;QAC9E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QAElD,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,6BAA6B,CAAC,CAAC;QACnF,OAAO;YACL,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,YAAY,EAAE,cAAc;SAC7B,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC;QAClF,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,wBAAwB,CAAC,CAAC;QACpD,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,OAAO;SACf,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/tools/query.ts"],"names":[],"mappings":"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"}

package/dist/tools/sqlLimit.d.ts

@@ -9,5 +9,10 @@
 /**
  * Return SQL with a FETCH FIRST clause that does not exceed effectiveLimit.
  */
+/**
+ * Remove a trailing FETCH FIRST or LIMIT clause, if one is present.
+ * Used to normalize SQL before parsing; it does not add a replacement clause.
+ */
+export declare function stripTrailingRowLimit(sql: string): string;
 export declare function applySqlRowLimit(sql: string, effectiveLimit: number): string;
 //# sourceMappingURL=sqlLimit.d.ts.map

package/dist/tools/sqlLimit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlLimit.d.ts","sourceRoot":"","sources":["../../src/tools/sqlLimit.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAkB5E"}
+{"version":3,"file":"sqlLimit.d.ts","sourceRoot":"","sources":["../../src/tools/sqlLimit.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH;;GAEG;AACH;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOzD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAkB5E"}

package/dist/tools/sqlLimit.js

@@ -10,6 +10,18 @@ const TRAILING_LIMIT_RE = /\b(?:FETCH\s+FIRST\s+(\d+)\s+ROWS?\s+ONLY|LIMIT\s+(\d
 /**
  * Return SQL with a FETCH FIRST clause that does not exceed effectiveLimit.
  */
+/**
+ * Remove a trailing FETCH FIRST or LIMIT clause, if one is present.
+ * Used to normalize SQL before parsing; it does not add a replacement clause.
+ */
+export function stripTrailingRowLimit(sql) {
+    const trimmed = sql.trim();
+    const match = TRAILING_LIMIT_RE.exec(trimmed);
+    if (match) {
+        return trimmed.slice(0, match.index).trimEnd();
+    }
+    return trimmed.endsWith(';') ? trimmed.slice(0, -1).trimEnd() : trimmed;
+}
 export function applySqlRowLimit(sql, effectiveLimit) {
     const trimmed = sql.trim();
     const match = TRAILING_LIMIT_RE.exec(trimmed);

package/dist/tools/sqlLimit.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqlLimit.js","sourceRoot":"","sources":["../../src/tools/sqlLimit.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,iBAAiB,GACrB,oEAAoE,CAAC;AAEvE;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAW,EAAE,cAAsB;IAClE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE9C,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACvC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC;YACpC,CAAC,CAAC,cAAc,CAAC;QACnB,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC9D,OAAO,GAAG,aAAa,gBAAgB,OAAO,YAAY,CAAC;IAC7D,CAAC;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC5C,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QAChC,CAAC,CAAC,OAAO,CAAC;IAEZ,OAAO,GAAG,gBAAgB,gBAAgB,cAAc,YAAY,CAAC;AACvE,CAAC"}
+{"version":3,"file":"sqlLimit.js","sourceRoot":"","sources":["../../src/tools/sqlLimit.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,MAAM,iBAAiB,GACrB,oEAAoE,CAAC;AAEvE;;GAEG;AACH;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACjD,CAAC;IACD,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAW,EAAE,cAAsB;IAClE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE9C,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACvC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC;YACpC,CAAC,CAAC,cAAc,CAAC;QACnB,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QAC9D,OAAO,GAAG,aAAa,gBAAgB,OAAO,YAAY,CAAC;IAC7D,CAAC;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC5C,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QAChC,CAAC,CAAC,OAAO,CAAC;IAEZ,OAAO,GAAG,gBAAgB,gBAAgB,cAAc,YAAY,CAAC;AACvE,CAAC"}

package/dist/transports/http.d.ts

@@ -5,7 +5,7 @@
  * - OAuth-style token authentication (/auth)
  * - MCP protocol endpoints (/mcp)
  * - Health check endpoint (/health)
- * - Stateful and stateless session modes
+ * - Stateless MCP serving by default (stateful Mcp-Session-Id is deprecated)
  * - Optional TLS support
  */
 import { type Express } from 'express';

package/dist/transports/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/transports/http.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAgB,EAAE,KAAK,OAAO,EAA+B,MAAM,SAAS,CAAC;AAC7E,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AA6G7B;;GAEG;AACH,wBAAgB,aAAa,IAAI,OAAO,CA8bvC;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAqE3E;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0B1F"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/transports/http.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAgB,EAAE,KAAK,OAAO,EAA+B,MAAM,SAAS,CAAC;AAC7E,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,IAAI,MAAM,WAAW,CAAC;AAqU7B;;GAEG;AACH,wBAAgB,aAAa,IAAI,OAAO,CA+SvC;AAED;;GAEG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAwF3E;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC1F"}

package/dist/transports/http.js

@@ -5,7 +5,7 @@
  * - OAuth-style token authentication (/auth)
  * - MCP protocol endpoints (/mcp)
  * - Health check endpoint (/health)
- * - Stateful and stateless session modes
+ * - Stateless MCP serving by default (stateful Mcp-Session-Id is deprecated)
  * - Optional TLS support
  */
 import express from 'express';
@@ -13,9 +13,9 @@ import https from 'node:https';
 import http from 'node:http';
 import crypto from 'node:crypto';
 import { readFileSync } from 'node:fs';
-import { isInitializeRequest } from '@modelcontextprotocol/sdk/types.js';
-import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import { getHttpConfig, loadConfig, loadPartialConfig, } from '../config.js';
+import { createMcpHandler, isInitializeRequest, isLegacyRequest } from '@modelcontextprotocol/server';
+import { toNodeHandler, toWebRequest } from '@modelcontextprotocol/node';
+import { getHttpConfig, hostnameOf, isLoopbackHost, loadConfig, loadPartialConfig, } from '../config.js';
 import { createChildLogger } from '../utils/logger.js';
 import { getTokenManager, authMiddleware, authRateLimitMiddleware, recordFailedAuthAttempt, clearAuthRateLimit, } from '../auth/index.js';
 import { getSessionManager } from './sessionManager.js';
@@ -24,6 +24,8 @@ import { createServer as createMcpServer, SERVER_NAME, SERVER_VERSION } from '..
 import { getOpenApiSpec } from '../openapi.js';
 import { initializeSessionPool, testSessionConnection, closeSessionPool, closeAllSessionPools } from '../db/connection.js';
 const log = createChildLogger({ component: 'http-transport' });
+/** Latest HTTP MCP handler, closed on shutdown so in-flight 2026 exchanges abort. */
+let mcpHttpHandler;
 /**
  * Validate auth request body
  */
@@ -91,12 +93,215 @@ function sessionNotFoundBody() {
         id: null,
     };
 }
+function bearerToken(authorization) {
+    if (!authorization) {
+        return undefined;
+    }
+    const [scheme, token] = authorization.split(' ');
+    if (!token || scheme?.toLowerCase() !== 'bearer') {
+        return undefined;
+    }
+    return token;
+}
+/**
+ * Build a per-request MCP server bound to the caller's database pool.
+ * Pools stay keyed by auth token (or the shared "global" key), not by MCP session id.
+ */
+function createHttpMcpServer(request) {
+    const httpConfig = getHttpConfig();
+    let dbConfig;
+    let sessionKey;
+    if (httpConfig.authMode === 'none' || httpConfig.authMode === 'token') {
+        dbConfig = loadConfig();
+        sessionKey = resolveCallerSessionKey(httpConfig.authMode);
+    }
+    else {
+        const token = bearerToken(request?.headers.get('authorization'));
+        const validation = token ? getTokenManager().validateToken(token) : undefined;
+        if (!token || !validation?.valid || !validation.session) {
+            throw new Error('Token session not found');
+        }
+        dbConfig = validation.session.config;
+        sessionKey = resolveCallerSessionKey(httpConfig.authMode, token);
+    }
+    initializeSessionPool(sessionKey, dbConfig);
+    return createMcpServer(dbConfig, sessionKey);
+}
+/**
+ * Deprecated MCP_SESSION_MODE=stateful path for 2025-era clients that still
+ * send Mcp-Session-Id. 2026-07-28 traffic is not routed here.
+ */
+async function handleStatefulLegacyRequest(req, res) {
+    const httpConfig = getHttpConfig();
+    const authReq = req;
+    if (req.method === 'GET') {
+        const sessionId = req.headers['mcp-session-id'];
+        if (!sessionId) {
+            res.status(400).json({
+                error: 'invalid_request',
+                error_description: 'Mcp-Session-Id header required',
+            });
+            return;
+        }
+        const sessionKey = resolveCallerSessionKey(httpConfig.authMode, authReq.authToken);
+        const sessionManager = getSessionManager();
+        const mcpSession = sessionManager.getSession(sessionId);
+        if (!mcpSession || !isSessionOwnedByCaller(mcpSession.authToken, sessionKey)) {
+            res.status(404).json({
+                error: 'not_found',
+                error_description: 'Session not found or expired',
+            });
+            return;
+        }
+        await mcpSession.transport.handleRequest(req, res);
+        return;
+    }
+    if (req.method === 'DELETE') {
+        const sessionId = req.headers['mcp-session-id'];
+        if (!sessionId) {
+            res.status(400).json({
+                error: 'invalid_request',
+                error_description: 'Mcp-Session-Id header required',
+            });
+            return;
+        }
+        const sessionKey = resolveCallerSessionKey(httpConfig.authMode, authReq.authToken);
+        const sessionManager = getSessionManager();
+        const mcpSession = sessionManager.getSession(sessionId);
+        if (!mcpSession || !isSessionOwnedByCaller(mcpSession.authToken, sessionKey)) {
+            res.status(404).json({
+                error: 'not_found',
+                error_description: 'Session not found',
+            });
+            return;
+        }
+        const closed = await sessionManager.closeSession(sessionId);
+        if (closed) {
+            res.json({ status: 'session_closed', sessionId });
+        }
+        else {
+            res.status(404).json({
+                error: 'not_found',
+                error_description: 'Session not found',
+            });
+        }
+        return;
+    }
+    if (req.method !== 'POST') {
+        res.status(405).json({
+            error: 'method_not_allowed',
+            error_description: 'Method not allowed',
+        });
+        return;
+    }
+    try {
+        let dbConfig;
+        let sessionKey;
+        if (httpConfig.authMode === 'none' || httpConfig.authMode === 'token') {
+            try {
+                dbConfig = loadConfig();
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : 'Configuration error';
+                log.error({ err }, 'Failed to load DB config from environment');
+                res.status(500).json({
+                    jsonrpc: '2.0',
+                    error: { code: -32603, message: `DB configuration error: ${message}` },
+                    id: null,
+                });
+                return;
+            }
+            sessionKey = resolveCallerSessionKey(httpConfig.authMode, authReq.authToken);
+        }
+        else {
+            if (!authReq.tokenSession || !authReq.authToken) {
+                log.error('Token session or auth token missing in required mode');
+                res.status(401).json({
+                    jsonrpc: '2.0',
+                    error: { code: -32001, message: 'Token session not found' },
+                    id: null,
+                });
+                return;
+            }
+            dbConfig = authReq.tokenSession.config;
+            sessionKey = resolveCallerSessionKey(httpConfig.authMode, authReq.authToken);
+        }
+        const sessionId = req.headers['mcp-session-id'];
+        const sessionManager = getSessionManager();
+        if (sessionId) {
+            const mcpSession = sessionManager.getSession(sessionId);
+            if (!mcpSession || !isSessionOwnedByCaller(mcpSession.authToken, sessionKey)) {
+                res.status(404).json(sessionNotFoundBody());
+                return;
+            }
+            sessionManager.incrementActiveRequests(sessionId);
+            try {
+                await mcpSession.transport.handleRequest(req, res, req.body);
+            }
+            finally {
+                sessionManager.decrementActiveRequests(sessionId);
+            }
+            return;
+        }
+        if (!isInitializeRequest(req.body)) {
+            res.status(400).json({
+                jsonrpc: '2.0',
+                error: { code: -32000, message: 'Session ID required for non-initialize requests' },
+                id: null,
+            });
+            return;
+        }
+        initializeSessionPool(sessionKey, dbConfig);
+        let mcpServer;
+        let transport;
+        let newSessionId;
+        try {
+            mcpServer = createMcpServer(dbConfig, sessionKey);
+            const result = await sessionManager.createSession(mcpServer, sessionKey);
+            transport = result.transport;
+            newSessionId = result.sessionId;
+        }
+        catch (err) {
+            if (mcpServer) {
+                await mcpServer.close().catch(() => { });
+            }
+            if (sessionKey !== 'global') {
+                await closeSessionPool(sessionKey);
+            }
+            throw err;
+        }
+        if (httpConfig.authMode === 'required') {
+            getTokenManager().setMcpSessionId(sessionKey, newSessionId);
+        }
+        await transport.handleRequest(req, res, req.body);
+    }
+    catch (err) {
+        log.error({ err }, 'Error handling legacy MCP session request');
+        if (!res.headersSent) {
+            res.status(500).json({
+                jsonrpc: '2.0',
+                error: { code: -32603, message: 'Internal server error' },
+                id: null,
+            });
+        }
+    }
+}
 /**
  * Create the Express application
  */
 export function createHttpApp() {
     const app = express();
     const httpConfig = getHttpConfig();
+    if (httpConfig.sessionMode === 'stateful') {
+        log.warn('MCP_SESSION_MODE=stateful is deprecated. Protocol sessions were removed in MCP 2026-07-28. ' +
+            'The default stateless mode still isolates database pools by auth token. ' +
+            'Stateful mode only keeps Mcp-Session-Id for 2025-era clients.');
+    }
+    mcpHttpHandler = createMcpHandler((ctx) => createHttpMcpServer(ctx.requestInfo), {
+        legacy: httpConfig.sessionMode === 'stateful' ? 'reject' : 'stateless',
+        onerror: (error) => log.error({ err: error }, 'MCP handler error'),
+    });
+    const mcpNodeHandler = toNodeHandler(mcpHttpHandler);
     // Middleware
     app.use(express.json());
     // Security headers
@@ -105,6 +310,25 @@ export function createHttpApp() {
         res.setHeader('X-Frame-Options', 'DENY');
         next();
     });
+    // Host allowlist. Runs before Origin checks so a rebinding request, which
+    // sends the attacker's name in both Host and Origin, is rejected first.
+    app.use((req, res, next) => {
+        const hostHeader = req.headers.host;
+        const hostname = typeof hostHeader === 'string' ? hostnameOf(hostHeader) : undefined;
+        if (!hostname || !httpConfig.allowedHosts.includes(hostname)) {
+            log.warn({
+                host: typeof hostHeader === 'string' ? hostHeader : undefined,
+                reason: 'host_not_allowed',
+                clientIp: req.socket.remoteAddress,
+            }, 'Rejected request');
+            res.status(403).json({
+                error: 'forbidden',
+                error_description: 'Forbidden: Host not allowed',
+            });
+            return;
+        }
+        next();
+    });
     // CORS and Origin validation (Streamable HTTP requires Origin checks)
     // By default (MCP_CORS_ORIGINS not set), only same-origin or missing Origin is allowed
     // Set MCP_CORS_ORIGINS='*' to allow all origins, or comma-separated list for specific origins
@@ -129,7 +353,7 @@ export function createHttpApp() {
                     res.setHeader('Access-Control-Allow-Credentials', 'true');
                 }
                 res.setHeader('Access-Control-Allow-Methods', 'GET, POST, DELETE, OPTIONS');
-                res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, Mcp-Session-Id, Accept');
+                res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, Accept, Mcp-Session-Id, MCP-Protocol-Version, Mcp-Method, Mcp-Name');
             }
         }
         if (req.method === 'OPTIONS') {
@@ -213,6 +437,16 @@ export function createHttpApp() {
                 });
                 return;
             }
+            const allowedDbHosts = httpConfig.authAllowedDbHosts;
+            const requestedHost = dbConfig.hostname.trim().replace(/\.$/, '').toLowerCase();
+            if (allowedDbHosts && !allowedDbHosts.includes(requestedHost)) {
+                recordFailedAuthAttempt(req);
+                res.status(400).json({
+                    error: 'invalid_request',
+                    error_description: 'Host is not allowed',
+                });
+                return;
+            }
             // Test connection to validate credentials
             log.debug({ host: dbConfig.hostname, user: dbConfig.username }, 'Testing credentials');
             // Use crypto random bytes for unique test pool ID (avoids collision with concurrent requests)
@@ -291,136 +525,19 @@ export function createHttpApp() {
             });
         }
     });
-    // MCP endpoint - POST (main request handler)
-    app.post('/mcp', authMiddleware, async (req, res) => {
-        const authReq = req;
+    // MCP endpoint. Default serves 2026-07-28 per request and stateless 2025 clients.
+    // MCP_SESSION_MODE=stateful (deprecated) still routes claim-less 2025 traffic
+    // through the session manager.
+    app.all('/mcp', authMiddleware, async (req, res) => {
         try {
-            // Determine DB config and session key based on auth mode
-            let dbConfig;
-            let sessionKey;
-            if (httpConfig.authMode === 'none' || httpConfig.authMode === 'token') {
-                // Use env-based config (like stdio mode)
-                try {
-                    dbConfig = loadConfig();
-                }
-                catch (err) {
-                    const message = err instanceof Error ? err.message : 'Configuration error';
-                    log.error({ err }, 'Failed to load DB config from environment');
-                    res.status(500).json({
-                        jsonrpc: '2.0',
-                        error: { code: -32603, message: `DB configuration error: ${message}` },
-                        id: null,
-                    });
-                    return;
-                }
-                // Use a single shared pool for none/token modes (similar to stdio mode).
-                // This pool persists for the server's lifetime and is cleaned up on shutdown
-                // via closeAllSessionPools(). This is intentional connection reuse, not a leak.
-                sessionKey = resolveCallerSessionKey(httpConfig.authMode, authReq.authToken);
-            }
-            else {
-                // Required mode - use per-user config from token
-                if (!authReq.tokenSession || !authReq.authToken) {
-                    log.error('Token session or auth token missing in required mode');
-                    res.status(401).json({
-                        jsonrpc: '2.0',
-                        error: { code: -32001, message: 'Token session not found' },
-                        id: null,
-                    });
-                    return;
-                }
-                const session = authReq.tokenSession;
-                const authToken = authReq.authToken;
-                dbConfig = session.config;
-                sessionKey = resolveCallerSessionKey(httpConfig.authMode, authToken);
-            }
-            const sessionId = req.headers['mcp-session-id'];
-            const sessionManager = getSessionManager();
             if (httpConfig.sessionMode === 'stateful') {
-                // Stateful mode - reuse or create sessions
-                if (sessionId) {
-                    // Existing session
-                    const mcpSession = sessionManager.getSession(sessionId);
-                    if (!mcpSession || !isSessionOwnedByCaller(mcpSession.authToken, sessionKey)) {
-                        res.status(404).json(sessionNotFoundBody());
-                        return;
-                    }
-                    sessionManager.incrementActiveRequests(sessionId);
-                    try {
-                        await mcpSession.transport.handleRequest(req, res, req.body);
-                    }
-                    finally {
-                        sessionManager.decrementActiveRequests(sessionId);
-                    }
-                }
-                else if (isInitializeRequest(req.body)) {
-                    // New session initialization
-                    // Initialize DB pool for this session key
-                    initializeSessionPool(sessionKey, dbConfig);
-                    // Create MCP server and session with proper cleanup on failure
-                    let mcpServer;
-                    let transport;
-                    let newSessionId;
-                    try {
-                        mcpServer = createMcpServer(dbConfig, sessionKey);
-                        const result = await sessionManager.createSession(mcpServer, sessionKey);
-                        transport = result.transport;
-                        newSessionId = result.sessionId;
-                    }
-                    catch (err) {
-                        // Clean up resources if server or session creation fails
-                        if (mcpServer) {
-                            await mcpServer.close().catch(() => { });
-                        }
-                        // Only close the pool if it's a per-user pool (required auth mode).
-                        // For 'none'/'token' modes, sessionKey='global' and the pool is shared
-                        // across all sessions - closing it would break other active sessions.
-                        // The global pool is only closed on server shutdown.
-                        if (sessionKey !== 'global') {
-                            await closeSessionPool(sessionKey);
-                        }
-                        throw err;
-                    }
-                    // Associate MCP session with token (only in required mode)
-                    if (httpConfig.authMode === 'required') {
-                        const tokenManager = getTokenManager();
-                        tokenManager.setMcpSessionId(sessionKey, newSessionId);
-                    }
-                    // Handle the initial request
-                    // Note: errors here are handled by the outer try-catch, and the session
-                    // will be cleaned up via normal session management (not here)
-                    await transport.handleRequest(req, res, req.body);
-                }
-                else {
-                    res.status(400).json({
-                        jsonrpc: '2.0',
-                        error: { code: -32000, message: 'Session ID required for non-initialize requests' },
-                        id: null,
-                    });
+                const probe = await toWebRequest(req, req.body);
+                if (await isLegacyRequest(probe)) {
+                    await handleStatefulLegacyRequest(req, res);
+                    return;
                 }
             }
-            else {
-                // Stateless mode - new server per request
-                const transport = new StreamableHTTPServerTransport({
-                    sessionIdGenerator: undefined,
-                });
-                // Initialize or reuse pool for this session key.
-                // In 'required' auth mode, sessionKey = authToken, so the pool is shared
-                // across all requests with the same token. This is intentional for efficiency.
-                // Pool cleanup is handled by TokenManager when the token expires or is revoked
-                // (see setCleanupCallback in startHttpServer).
-                initializeSessionPool(sessionKey, dbConfig);
-                const mcpServer = createMcpServer(dbConfig, sessionKey);
-                // Clean up MCP server and transport on response close.
-                // Note: The database connection pool is NOT closed here - it's reused across
-                // requests with the same auth token and cleaned up on token expiration.
-                res.on('close', () => {
-                    mcpServer.close().catch(() => { });
-                    transport.close().catch(() => { });
-                });
-                await mcpServer.connect(transport);
-                await transport.handleRequest(req, res, req.body);
-            }
+            await mcpNodeHandler(req, res, req.body);
         }
         catch (err) {
             log.error({ err }, 'Error handling MCP request');
@@ -433,69 +550,6 @@ export function createHttpApp() {
             }
         }
     });
-    // MCP endpoint - GET (SSE for stateful mode)
-    app.get('/mcp', authMiddleware, async (req, res) => {
-        const authReq = req;
-        const httpConfig = getHttpConfig();
-        if (httpConfig.sessionMode !== 'stateful') {
-            res.status(405).json({
-                error: 'method_not_allowed',
-                error_description: 'GET requests only supported in stateful mode',
-            });
-            return;
-        }
-        const sessionId = req.headers['mcp-session-id'];
-        if (!sessionId) {
-            res.status(400).json({
-                error: 'invalid_request',
-                error_description: 'Mcp-Session-Id header required',
-            });
-            return;
-        }
-        const sessionKey = resolveCallerSessionKey(httpConfig.authMode, authReq.authToken);
-        const sessionManager = getSessionManager();
-        const mcpSession = sessionManager.getSession(sessionId);
-        if (!mcpSession || !isSessionOwnedByCaller(mcpSession.authToken, sessionKey)) {
-            res.status(404).json({
-                error: 'not_found',
-                error_description: 'Session not found or expired',
-            });
-            return;
-        }
-        await mcpSession.transport.handleRequest(req, res);
-    });
-    // MCP endpoint - DELETE (close session)
-    app.delete('/mcp', authMiddleware, async (req, res) => {
-        const authReq = req;
-        const sessionId = req.headers['mcp-session-id'];
-        if (!sessionId) {
-            res.status(400).json({
-                error: 'invalid_request',
-                error_description: 'Mcp-Session-Id header required',
-            });
-            return;
-        }
-        const sessionKey = resolveCallerSessionKey(httpConfig.authMode, authReq.authToken);
-        const sessionManager = getSessionManager();
-        const mcpSession = sessionManager.getSession(sessionId);
-        if (!mcpSession || !isSessionOwnedByCaller(mcpSession.authToken, sessionKey)) {
-            res.status(404).json({
-                error: 'not_found',
-                error_description: 'Session not found',
-            });
-            return;
-        }
-        const closed = await sessionManager.closeSession(sessionId);
-        if (closed) {
-            res.json({ status: 'session_closed', sessionId });
-        }
-        else {
-            res.status(404).json({
-                error: 'not_found',
-                error_description: 'Session not found',
-            });
-        }
-    });
     return app;
 }
 /**
@@ -503,6 +557,16 @@ export function createHttpApp() {
  */
 export async function startHttpServer() {
     const httpConfig = getHttpConfig();
+    if (!isLoopbackHost(httpConfig.host) &&
+        httpConfig.authMode === 'none' &&
+        !httpConfig.allowUnauthenticatedHttp) {
+        throw new Error(`Refusing to listen on ${httpConfig.host} with MCP_AUTH_MODE=none. ` +
+            'Enable authentication, bind a loopback address, or set MCP_ALLOW_UNAUTHENTICATED_HTTP=true.');
+    }
+    if (httpConfig.authMode === 'required' && httpConfig.authAllowedDbHosts === null) {
+        log.warn('MCP_AUTH_ALLOWED_DB_HOSTS and DB2I_HOSTNAME are unset. ' +
+            '/auth will open a database connection to any host the client names.');
+    }
     const app = createHttpApp();
     // Register cleanup callback to close session pools when tokens expire or are revoked.
     // This handles cleanup for both stateful and stateless modes in 'required' auth:
@@ -561,6 +625,12 @@ export async function startHttpServer() {
  */
 export async function shutdownHttpServer(server) {
     log.info('Shutting down HTTP server...');
+    if (mcpHttpHandler) {
+        await mcpHttpHandler.close().catch((err) => {
+            log.error({ err }, 'Error closing MCP HTTP handler');
+        });
+        mcpHttpHandler = undefined;
+    }
     // Close session manager (closes MCP sessions)
     const sessionManager = getSessionManager();
     await sessionManager.shutdown();