@ni-c/mcp-hub 0.9.2 → 0.10.0

package/dist/upstream/provider.js

@@ -0,0 +1,286 @@
+import crypto from 'node:crypto';
+import { SignJWT, exportJWK } from 'jose';
+import { sign } from '../auth/signed-token.js';
+import { VERSION } from '../version.js';
+/**
+ * The hub as an OAuth *client*, for one upstream MCP server.
+ *
+ * The SDK drives the protocol; this supplies the identity and the storage. Two
+ * things shape the design:
+ *
+ * The transport is rebuilt on every connection attempt (`buildRemoteTransport`
+ * runs inside `start()`), so nothing durable may live in a field here. Every
+ * read goes to the store, which is also how a token written by
+ * `mcp-hub-admin upstream login` in another process reaches a running hub —
+ * `reloadIfChanged()` is a single stat.
+ *
+ * And `redirectUrl` returning `undefined` is what selects the SDK's
+ * non-interactive path, so it is the switch between the two grants rather than
+ * a mere detail.
+ */
+/** Where the upstream sends the operator's browser back to. */
+export const UPSTREAM_CALLBACK_PATH = 'upstream/callback';
+/** Where the hub publishes a client metadata document, one per upstream. */
+export const UPSTREAM_CLIENT_METADATA_PREFIX = '.well-known/mcp-hub-client';
+/**
+ * Identifies the configuration a stored credential belongs to. Change the URL,
+ * the client or the scopes and the old tokens describe an identity the upstream
+ * no longer knows — presenting them would at best fail confusingly. Deliberately
+ * excludes everything that does not affect identity, so renaming a header does
+ * not force a new login.
+ */
+export function credentialFingerprint(identity) {
+    const { oauth } = identity;
+    return crypto
+        .createHash('sha256')
+        .update(JSON.stringify([identity.serverUrl, oauth.mode, oauth.grant, oauth.clientId ?? null, [...oauth.scopes].sort()]))
+        .digest('hex');
+}
+export function callbackUrl(externalUrl) {
+    return new URL(UPSTREAM_CALLBACK_PATH, externalUrl).href;
+}
+/**
+ * The identifier a client metadata document is published under.
+ *
+ * Derived from the server name rather than being it. The document is fetched by
+ * a third party and is therefore unauthenticated, and `/health` is behind bearer
+ * auth precisely so that the deployment's topology is not public — a document at
+ * `/…/paperless.json` would hand that back. Losing `cookieSecret` already
+ * invalidates every session and approval, so deriving from it costs nothing.
+ */
+export function clientDocumentId(serverName, secret) {
+    return sign(`upstream-client:${serverName}`, secret).slice(0, 22);
+}
+/** One document per upstream: two servers using `cimd` may want different
+ *  scopes, and a shared document would give the second one the first's. */
+export function clientMetadataUrl(externalUrl, serverName, secret) {
+    return new URL(`${UPSTREAM_CLIENT_METADATA_PREFIX}/${clientDocumentId(serverName, secret)}.json`, externalUrl).href;
+}
+/** The document the hub publishes about itself when an upstream supports CIMD,
+ *  and the body it sends when registering dynamically. Both are the same thing. */
+export function hubClientMetadata(identity, publicJwk) {
+    const interactive = identity.oauth.grant === 'authorization_code';
+    const usesKey = identity.oauth.clientAuth === 'private_key_jwt';
+    return {
+        client_name: `mcp-hub ${VERSION}`,
+        client_uri: identity.externalUrl,
+        // A client_credentials client has no redirect at all, and the SDK's own
+        // provider sets an empty array for exactly that case.
+        redirect_uris: interactive ? [callbackUrl(identity.externalUrl)] : [],
+        grant_types: interactive ? ['authorization_code', 'refresh_token'] : ['client_credentials'],
+        response_types: ['code'],
+        token_endpoint_auth_method: usesKey ? 'private_key_jwt' : identity.oauth.clientSecret ? 'client_secret_basic' : 'none',
+        // The upstream verifies our assertions against this, so it has to travel
+        // with the document and with the registration request.
+        ...(usesKey && publicJwk ? { jwks: { keys: [publicJwk] } } : {}),
+        ...(identity.oauth.scopes.length > 0 ? { scope: identity.oauth.scopes.join(' ') } : {})
+    };
+}
+/** RFC 7523 §2.2: assertions are single-use and short-lived. */
+const ASSERTION_LIFETIME_S = 300;
+export class UpstreamAuthProvider {
+    identity;
+    store;
+    options;
+    /** Captured rather than followed: this process has no browser, and the URL is
+     *  what `upstream login` prints for the operator. */
+    authorizationUrl;
+    /** The SDK hands the verifier over during startAuthorization; the caller
+     *  persists it alongside the login it is about to record. */
+    issuedCodeVerifier;
+    fingerprint;
+    constructor(identity, store, options = {}) {
+        this.identity = identity;
+        this.store = store;
+        this.options = options;
+        this.fingerprint = credentialFingerprint(identity);
+    }
+    get record() {
+        return this.store.getUpstreamCredentials(this.identity.serverName, this.fingerprint);
+    }
+    /** Merges into whatever is on disk right now, so a concurrent writer — the
+     *  admin CLI, or the hub itself — is not clobbered. */
+    patch(changes) {
+        const fingerprint = this.fingerprint;
+        this.store.updateUpstreamCredentials(this.identity.serverName, current => ({
+            // A record from a superseded configuration is replaced, not merged into.
+            ...(current?.fingerprint === fingerprint ? current : {}),
+            fingerprint,
+            obtainedAt: Math.floor(Date.now() / 1000),
+            ...changes
+        }));
+    }
+    // --- OAuthClientProvider -------------------------------------------------
+    get redirectUrl() {
+        // Undefined is the SDK's switch into the non-interactive flow.
+        return this.identity.oauth.grant === 'authorization_code' ? callbackUrl(this.identity.externalUrl) : undefined;
+    }
+    get clientMetadata() {
+        return hubClientMetadata(this.identity);
+    }
+    /** Only set for `mode: "cimd"`. The SDK uses it as the client_id, but only if
+     *  the upstream advertises support; otherwise it falls back to registering. */
+    get clientMetadataUrl() {
+        if (this.identity.oauth.mode !== 'cimd')
+            return undefined;
+        return clientMetadataUrl(this.identity.externalUrl, this.identity.serverName, this.store.cookieSecret);
+    }
+    clientInformation() {
+        // Configured credentials win: with them there is nothing to register, and
+        // the SDK skips both CIMD and dynamic registration.
+        if (this.identity.oauth.mode === 'static') {
+            return {
+                client_id: this.identity.oauth.clientId,
+                ...(this.identity.oauth.clientSecret ? { client_secret: this.identity.oauth.clientSecret } : {})
+            };
+        }
+        const record = this.record;
+        if (!record?.clientId)
+            return undefined;
+        return {
+            client_id: record.clientId,
+            ...(record.clientSecret ? { client_secret: record.clientSecret } : {})
+        };
+    }
+    saveClientInformation(information) {
+        this.patch({
+            clientId: information.client_id,
+            ...(typeof information.client_secret === 'string' ? { clientSecret: information.client_secret } : {}),
+            // RFC 7592 credentials, when the upstream issued them — what `upstream
+            // logout` needs to delete the registration again.
+            ...(typeof information.registration_access_token === 'string'
+                ? { registrationAccessToken: information.registration_access_token }
+                : {}),
+            ...(typeof information.registration_client_uri === 'string'
+                ? { registrationClientUri: information.registration_client_uri }
+                : {})
+        });
+    }
+    /**
+     * The access token, deliberately without the refresh token.
+     *
+     * That withholding is the point: the SDK refreshes reactively on any 401 and
+     * has no single-flight, so a burst of parallel requests would each spend the
+     * same rotating refresh token and an upstream that detects reuse would revoke
+     * the whole family. Refresh belongs to UpstreamAuth, which serializes it.
+     */
+    tokens() {
+        const stored = this.record?.tokens;
+        if (!stored)
+            return undefined;
+        const { refresh_token: _withheld, ...rest } = stored;
+        return rest;
+    }
+    /** The full pair, for the one caller that is allowed to spend it. */
+    storedTokens() {
+        return this.record?.tokens;
+    }
+    saveTokens(tokens) {
+        const expiresIn = typeof tokens.expires_in === 'number' ? tokens.expires_in : undefined;
+        this.patch({
+            tokens: tokens,
+            ...(expiresIn !== undefined ? { accessTokenValidUntil: Math.floor(Date.now() / 1000) + expiresIn } : {})
+        });
+    }
+    /** Never actually redirects: there is no user agent in this process. The URL
+     *  is handed to whoever started the login to print. */
+    redirectToAuthorization(authorizationUrl) {
+        this.authorizationUrl = authorizationUrl.href;
+    }
+    saveCodeVerifier(codeVerifier) {
+        // Kept in memory only. The caller stores it with the pending login, because
+        // the browser round-trip may finish in a different process.
+        this.issuedCodeVerifier = codeVerifier;
+    }
+    codeVerifier() {
+        const verifier = this.options.pendingCodeVerifier ?? this.issuedCodeVerifier;
+        if (!verifier)
+            throw new Error('no PKCE verifier for this login; start it again');
+        return verifier;
+    }
+    /** Client credentials for the non-interactive grant. Without this the SDK
+     *  would try an authorization-code exchange and fail for want of a code. */
+    prepareTokenRequest(scope) {
+        if (this.identity.oauth.grant !== 'client_credentials')
+            return undefined;
+        const params = new URLSearchParams({ grant_type: 'client_credentials' });
+        const requested = scope ?? this.identity.oauth.scopes.join(' ');
+        if (requested)
+            params.set('scope', requested);
+        return params;
+    }
+    /**
+     * The SDK's recovery path: on `invalid_grant` it clears tokens and retries, on
+     * `invalid_client` it clears everything. Without this a dead refresh token
+     * loops into the same failure and then throws.
+     */
+    invalidateCredentials(scope) {
+        if (scope === 'verifier') {
+            this.issuedCodeVerifier = undefined;
+            return;
+        }
+        if (scope === 'all') {
+            this.store.forgetUpstreamCredentials(this.identity.serverName);
+            return;
+        }
+        const record = this.record;
+        if (!record)
+            return;
+        const cleared = { ...record };
+        if (scope === 'tokens') {
+            delete cleared.tokens;
+            delete cleared.accessTokenValidUntil;
+        }
+        if (scope === 'client') {
+            delete cleared.clientId;
+            delete cleared.clientSecret;
+            delete cleared.registrationAccessToken;
+            delete cleared.registrationClientUri;
+        }
+        if (scope === 'discovery')
+            delete cleared.discovery;
+        this.store.updateUpstreamCredentials(this.identity.serverName, () => cleared);
+    }
+    /** The public half of the outbound signing key, for the document the upstream
+     *  fetches. */
+    async publicJwk() {
+        const jwk = await exportJWK(crypto.createPublicKey(this.store.upstreamPrivateKey));
+        return { ...jwk, use: 'sig', alg: 'EdDSA', kid: 'mcp-hub-upstream' };
+    }
+    /**
+     * RFC 7523 client authentication, replacing the SDK's built-in choice.
+     *
+     * The SDK picks between `client_secret_basic`, `client_secret_post` and
+     * `none`; it has no assertion path at all. Providing this hook takes the
+     * decision away from it entirely, which is also why the shared-secret cases
+     * fall through to doing nothing — the SDK's own logic is right for those.
+     */
+    addClientAuthentication = async (_headers, params, url) => {
+        if (this.identity.oauth.clientAuth !== 'private_key_jwt')
+            return;
+        const clientId = this.clientInformation()?.client_id;
+        if (!clientId)
+            throw new Error('cannot sign a client assertion before the client_id is known');
+        params.set('client_id', clientId);
+        params.set('client_assertion_type', 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer');
+        params.set('client_assertion', await this.signAssertion(clientId, String(url)));
+    };
+    async signAssertion(clientId, audience) {
+        return new SignJWT({})
+            .setProtectedHeader({ alg: 'EdDSA', kid: 'mcp-hub-upstream' })
+            .setIssuer(clientId)
+            .setSubject(clientId)
+            .setAudience(audience)
+            .setIssuedAt()
+            .setExpirationTime(`${ASSERTION_LIFETIME_S}s`)
+            .setJti(crypto.randomBytes(16).toString('base64url'))
+            .sign(this.store.upstreamPrivateKey);
+    }
+    saveDiscoveryState(state) {
+        this.patch({ discovery: state });
+    }
+    discoveryState() {
+        return this.record?.discovery;
+    }
+}
+//# sourceMappingURL=provider.js.map

package/dist/upstream/provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/upstream/provider.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAM1C,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC;;;;;;;;;;;;;;;GAeG;AAEH,+DAA+D;AAC/D,MAAM,CAAC,MAAM,sBAAsB,GAAG,mBAAmB,CAAC;AAC1D,4EAA4E;AAC5E,MAAM,CAAC,MAAM,+BAA+B,GAAG,4BAA4B,CAAC;AAW5E;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAA0B;IAC9D,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC;IAC3B,OAAO,MAAM;SACV,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CACL,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAChH;SACA,MAAM,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,WAAmB;IAC7C,OAAO,IAAI,GAAG,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC;AAC3D,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB,CAAC,UAAkB,EAAE,MAAc;IACjE,OAAO,IAAI,CAAC,mBAAmB,UAAU,EAAE,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACpE,CAAC;AAED;2EAC2E;AAC3E,MAAM,UAAU,iBAAiB,CAAC,WAAmB,EAAE,UAAkB,EAAE,MAAc;IACvF,OAAO,IAAI,GAAG,CAAC,GAAG,+BAA+B,IAAI,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC;AACtH,CAAC;AAED;mFACmF;AACnF,MAAM,UAAU,iBAAiB,CAAC,QAA0B,EAAE,SAAe;IAC3E,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,KAAK,oBAAoB,CAAC;IAClE,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,KAAK,iBAAiB,CAAC;IAChE,OAAO;QACL,WAAW,EAAE,WAAW,OAAO,EAAE;QACjC,UAAU,EAAE,QAAQ,CAAC,WAAW;QAChC,wEAAwE;QACxE,sDAAsD;QACtD,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QACrE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;QAC3F,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,0BAA0B,EAAE,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM;QACtH,yEAAyE;QACzE,uDAAuD;QACvD,GAAG,CAAC,OAAO,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxF,CAAC;AACJ,CAAC;AAED,gEAAgE;AAChE,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAOjC,MAAM,OAAO,oBAAoB;IAWpB,QAAQ;IACA,KAAK;IACL,OAAO;IAZ1B;yDACqD;IACrD,gBAAgB,CAAU;IAC1B;iEAC6D;IAC7D,kBAAkB,CAAU;IAEX,WAAW,CAAS;IAErC,YACW,QAA0B,EAClB,KAAgB,EAChB,OAAO,GAA4B,EAAE;wBAF7C,QAAQ;qBACA,KAAK;uBACL,OAAO;QAExB,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,IAAY,MAAM;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACvF,CAAC;IAED;2DACuD;IAC/C,KAAK,CAAC,OAAqC;QACjD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YACzE,yEAAyE;YACzE,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,WAAW;YACX,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YACzC,GAAG,OAAO;SACX,CAAC,CAAC,CAAC;IACN,CAAC;IAED,4EAA4E;IAE5E,IAAI,WAAW;QACb,+DAA+D;QAC/D,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,KAAK,oBAAoB,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjH,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED;mFAC+E;IAC/E,IAAI,iBAAiB;QACnB,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM;YAAE,OAAO,SAAS,CAAC;QAC1D,OAAO,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACzG,CAAC;IAED,iBAAiB;QACf,0EAA0E;QAC1E,oDAAoD;QACpD,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO;gBACL,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAS;gBACxC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjG,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,QAAQ;YAAE,OAAO,SAAS,CAAC;QACxC,OAAO;YACL,SAAS,EAAE,MAAM,CAAC,QAAQ;YAC1B,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvE,CAAC;IACJ,CAAC;IAED,qBAAqB,CAAC,WAA6D;QACjF,IAAI,CAAC,KAAK,CAAC;YACT,QAAQ,EAAE,WAAW,CAAC,SAAS;YAC/B,GAAG,CAAC,OAAO,WAAW,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,WAAW,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrG,uEAAuE;YACvE,kDAAkD;YAClD,GAAG,CAAC,OAAO,WAAW,CAAC,yBAAyB,KAAK,QAAQ;gBAC3D,CAAC,CAAC,EAAE,uBAAuB,EAAE,WAAW,CAAC,yBAAyB,EAAE;gBACpE,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,OAAO,WAAW,CAAC,uBAAuB,KAAK,QAAQ;gBACzD,CAAC,CAAC,EAAE,qBAAqB,EAAE,WAAW,CAAC,uBAAuB,EAAE;gBAChE,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACH,MAAM;QACJ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,MAAiC,CAAC;QAC9D,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;QACrD,OAAO,IAAmB,CAAC;IAC7B,CAAC;IAED,qEAAqE;IACrE,YAAY;QACV,OAAO,IAAI,CAAC,MAAM,EAAE,MAAiC,CAAC;IACxD,CAAC;IAED,UAAU,CAAC,MAAmB;QAC5B,MAAM,SAAS,GAAG,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,IAAI,CAAC,KAAK,CAAC;YACT,MAAM,EAAE,MAA4C;YACpD,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzG,CAAC,CAAC;IACL,CAAC;IAED;2DACuD;IACvD,uBAAuB,CAAC,gBAAqB;QAC3C,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC,IAAI,CAAC;IAChD,CAAC;IAED,gBAAgB,CAAC,YAAoB;QACnC,4EAA4E;QAC5E,4DAA4D;QAC5D,IAAI,CAAC,kBAAkB,GAAG,YAAY,CAAC;IACzC,CAAC;IAED,YAAY;QACV,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,IAAI,CAAC,kBAAkB,CAAC;QAC7E,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QAClF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;gFAC4E;IAC5E,mBAAmB,CAAC,KAAc;QAChC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,KAAK,oBAAoB;YAAE,OAAO,SAAS,CAAC;QACzE,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI,SAAS;YAAE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,KAA6D;QACjF,IAAI,KAAK,KAAK,UAAU,EAAE,CAAC;YACzB,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;YACpC,OAAO;QACT,CAAC;QACD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC/D,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,OAAO,GAAwB,EAAE,GAAG,MAAM,EAAE,CAAC;QACnD,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvB,OAAO,OAAO,CAAC,MAAM,CAAC;YACtB,OAAO,OAAO,CAAC,qBAAqB,CAAC;QACvC,CAAC;QACD,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvB,OAAO,OAAO,CAAC,QAAQ,CAAC;YACxB,OAAO,OAAO,CAAC,YAAY,CAAC;YAC5B,OAAO,OAAO,CAAC,uBAAuB,CAAC;YACvC,OAAO,OAAO,CAAC,qBAAqB,CAAC;QACvC,CAAC;QACD,IAAI,KAAK,KAAK,WAAW;YAAE,OAAO,OAAO,CAAC,SAAS,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED;mBACe;IACf,KAAK,CAAC,SAAS;QACb,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;QACnF,OAAO,EAAE,GAAG,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;IACvE,CAAC;IAED;;;;;;;OAOG;IACM,uBAAuB,GAAG,KAAK,EACtC,QAAiB,EACjB,MAAuB,EACvB,GAAiB,EACF,EAAE;QACjB,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,KAAK,iBAAiB;YAAE,OAAO;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,EAAE,SAAS,CAAC;QACrD,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAC/F,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,wDAAwD,CAAC,CAAC;QAC9F,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,QAAgB;QAC5D,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC;aACnB,kBAAkB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;aAC7D,SAAS,CAAC,QAAQ,CAAC;aACnB,UAAU,CAAC,QAAQ,CAAC;aACpB,WAAW,CAAC,QAAQ,CAAC;aACrB,WAAW,EAAE;aACb,iBAAiB,CAAC,GAAG,oBAAoB,GAAG,CAAC;aAC7C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;aACpD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACzC,CAAC;IAED,kBAAkB,CAAC,KAA0B;QAC3C,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,KAA2C,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,MAAM,EAAE,SAA4C,CAAC;IACnE,CAAC;CACF"}

package/dist/upstream/routes.js

@@ -0,0 +1,96 @@
+import { Router } from 'express';
+import { readSignedPayload } from '../auth/signed-token.js';
+import { renderPage, escapeHtml } from '../auth/page.js';
+import { logSafe } from '../auth/text.js';
+import { UPSTREAM_CALLBACK_PATH, UPSTREAM_CLIENT_METADATA_PREFIX, UpstreamAuthProvider, clientDocumentId, clientMetadataUrl, hubClientMetadata } from './provider.js';
+const page = (res, status, title, body) => {
+    res.status(status).type('html').send(renderPage(title, `<form><h1>${escapeHtml(title)}</h1><p>${escapeHtml(body)}</p></form>`));
+};
+export function createUpstreamRoutes(options) {
+    const { store, provider, registry, supervisor, watcher, externalUrl } = options;
+    const router = Router();
+    /**
+     * One document per upstream, addressed by a derived identifier.
+     *
+     * Registered unconditionally but answered conditionally: the config is
+     * hot-reloadable, so a server can become `cimd` long after boot, and an
+     * Express route cannot be added later.
+     */
+    router.get(`/${UPSTREAM_CLIENT_METADATA_PREFIX}/:id.json`, (req, res) => {
+        void (async () => {
+            const wanted = String(req.params.id);
+            for (const [name, server] of watcher.current) {
+                if (server.kind !== 'remote' || server.oauth?.mode !== 'cimd')
+                    continue;
+                if (clientDocumentId(name, store.cookieSecret) !== wanted)
+                    continue;
+                const identity = { serverName: name, serverUrl: server.url, oauth: server.oauth, externalUrl };
+                const provider = new UpstreamAuthProvider(identity, store);
+                // The document must name itself byte-for-byte or the upstream refuses it.
+                res.json({
+                    client_id: clientMetadataUrl(externalUrl, name, store.cookieSecret),
+                    ...hubClientMetadata(identity, server.oauth.clientAuth === 'private_key_jwt' ? await provider.publicJwk() : undefined)
+                });
+                return;
+            }
+            res.status(404).json({ error: 'not_found', error_description: 'No upstream publishes a document here' });
+        })();
+    });
+    router.get(`/${UPSTREAM_CALLBACK_PATH}`, (req, res) => {
+        void handleCallback(req.query, req.headers.cookie, res);
+    });
+    async function handleCallback(query, cookie, res) {
+        const state = typeof query.state === 'string' ? query.state : '';
+        const decoded = readSignedPayload(state, store.cookieSecret);
+        if (!decoded || decoded.exp < Date.now()) {
+            console.warn(`mcp-hub: upstream callback with an invalid or expired state`);
+            page(res, 400, 'Login expired', 'This authorization is no longer valid. Start it again with mcp-hub-admin upstream login.');
+            return;
+        }
+        // Proving the browser belongs to the operator, not just to whoever ended up
+        // holding the redirect. The session cookie rides along because the upstream
+        // sends a top-level navigation and the cookie is SameSite=Lax.
+        if (!provider.hasValidSession(cookie)) {
+            page(res, 401, 'Not signed in', 'Sign in to this hub in the same browser, then run the login again.');
+            return;
+        }
+        // Single use, and taken before the exchange so a refreshed browser tab
+        // cannot redeem the same code twice.
+        const login = store.takeUpstreamLogin(state);
+        if (!login || login.serverName !== decoded.n) {
+            page(res, 400, 'Login expired', 'This authorization was already used or has expired. Start it again.');
+            return;
+        }
+        if (typeof query.error === 'string') {
+            console.warn(`mcp-hub: upstream login for ${logSafe(login.serverName)} was declined: ${logSafe(query.error)}`);
+            page(res, 400, 'Authorization declined', `The upstream reported "${query.error}". Nothing was changed.`);
+            return;
+        }
+        const code = typeof query.code === 'string' ? query.code : '';
+        if (!code) {
+            page(res, 400, 'No authorization code', 'The upstream did not send a code. Start the login again.');
+            return;
+        }
+        const auth = registry.get(login.serverName);
+        if (!auth) {
+            page(res, 400, 'Unknown server', `"${login.serverName}" no longer has an OAuth configuration.`);
+            return;
+        }
+        try {
+            await auth.finishLogin(login, code);
+        }
+        catch (error) {
+            // Never the response body — an OAuth error can carry a token or an
+            // assertion. The reason goes to the log, the page says only that it failed.
+            console.error(`mcp-hub: upstream login for ${logSafe(login.serverName)} failed: ${logSafe(error.message)}`);
+            page(res, 400, 'Login failed', 'The upstream refused the exchange. The hub log has the reason.');
+            return;
+        }
+        console.log(`mcp-hub: upstream login for ${logSafe(login.serverName)} succeeded`);
+        // Bring the server back without waiting for it.
+        supervisor.get(login.serverName)?.reauthorize();
+        page(res, 200, 'Upstream authorized', `${login.serverName} is authorized. You can close this window.`);
+    }
+    return router;
+}
+//# sourceMappingURL=routes.js.map

package/dist/upstream/routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/upstream/routes.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@ni-c/mcp-hub",
-  "version": "0.9.2",
-  "description": "Serve multiple stdio MCP servers from one container: Claude-Code-style mcpServers config, path-based routing, hub meta-tools, and OAuth 2.1 + API tokens for ChatGPT, Claude and any Streamable-HTTP MCP client.",
+  "version": "0.10.0",
+  "description": "Serve multiple stdio MCP servers from one container: Claude-Code-style mcpServers config, path-based routing, hub meta-tools, and CIMD-first OAuth 2.1 + API tokens for ChatGPT, Claude and any Streamable-HTTP MCP client.",
   "keywords": [
     "mcp",
     "model-context-protocol",
     "gateway",
     "proxy",
     "oauth",
+    "oauth2.1",
+    "cimd",
     "claude"
   ],
   "type": "module",
@@ -21,6 +23,7 @@
     "url": "https://github.com/ni-c/mcp-hub/issues"
   },
   "homepage": "https://mcp-hub.ni-c.de",
+  "funding": "https://github.com/sponsors/ni-c",
   "engines": {
     "node": ">=22"
   },