@frontmcp/adapters 1.8.2 → 1.8.4

package/esm/skills/index.mjs

@@ -611,7 +611,13 @@ var npmSourceSchema = z2.object({
   exportName: z2.string().optional(),
   /**
    * Verify GitHub artifact attestation / npm provenance for the package before loading.
-   * Defaults to true. Set false (with warning) only for local development packages.
+   * Defaults to true. Provenance verification is not implemented yet, so `true` refuses
+   * to load the package; set `false` to load it without a provenance check.
+   *
+   * With `false`, the package is imported (its code runs) before the bundle is parsed, so
+   * bundle signing (`requireSignature` + `trustedKeys`) cannot protect the import itself.
+   * Only use it for a package you trust: pin its exact version in `package.json` and
+   * install from a lockfile with integrity hashes.
    */
   verifyProvenance: z2.boolean().default(true)
 });
@@ -619,11 +625,15 @@ var saasSourceSchema = z2.object({
   type: z2.literal("saas"),
   /** SaaS pull endpoint, e.g. `https://cloud.frontmcp.dev/v1/bundles/<bundleId>`. */
   endpoint: httpsUrl,
-  /** Pinned JWT issued by the SaaS for the customer's FrontMCP server. */
+  /**
+   * Pinned JWT issued by the SaaS for the customer's FrontMCP server. Verified
+   * before every pull: signed by a key in `jwksUrl`, `iss` = `expectedIssuer`,
+   * `aud` includes `expectedAudience`, not expired. A rejected token stops the pull.
+   */
   authToken: z2.string().min(1),
   /**
-   * RFC 8707 resource indicator the JWT must encode. The plugin verifies
-   * `resource` AND `aud` claims match this on every push/pull.
+   * RFC 8707 resource indicator the JWT must encode: its `aud` claim must include
+   * this value (and its `resource` claim too, when it has one).
    */
   expectedAudience: z2.string().min(1),
   /** Polling interval in ms (boot pull is always immediate). Default 300000 (5 min). */
@@ -633,9 +643,9 @@ var saasSourceSchema = z2.object({
    * updates synchronously. Default false in v1.2 (interval polling only).
    */
   enableWebhook: z2.boolean().default(false),
-  /** JWKS URL for verifying SaaS-issued tokens. */
+  /** JWKS URL for verifying SaaS-issued tokens (fetched without credentials, redirects refused). */
   jwksUrl: httpsUrl,
-  /** Expected issuer (`iss`) claim. */
+  /** Expected issuer (`iss`) claim of `authToken`. */
   expectedIssuer: z2.string().min(1)
 });
 var inlineSourceSchema = z2.object({
@@ -733,8 +743,8 @@ var NpmSource = class {
   }
   async loadBundleFromPackage() {
     if (this.options.verifyProvenance) {
-      this.logger.warn(
-        `[npm-source] verifyProvenance=true requested but provenance verification is not yet implemented in OSS (planned v1.2.x). Loading "${this.options.packageName}" without provenance check.`
+      throw new Error(
+        `npm source "${this.options.packageName}": verifyProvenance is true, but npm provenance verification is not implemented, so the package was not loaded. Set verifyProvenance: false to load it without a provenance check, only for a package you trust: importing it runs its code before any bundle signature is checked, so pin its exact version and install it from a lockfile with integrity hashes.`
       );
     }
     const mod = await this.dynamicImport(this.options.packageName);
@@ -769,9 +779,33 @@ var NpmSource = class {
 };
 
 // libs/adapters/src/skills/sources/saas-pull.source.ts
+import { JwksService } from "@frontmcp/auth";
 import { dirname, ensureDir, isRedirectResponse, pathResolve, readFile, writeFile } from "@frontmcp/utils";
 var DEFAULT_CACHE_DIR = ".frontmcp/skilled-openapi";
 var DEFAULT_PULL_TIMEOUT_MS = 3e4;
+var USER_AGENT = "frontmcp-skilled-openapi";
+var SaasPullTokenRejectedError = class extends Error {
+  constructor(reason) {
+    super(`[saas-source] pull token rejected: ${reason}`);
+    this.name = "SaasPullTokenRejectedError";
+  }
+};
+function claimValues(claim) {
+  if (Array.isArray(claim)) return claim;
+  return claim === void 0 ? [] : [claim];
+}
+var PUBLIC_KEY_MEMBERS = /* @__PURE__ */ new Map([
+  ["RSA", ["n", "e"]],
+  ["EC", ["crv", "x", "y"]],
+  ["OKP", ["crv", "x"]]
+]);
+function isUsableSigningKey(key) {
+  if (typeof key !== "object" || key === null) return false;
+  const jwk = key;
+  const members = typeof jwk["kty"] === "string" ? PUBLIC_KEY_MEMBERS.get(jwk["kty"]) : void 0;
+  if (!members || jwk["use"] !== void 0 && jwk["use"] !== "sig") return false;
+  return members.every((m) => typeof jwk[m] === "string" && jwk[m] !== "");
+}
 var SaasPullSource = class {
   constructor(options, cacheDir, logger, deps = {}) {
     this.options = options;
@@ -789,6 +823,7 @@ var SaasPullSource = class {
   pollHandle;
   inFlight = false;
   stopped = false;
+  jwksService = new JwksService({});
   async start() {
     if (this.stopped || this.inFlight) {
       this.schedulePoll();
@@ -801,6 +836,7 @@ var SaasPullSource = class {
         bundle = await this.fetchOnce();
         await this.persistCache(bundle);
       } catch (e) {
+        if (e instanceof SaasPullTokenRejectedError) throw e;
         this.logger.warn(
           `[saas-source] initial pull failed (${e.message}); attempting cached bundle fallback`
         );
@@ -872,7 +908,11 @@ var SaasPullSource = class {
       await this.persistCache(bundle);
       this.notify(bundle);
     } catch (e) {
-      this.logger.warn(`[saas-source] poll failed: ${e.message}`);
+      if (e instanceof SaasPullTokenRejectedError) {
+        this.logger.error(`[saas-source] poll refused: ${e.message}; keeping the current bundle`);
+      } else {
+        this.logger.warn(`[saas-source] poll failed: ${e.message}`);
+      }
     } finally {
       this.inFlight = false;
       this.schedulePoll();
@@ -893,11 +933,53 @@ var SaasPullSource = class {
       clearTimeout(timer);
     }
   }
+  /**
+   * Verify the pinned pull token against the issuer's JWKS, issuer and audience.
+   * Throws {@link SaasPullTokenRejectedError} when the token is refused, and a
+   * plain Error when the JWKS can't be fetched (an outage).
+   */
+  async verifyPullToken() {
+    const { jwksUrl, expectedIssuer, expectedAudience, authToken } = this.options;
+    const { status, body } = await this.httpGet(jwksUrl, { Accept: "application/json", "User-Agent": USER_AGENT });
+    if (status < 200 || status >= 300) {
+      throw new Error(`JWKS ${jwksUrl} responded ${status}`);
+    }
+    let jwks;
+    try {
+      jwks = JSON.parse(body);
+    } catch {
+      throw new Error(`JWKS ${jwksUrl} is not valid JSON`);
+    }
+    if (!jwks || !Array.isArray(jwks.keys) || jwks.keys.length === 0) {
+      throw new Error(`JWKS ${jwksUrl} has no keys`);
+    }
+    const signingKeys = jwks.keys.filter(isUsableSigningKey);
+    if (signingKeys.length === 0) {
+      throw new Error(`JWKS ${jwksUrl} has no usable signing keys`);
+    }
+    const verified = await this.jwksService.verifyTransparentToken(authToken, [
+      { id: "skilled-openapi-saas", issuerUrl: expectedIssuer, jwks: { keys: signingKeys } }
+    ]);
+    if (!verified.ok || !verified.payload) {
+      throw new SaasPullTokenRejectedError(
+        `not a valid token from issuer "${expectedIssuer}" signed by a key in ${jwksUrl} (${verified.error ?? "verification failed"})`
+      );
+    }
+    const payload = verified.payload;
+    if (!claimValues(payload["aud"]).includes(expectedAudience)) {
+      throw new SaasPullTokenRejectedError(`its "aud" claim does not include "${expectedAudience}"`);
+    }
+    const resource = claimValues(payload["resource"]);
+    if (resource.length > 0 && !resource.includes(expectedAudience)) {
+      throw new SaasPullTokenRejectedError(`its "resource" claim does not include "${expectedAudience}"`);
+    }
+  }
   async fetchOnce() {
+    await this.verifyPullToken();
     const { status, body } = await this.httpGet(this.options.endpoint, {
       Authorization: `Bearer ${this.options.authToken}`,
       Accept: "application/json, application/yaml",
-      "User-Agent": "frontmcp-skilled-openapi"
+      "User-Agent": USER_AGENT
     });
     if (status < 200 || status >= 300) {
       throw new Error(`pull responded ${status}`);
@@ -1521,13 +1603,13 @@ function verifyBundleSignature(bundle, trustedKeys, telemetry) {
 }
 
 // libs/adapters/src/skills/security/jwt-verifier.ts
-import { JwksService } from "@frontmcp/auth";
+import { JwksService as JwksService2 } from "@frontmcp/auth";
 var DEFAULT_REQUIRED_ROLES = ["frontmcp:cloud:push"];
 var BundlePushJwtVerifier = class {
   constructor(options, logger, jwks) {
     this.options = options;
     this.logger = logger;
-    this.jwks = jwks ?? new JwksService({});
+    this.jwks = jwks ?? new JwksService2({});
     this.providerRef = {
       id: "skilled-openapi-cloud-push",
       issuerUrl: options.expectedIssuer,