@bytebase/dbhub 0.22.4 → 0.22.5

package/README.md

@@ -93,6 +93,8 @@ npx @bytebase/dbhub@latest --transport http --host 127.0.0.1 --port 8080 --demo
 ```
 
 > The HTTP transport defaults to `--host 0.0.0.0`, exposing DBHub on every network interface. For production, bind to `127.0.0.1` and front DBHub with a reverse proxy (nginx/Caddy) or firewall — DBHub does not authenticate HTTP clients.
+>
+> The HTTP transport also has built-in DNS-rebinding protection: it only accepts requests whose `Host` is loopback, this machine's own hostname/IPs, or a name you allow via [`--allowed-hosts`](https://dbhub.ai/config/command-line#allowed-hosts). If a client behind a reverse proxy or custom DNS name gets a `403`, add that hostname with `--allowed-hosts`.
 
 See [Command-Line Options](https://dbhub.ai/config/command-line) for all available parameters.
 

package/dist/{chunk-DN45LGY4.js → chunk-IOKERPF2.js}

@@ -733,6 +733,21 @@ function resolveHost() {
   }
   return { host: "0.0.0.0", source: "default" };
 }
+function resolveAllowedHosts() {
+  const args = parseCommandLineArgs();
+  const cliValue = requireFlagValue("allowed-hosts", args, "db.internal,app.example.com");
+  if (cliValue !== void 0) {
+    return { hosts: splitHostList(cliValue), source: "command line argument" };
+  }
+  const envValue = process.env.DBHUB_ALLOWED_HOSTS?.trim();
+  if (envValue) {
+    return { hosts: splitHostList(envValue), source: "environment variable" };
+  }
+  return { hosts: [], source: "default" };
+}
+function splitHostList(value) {
+  return value.split(",").map((h) => h.trim()).filter((h) => h.length > 0);
+}
 function redactDSN(dsn) {
   try {
     const url = new URL(dsn);
@@ -2371,6 +2386,7 @@ export {
   resolveTransport,
   resolvePort,
   resolveHost,
+  resolveAllowedHosts,
   resolveSourceConfigs,
   BUILTIN_TOOL_EXECUTE_SQL,
   BUILTIN_TOOL_SEARCH_OBJECTS,

package/dist/index.js

@@ -9,12 +9,13 @@ import {
   isDemoMode,
   loadTomlConfig,
   mapArgumentsToArray,
+  resolveAllowedHosts,
   resolveHost,
   resolvePort,
   resolveSourceConfigs,
   resolveTomlConfigPath,
   resolveTransport
-} from "./chunk-DN45LGY4.js";
+} from "./chunk-IOKERPF2.js";
 import {
   loadConnectors
 } from "./chunk-WVVMH6FJ.js";
@@ -1490,22 +1491,78 @@ Detected change in ${configPath}, reloading configuration...`);
 }
 
 // src/utils/cross-origin.ts
+import os from "node:os";
 var INVALID_HOST_CHARS = /[\s/\\@?#]/;
-function validateOrigin(originHeader, hostHeader) {
-  if (originHeader === void 0) return { ok: true };
-  const trimmedOrigin = originHeader.trim();
-  if (!trimmedOrigin) {
-    return { ok: false, status: 400, message: "Malformed Origin header" };
+var LOOPBACK_HOSTS = ["localhost", "127.0.0.1", "[::1]"];
+var ALLOW_ANY_HOST = "*";
+function normalizeHost(raw) {
+  const trimmed = raw.trim();
+  if (!trimmed) return null;
+  if (trimmed === ALLOW_ANY_HOST) return ALLOW_ANY_HOST;
+  if (INVALID_HOST_CHARS.test(trimmed)) return null;
+  try {
+    const hostname = new URL(`http://${trimmed}`).hostname.toLowerCase();
+    return hostname || null;
+  } catch {
+    return null;
   }
-  const trimmedHost = (hostHeader ?? "").trim();
-  if (!trimmedHost || INVALID_HOST_CHARS.test(trimmedHost)) {
-    return { ok: false, status: 400, message: "Malformed Host header" };
+}
+function getSelfHosts() {
+  const hosts = [];
+  try {
+    const hostname = os.hostname().trim();
+    if (hostname) hosts.push(hostname);
+  } catch {
   }
-  let originHostname;
+  let interfaces = {};
   try {
-    originHostname = new URL(trimmedOrigin).hostname.toLowerCase();
+    interfaces = os.networkInterfaces();
   } catch {
-    return { ok: false, status: 400, message: "Malformed Origin header" };
+  }
+  for (const addrs of Object.values(interfaces)) {
+    for (const addr of addrs ?? []) {
+      if (!addr.address || addr.internal) continue;
+      const isIPv6 = addr.family === "IPv6" || addr.family === 6;
+      if (isIPv6) {
+        const bare = addr.address.split("%")[0];
+        if (bare.toLowerCase().startsWith("fe80")) continue;
+        hosts.push(`[${bare}]`);
+      } else {
+        hosts.push(addr.address);
+      }
+    }
+  }
+  return hosts;
+}
+function buildAllowedHosts(configured = [], bindHost, selfHosts = []) {
+  const normalizedConfigured = configured.map(normalizeHost).filter((h) => h !== null);
+  if (normalizedConfigured.includes(ALLOW_ANY_HOST)) {
+    return /* @__PURE__ */ new Set([ALLOW_ANY_HOST]);
+  }
+  const hosts = /* @__PURE__ */ new Set();
+  for (const h of LOOPBACK_HOSTS) {
+    const normalized = normalizeHost(h);
+    if (normalized) hosts.add(normalized);
+  }
+  const normalizedBind = bindHost ? normalizeHost(bindHost) : null;
+  const bindIsWildcard = !normalizedBind || normalizedBind === "0.0.0.0" || normalizedBind === "[::]";
+  if (normalizedBind && !bindIsWildcard) {
+    hosts.add(normalizedBind);
+  }
+  if (bindIsWildcard) {
+    for (const h of selfHosts) {
+      const normalized = normalizeHost(h);
+      if (normalized) hosts.add(normalized);
+    }
+  }
+  for (const h of normalizedConfigured) hosts.add(h);
+  return hosts;
+}
+function validateOrigin(originHeader, hostHeader, allowedHosts) {
+  const allowAny = allowedHosts.has(ALLOW_ANY_HOST);
+  const trimmedHost = (hostHeader ?? "").trim();
+  if (!trimmedHost || INVALID_HOST_CHARS.test(trimmedHost)) {
+    return { ok: false, status: 400, message: "Malformed Host header" };
   }
   let hostname;
   try {
@@ -1516,11 +1573,32 @@ function validateOrigin(originHeader, hostHeader) {
   if (!hostname) {
     return { ok: false, status: 400, message: "Malformed Host header" };
   }
-  if (originHostname !== hostname) {
+  if (!allowAny && !allowedHosts.has(hostname)) {
     return {
       ok: false,
       status: 403,
-      message: "Origin does not match Host header"
+      message: `Host '${hostname}' is not allowed. Only loopback is permitted by default; set --allowed-hosts (or DBHUB_ALLOWED_HOSTS) to serve other hostnames. This protects against DNS rebinding.`
+    };
+  }
+  if (originHeader === void 0) return { ok: true };
+  const trimmedOrigin = originHeader.trim();
+  if (!trimmedOrigin) {
+    return { ok: false, status: 400, message: "Malformed Origin header" };
+  }
+  let originHostname;
+  try {
+    originHostname = new URL(trimmedOrigin).hostname.toLowerCase();
+  } catch {
+    return { ok: false, status: 400, message: "Malformed Origin header" };
+  }
+  if (!originHostname) {
+    return { ok: false, status: 400, message: "Malformed Origin header" };
+  }
+  if (!allowAny && !allowedHosts.has(originHostname)) {
+    return {
+      ok: false,
+      status: 403,
+      message: `Origin '${originHostname}' is not allowed`
     };
   }
   return { ok: true };
@@ -1578,7 +1656,7 @@ See documentation for more details on configuring database connections.
     const sources = sourceConfigsData.sources;
     console.error(`Configuration source: ${sourceConfigsData.source}`);
     await connectorManager.connectWithSources(sources);
-    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-OF5GPCBK.js");
+    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-L3ZIOUF2.js");
     initializeToolRegistry2({
       sources: sourceConfigsData.sources,
       tools: sourceConfigsData.tools
@@ -1599,6 +1677,7 @@ See documentation for more details on configuring database connections.
     const transportData = resolveTransport();
     const port = transportData.type === "http" ? resolvePort().port : null;
     const host = transportData.type === "http" ? resolveHost().host : null;
+    const allowedHosts = transportData.type === "http" ? buildAllowedHosts(resolveAllowedHosts().hosts, host ?? void 0, getSelfHosts()) : /* @__PURE__ */ new Set();
     const activeModes = [];
     const modeDescriptions = [];
     const isDemo = isDemoMode();
@@ -1624,7 +1703,7 @@ See documentation for more details on configuring database connections.
       app.use(express.json());
       app.use((req, res, next) => {
         const origin = req.headers.origin;
-        const result = validateOrigin(origin, req.headers.host);
+        const result = validateOrigin(origin, req.headers.host, allowedHosts);
         if (!result.ok) {
           return res.status(result.status).json({
             error: result.status === 400 ? "Bad Request" : "Forbidden",
@@ -1690,6 +1769,11 @@ See documentation for more details on configuring database connections.
         const displayHost = boundHost.includes(":") ? `[${boundHost}]` : boundHost;
         const userHost = boundHost === "0.0.0.0" || boundHost === "::" ? "localhost" : displayHost;
         console.error(`HTTP server listening on ${displayHost}:${boundPort}`);
+        if (allowedHosts.has(ALLOW_ANY_HOST)) {
+          console.error("Allowed hosts: * (DNS-rebinding protection DISABLED \u2014 ensure DBHub is fronted by your own auth/proxy)");
+        } else {
+          console.error(`Allowed hosts: ${[...allowedHosts].join(", ")} (set --allowed-hosts to serve other hostnames)`);
+        }
         if (process.env.NODE_ENV === "development") {
           console.error("Development mode detected!");
           console.error("   Workbench dev server (with HMR): http://localhost:5173");

package/dist/{registry-OF5GPCBK.js → registry-L3ZIOUF2.js}

@@ -2,7 +2,7 @@ import {
   ToolRegistry,
   getToolRegistry,
   initializeToolRegistry
-} from "./chunk-DN45LGY4.js";
+} from "./chunk-IOKERPF2.js";
 import "./chunk-WVVMH6FJ.js";
 import "./chunk-C7WEAPX4.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebase/dbhub",
-  "version": "0.22.4",
+  "version": "0.22.5",
   "mcpName": "io.github.bytebase/dbhub",
   "description": "Minimal, token-efficient Database MCP Server for PostgreSQL, MySQL, SQL Server, SQLite, MariaDB",
   "repository": {