@cyanmycelium/mcp-broker 1.8.0 → 1.9.0

package/dist/{chunk-ACF2R4O3.js → chunk-WEUCJH6C.js}

@@ -12,6 +12,7 @@ import { WebSocket, WebSocketServer } from 'ws';
 import { fileURLToPath } from 'url';
 import { McpAuthError, McpGrammar, McpBehavior, McpAdapterBase, McpToolResults, LoopbackTransport, McpServerBuilder, scopesOf as scopesOf$1, buildProtectedResourceMetadata, PROTECTED_RESOURCE_METADATA_PREFIX, bearerToken, buildChallengeHeader, createEventEmitter } from '@cyanmycelium/mcp-core';
 import { createRemoteJWKSet, jwtVerify, errors } from 'jose';
+import { BlockList, isIP } from 'net';
 import { createRequire } from 'module';
 import { AsyncLocalStorage } from 'async_hooks';
 import { StdioTransport, StreamableHttpEndpoint } from '@cyanmycelium/mcp-core/node';
@@ -4521,6 +4522,7 @@ function buildResourceMetadata(params) {
 }
 var DEV_ISSUER = "urn:mcp-broker:dev";
 var DEV_TOKEN_MIN_LENGTH = 16;
+var DEV_LAN_NETWORKS = ["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "169.254.0.0/16", "fc00::/7", "fe80::/10"];
 var DEV_SUBJECT_MAPPING = { userClaim: "sub", groupClaims: ["groups"], serviceClaims: ["service"], clientClaim: "client_id" };
 var CALLER_KEYS = /* @__PURE__ */ new Set(["id", "tokenEnv", "user", "groups", "service", "client", "scopes"]);
 var digest = (token) => createHash("sha256").update(token, "utf8").digest("hex");
@@ -4528,7 +4530,7 @@ function resolveDevCallers(dev, env) {
   const problems = [];
   const callers = [];
   if (typeof dev !== "object" || dev === null || Array.isArray(dev)) return { callers, problems: ['"auth.dev" must be an object: { "callers": [...] }'] };
-  for (const key of Object.keys(dev)) if (key !== "callers") problems.push(`auth.dev: unknown key "${key}"`);
+  for (const key of Object.keys(dev)) if (key !== "callers" && key !== "networks") problems.push(`auth.dev: unknown key "${key}"`);
   const list = dev.callers;
   if (!Array.isArray(list) || list.length === 0) {
     problems.push('"auth.dev.callers" must be a non-empty array');
@@ -4586,6 +4588,55 @@ function resolveDevCallers(dev, env) {
   }
   return { callers, problems };
 }
+function parseNetwork(entry) {
+  const [address, prefixText, extra] = entry.trim().split("/");
+  const version = isIP(address);
+  if (version === 0 || extra !== void 0) return `"${entry}" is not "lan", an IPv4 or IPv6 address, or a CIDR network`;
+  const max = version === 4 ? 32 : 128;
+  const prefix = prefixText === void 0 ? max : /^[0-9]{1,3}$/.test(prefixText) ? Number(prefixText) : NaN;
+  if (!Number.isInteger(prefix) || prefix > max) return `"${entry}": the prefix length must be an integer from 1 to ${max}`;
+  if (prefix === 0) return `"${entry}" would accept every client, the internet included; write "lan" for the bench's network, or use OAuth`;
+  return { address, prefix, family: version === 4 ? "ipv4" : "ipv6" };
+}
+function resolveDevNetworks(networks) {
+  if (networks === void 0) return { networks: [], problems: [] };
+  if (!Array.isArray(networks)) return { networks: [], problems: ['"auth.dev.networks" must be an array, e.g. ["lan"] or ["192.168.4.0/24"]'] };
+  const out = [];
+  const problems = [];
+  for (const [index, entry] of networks.entries()) {
+    if (typeof entry !== "string" || entry.trim() === "") {
+      problems.push(`auth.dev.networks[${index}] must be a non-empty string`);
+      continue;
+    }
+    for (const one of entry.trim().toLowerCase() === "lan" ? DEV_LAN_NETWORKS : [entry]) {
+      const parsed = parseNetwork(one);
+      if (typeof parsed === "string") problems.push(`auth.dev.networks[${index}]: ${parsed}`);
+      else if (!out.includes(`${parsed.address}/${parsed.prefix}`)) out.push(`${parsed.address}/${parsed.prefix}`);
+    }
+  }
+  return { networks: out, problems };
+}
+var DevClientFilter = class {
+  _list = new BlockList();
+  networks;
+  constructor(networks = []) {
+    const resolved = resolveDevNetworks(networks);
+    if (resolved.problems.length > 0) throw new Error(resolved.problems.join("; "));
+    for (const n of resolved.networks) {
+      const parsed = parseNetwork(n);
+      this._list.addSubnet(parsed.address, parsed.prefix, parsed.family);
+    }
+    this.networks = resolved.networks;
+  }
+  allows(req) {
+    if (isLoopbackRequest(req)) return true;
+    const address = req.socket?.remoteAddress;
+    if (!address || this.networks.length === 0) return false;
+    const plain = address.startsWith("::ffff:") ? address.slice(7) : address;
+    const version = isIP(plain);
+    return version !== 0 && this._list.check(plain, version === 4 ? "ipv4" : "ipv6");
+  }
+};
 function isLoopbackRequest(req) {
   const address = req.socket?.remoteAddress;
   if (!address) return false;
@@ -4620,6 +4671,8 @@ function buildDevAuth(options) {
     validator: new DevTokenValidator(options.callers),
     loopbackOnly: true
   };
+  const networks = new DevClientFilter(options.networks).networks;
+  if (networks.length > 0) resolved.clientNetworks = networks;
   if (options.scopesSupported) resolved.scopesSupported = options.scopesSupported;
   if (options.requiredScopes) resolved.requiredScopes = options.requiredScopes;
   if (options.perSlotScopes) resolved.perSlotScopes = options.perSlotScopes;
@@ -4645,8 +4698,11 @@ var HttpAuthGuard = class {
   _auth;
   /** The `/mcp` suffix without a leading slash, e.g. `"mcp"`. */
   _mcpSuffix;
+  /** The clients a `loopbackOnly` auth accepts: loopback and its `clientNetworks`. */
+  _clients;
   constructor(auth, mcpSuffix) {
     this._auth = auth;
+    this._clients = auth.loopbackOnly ? new DevClientFilter(auth.clientNetworks) : null;
     this._mcpSuffix = mcpSuffix.replace(/^\//, "");
   }
   /** Canonical resource identifier for a slot (RFC 8707 §2). */
@@ -4687,8 +4743,8 @@ var HttpAuthGuard = class {
    * `403` insufficient scope) otherwise.
    */
   async authorize(req, slot) {
-    if (this._auth.loopbackOnly && !isLoopbackRequest(req)) {
-      throw new AuthError(401, "invalid_token", "Development tokens are accepted from loopback clients only");
+    if (this._clients && !this._clients.allows(req)) {
+      throw new AuthError(401, "invalid_token", "Development tokens are not accepted from this client's network");
     }
     const token = bearerToken(req.headers["authorization"]);
     if (!token) {
@@ -9105,6 +9161,6 @@ var WsTunnelBuilder = class {
   }
 };
 
-export { AuthError, BROKER_AGGREGATE_NAME, BROKER_AUDIT_RESULT_METHOD, BROKER_AUTHORIZE_METHOD, BROKER_DECLARE_METHOD, BROKER_GUIDES, BROKER_GUIDE_MIME_TYPE, BROKER_GUIDE_TOPICS, BROKER_GUIDE_URI_PREFIX, BROKER_GUIDE_URI_TEMPLATE, BROKER_METHOD_PREFIX, BROKER_PROVIDER_NAME, BROKER_RESERVED_SLOTS, BrokerAuthority, BrokerDiagnoseAdapter, BrokerDiagnoseBehavior, BrokerGuideAdapter, BrokerGuideBehavior, BrokerInfoBehavior, BrokerProvidersBehavior, CALLER_META_KEY, CORRELATION_ID_PATTERN, ConfigPolicyEngine, ConfiguredCapabilityClassifier, DEFAULT_AUTHORIZE_BATCH_LIMIT, DEFAULT_RESOURCE_SUBSCRIPTION_LIMITS, DEV_ISSUER, DEV_TOKEN_MIN_LENGTH, DefaultSlotResourceResolver, DevTokenValidator, HttpAuthGuard, JwtSubjectMapper, JwtTokenValidator, LimitController, OtlpHttpTraceExporter, PACKAGE_NAME, ProviderTableAuthenticator, ProviderTelemetryDispatcher, RemoteUpstream, ResourcePath, ResourcePathPattern, ResourceSubscriptionRegistry, SUBSCRIPTION_LIMIT_ERROR_CODE, SharedSecretProviderAuthenticator, StdioUpstream, SubjectMappingError, TELEMETRY_NOTIFICATION_METHOD, TRACEPARENT_META_KEY, VERSION, WsTunnel, WsTunnelBuilder, authorizationWithEngine, brokerGrammarKey, brokerGuide, brokerGuideIndex, brokerGuideTopicFromUri, brokerGuideUri, buildDevAuth, buildJwtAuth, buildResourceMetadata, compileAuthorizationPolicy, compileProviderAllowedResources, compileRegex, compileResourceLimits, createTraceparent, diagnoseBroker, ensureTraceparent, formatTraceparent, hasAuthorizationPolicies, isLoopbackRequest, isReservedBrokerSlot, iterAvailableBrokerGrammars, iterBrokerGrammarsFrom, loadBrokerGrammar, normalizeProviderAuthentication, parseTraceparent, providerMayPublish, providerPublishDecision, resolveDevCallers, scopesOf, startBrokerServer, validateCapability, validateLimitsConfig };
-//# sourceMappingURL=chunk-ACF2R4O3.js.map
-//# sourceMappingURL=chunk-ACF2R4O3.js.map
+export { AuthError, BROKER_AGGREGATE_NAME, BROKER_AUDIT_RESULT_METHOD, BROKER_AUTHORIZE_METHOD, BROKER_DECLARE_METHOD, BROKER_GUIDES, BROKER_GUIDE_MIME_TYPE, BROKER_GUIDE_TOPICS, BROKER_GUIDE_URI_PREFIX, BROKER_GUIDE_URI_TEMPLATE, BROKER_METHOD_PREFIX, BROKER_PROVIDER_NAME, BROKER_RESERVED_SLOTS, BrokerAuthority, BrokerDiagnoseAdapter, BrokerDiagnoseBehavior, BrokerGuideAdapter, BrokerGuideBehavior, BrokerInfoBehavior, BrokerProvidersBehavior, CALLER_META_KEY, CORRELATION_ID_PATTERN, ConfigPolicyEngine, ConfiguredCapabilityClassifier, DEFAULT_AUTHORIZE_BATCH_LIMIT, DEFAULT_RESOURCE_SUBSCRIPTION_LIMITS, DEV_ISSUER, DEV_LAN_NETWORKS, DEV_TOKEN_MIN_LENGTH, DefaultSlotResourceResolver, DevClientFilter, DevTokenValidator, HttpAuthGuard, JwtSubjectMapper, JwtTokenValidator, LimitController, OtlpHttpTraceExporter, PACKAGE_NAME, ProviderTableAuthenticator, ProviderTelemetryDispatcher, RemoteUpstream, ResourcePath, ResourcePathPattern, ResourceSubscriptionRegistry, SUBSCRIPTION_LIMIT_ERROR_CODE, SharedSecretProviderAuthenticator, StdioUpstream, SubjectMappingError, TELEMETRY_NOTIFICATION_METHOD, TRACEPARENT_META_KEY, VERSION, WsTunnel, WsTunnelBuilder, authorizationWithEngine, brokerGrammarKey, brokerGuide, brokerGuideIndex, brokerGuideTopicFromUri, brokerGuideUri, buildDevAuth, buildJwtAuth, buildResourceMetadata, compileAuthorizationPolicy, compileProviderAllowedResources, compileRegex, compileResourceLimits, createTraceparent, diagnoseBroker, ensureTraceparent, formatTraceparent, hasAuthorizationPolicies, isLoopbackRequest, isReservedBrokerSlot, iterAvailableBrokerGrammars, iterBrokerGrammarsFrom, loadBrokerGrammar, normalizeProviderAuthentication, parseTraceparent, providerMayPublish, providerPublishDecision, resolveDevCallers, resolveDevNetworks, scopesOf, startBrokerServer, validateCapability, validateLimitsConfig };
+//# sourceMappingURL=chunk-WEUCJH6C.js.map
+//# sourceMappingURL=chunk-WEUCJH6C.js.map