tiny-http-mcp-server 0.1.35 → 0.1.36

package/dist/composition.json

@@ -18,7 +18,7 @@
     },
     {
       "name": "tiny-http-mcp-server",
-      "version": "0.1.35",
+      "version": "0.1.36",
       "license": "MIT"
     },
     {

package/node_modules/mcp-oauth/README.md

@@ -132,6 +132,14 @@ but an expired secret is never submitted for refresh. Native DCR can replace
 an expired registration during explicit authorization; caller-owned imports
 must be updated. Headless requests retain the old record and report recovery
 is required without creating a pending refresh marker.
+Native registrations retain `requestedRedirectUri`, the actual listener URI
+submitted to DCR, separately from the full response metadata. Fresh responses
+may normalize a loopback port or represent IPv4 loopback as portless localhost;
+host, path, scheme, query and fragment differences outside that boundary fail.
+Authorization and code exchange always use the actual listener URI. Silent
+refresh keeps its original client regardless of callback changes. At interactive
+authorization, a native registration with an obsolete captured callback is
+replaced; caller-owned full registration imports retain their original identity.
 Set `client.tokenEndpointAuthMethod` to `none`, `client_secret_post` or
 `client_secret_basic`; a full registration can supply the same field as
 `token_endpoint_auth_method`. Public clients never transmit a stored secret.

package/node_modules/mcp-oauth/dist/client/client-registration.d.ts

@@ -2,3 +2,5 @@ import type { OAuthClientRegistration, StoredOAuthClient } from "./types.js";
 /** Validate and copy a bounded JSON DCR response without quoting credential input. */
 export declare function parseOAuthClientRegistration(value: unknown): OAuthClientRegistration;
 export declare function normalizeStoredOAuthClient(value: unknown): StoredOAuthClient | null;
+/** Fresh DCR may describe a normalized loopback port; saved identity stays exact. */
+export declare function registrationMatchesRedirect(client: StoredOAuthClient, requestedUri: string, fresh?: boolean): boolean;

package/node_modules/mcp-oauth/dist/client/client-registration.js

@@ -1,3 +1,4 @@
+import { loopbackTarget } from "./loopback-authorization.js";
 import { normalizeOAuthScope } from "./scope.js";
 import { normalizeOAuthTokenEndpointAuthMethod } from "./token-auth-method.js";
 /** Validate and copy a bounded JSON DCR response without quoting credential input. */
@@ -84,6 +85,18 @@ export function normalizeStoredOAuthClient(value) {
         (clientSecret !== undefined && (typeof clientSecret !== "string" || clientSecret.trim() === "")))
         return null;
     const client = { clientId: clientId.trim(), ...(clientSecret === undefined ? {} : { clientSecret: clientSecret.trim() }) };
+    const requestedRedirectUri = Object.hasOwn(record, "requestedRedirectUri") ? record.requestedRedirectUri : undefined;
+    if (requestedRedirectUri !== undefined) {
+        try {
+            if (typeof requestedRedirectUri !== "string")
+                throw new Error("Invalid redirect identity");
+            loopbackTarget({ redirectUri: requestedRedirectUri });
+        }
+        catch {
+            throw new Error("Invalid stored OAuth registration redirect identity");
+        }
+        client.requestedRedirectUri = requestedRedirectUri;
+    }
     const method = normalizeOAuthTokenEndpointAuthMethod(Object.hasOwn(record, "tokenEndpointAuthMethod") ? record.tokenEndpointAuthMethod : undefined);
     if (Object.hasOwn(record, "registration") && record.registration !== undefined) {
         const registration = parseOAuthClientRegistration(record.registration);
@@ -101,3 +114,35 @@ export function normalizeStoredOAuthClient(value) {
         client.tokenEndpointAuthMethod = method;
     return client;
 }
+/** Fresh DCR may describe a normalized loopback port; saved identity stays exact. */
+export function registrationMatchesRedirect(client, requestedUri, fresh = false) {
+    if (client.requestedRedirectUri !== undefined)
+        return client.requestedRedirectUri === requestedUri;
+    const redirects = client.registration?.redirect_uris;
+    if (redirects === undefined || redirects === null || redirects.length === 0)
+        return true;
+    return redirects.some(returnedUri => {
+        if (returnedUri === requestedUri)
+            return true;
+        if (!fresh)
+            return false;
+        let returned, requested;
+        try {
+            returned = new URL(returnedUri);
+            requested = new URL(requestedUri);
+        }
+        catch {
+            return false;
+        }
+        if (requested.protocol !== "http:" || returned.protocol !== "http:" ||
+            !["127.0.0.1", "[::1]", "localhost"].includes(requested.hostname))
+            return false;
+        const sameHost = returned.hostname === requested.hostname;
+        const normalizedIpv4 = requested.hostname === "127.0.0.1" && returned.hostname === "localhost" && returned.port === "";
+        if (!sameHost && !normalizedIpv4)
+            return false;
+        returned.hostname = requested.hostname;
+        returned.port = requested.port;
+        return returned.href === requested.href;
+    });
+}

package/node_modules/mcp-oauth/dist/client/default-oauth-client-provider.js

@@ -1,4 +1,4 @@
-import { normalizeStoredOAuthClient, parseOAuthClientRegistration } from "./client-registration.js";
+import { normalizeStoredOAuthClient, parseOAuthClientRegistration, registrationMatchesRedirect } from "./client-registration.js";
 import { normalizeOAuthScope } from "./scope.js";
 import { normalizeOAuthTokenEndpointAuthMethod } from "./token-auth-method.js";
 import { isIP } from "node:net";
@@ -372,7 +372,7 @@ export function createDefaultOAuthClientProvider(options) {
         let storedClient = await loadRegisteredClient(discovery.authorizationServer);
         if (storedClient !== null) {
             assertRegistrationIssuer(storedClient, discovery.authorizationServer);
-            if (hasExpiredClientSecret(storedClient, now)) {
+            if (hasExpiredClientSecret(storedClient, now) || !registrationMatchesRedirect(storedClient, redirectUri)) {
                 await clearRegisteredClient(discovery.authorizationServer);
                 storedClient = null;
             }
@@ -385,7 +385,7 @@ export function createDefaultOAuthClientProvider(options) {
             };
         }
         if (registrationEndpoint === undefined) {
-            if (existingSession !== null && existingSession.client.clientId.length > 0 && !hasExpiredClientSecret(existingSession.client, now)) {
+            if (existingSession !== null && existingSession.client.clientId.length > 0 && !hasExpiredClientSecret(existingSession.client, now) && registrationMatchesRedirect(existingSession.client, redirectUri)) {
                 return {
                     kind: "dynamic",
                     fromStoredRegistration: true,
@@ -394,7 +394,7 @@ export function createDefaultOAuthClientProvider(options) {
             }
             throw new Error("Authorization server metadata is missing registration_endpoint");
         }
-        if (existingSession !== null && existingSession.client.clientId.length > 0 && !hasExpiredClientSecret(existingSession.client, now)) {
+        if (existingSession !== null && existingSession.client.clientId.length > 0 && !hasExpiredClientSecret(existingSession.client, now) && registrationMatchesRedirect(existingSession.client, redirectUri)) {
             const isConfiguredStaticFallback = configuredClient !== null &&
                 existingSession.client.clientId === configuredClient.clientId &&
                 existingSession.client.clientSecret === configuredClient.clientSecret;
@@ -437,11 +437,14 @@ export function createDefaultOAuthClientProvider(options) {
         assertRegistrationIssuer(registeredClient, discovery.authorizationServer);
         if (hasExpiredClientSecret(registeredClient, now))
             throw new Error("OAuth client secret has expired in the registration response");
-        await saveRegisteredClient(discovery.authorizationServer, registeredClient);
+        if (!registrationMatchesRedirect(registeredClient, redirectUri, true))
+            throw new Error("OAuth registration response does not match the requested redirect URI");
+        const clientWithRedirect = { ...registeredClient, requestedRedirectUri: redirectUri };
+        await saveRegisteredClient(discovery.authorizationServer, clientWithRedirect);
         return {
             kind: "dynamic",
             fromStoredRegistration: false,
-            client: registeredClient
+            client: clientWithRedirect
         };
     }
     async function loadSession(resource) {

package/node_modules/mcp-oauth/dist/client/types.d.ts

@@ -92,6 +92,8 @@ export interface OAuthClientRegistration extends Record<string, unknown> {
 }
 export interface StoredOAuthClient {
     clientId: string;
+    /** Actual listener URI submitted when this native client was registered. */
+    requestedRedirectUri?: string;
     clientSecret?: string;
     registration?: OAuthClientRegistration;
     tokenEndpointAuthMethod?: OAuthTokenEndpointAuthMethod;

package/node_modules/tiny-mcp-client/dist/index.d.ts

@@ -195,6 +195,8 @@ interface OAuthClientRegistration extends Record<string, unknown> {
 }
 interface StoredOAuthClient {
     clientId: string;
+    /** Actual listener URI submitted when this native client was registered. */
+    requestedRedirectUri?: string;
     clientSecret?: string;
     registration?: OAuthClientRegistration;
     tokenEndpointAuthMethod?: OAuthTokenEndpointAuthMethod;