@stigmer/server 3.35.0 → 3.37.0

package/src/domain/workflow/steps.ts

@@ -354,10 +354,13 @@ export function newPopulateVersionHashStep(
  * duplicate row beats a failed apply.
  *
  * On archive failure the version hash is stripped from the workflow so a
- * set hash always resolves to an audit entry (the revert invariant);
- * persistOnRevert re-persists when this step runs AFTER the final persist
- * (the create path archives last so default_instance_id is captured; the
- * update path has a Persist step following that flushes the revert).
+ * set hash always resolves to an audit entry (the revert invariant); on
+ * tag-assignment failure the live tag is cleared so the head never
+ * advertises a tag the audit column cannot resolve (stigmer/stigmer#855).
+ * persistOnRevert flushes either revert to the stored row, for a chain in
+ * which no Persist step follows this one (the create path archives last so
+ * default_instance_id is captured; the update path has a Persist step
+ * following that flushes the revert itself).
  */
 export function newSaveVersionAuditStep(
   store: Store,
@@ -385,6 +388,27 @@ export function newSaveVersionAuditStep(
           ? ctx.apiResourceKind
           : ApiResourceKind.workflow;
 
+      // A revert changes the head after the chain's last write, so it
+      // reaches the stored row only through this re-persist. A failure here
+      // is logged, never a failed apply: the response is already consistent
+      // and the next apply rewrites the row.
+      const flushRevert = async (revert: string): Promise<void> => {
+        if (!persistOnRevert) {
+          return;
+        }
+        try {
+          await store.saveResource(kind, workflowId, WorkflowSchema, wf);
+        } catch (persistError) {
+          logger.error(`failed to re-persist workflow after ${revert}`, {
+            error:
+              persistError instanceof Error
+                ? persistError.message
+                : String(persistError),
+            workflowId,
+          });
+        }
+      };
+
       let alreadyArchived = false;
       try {
         await store.getAuditByHash(kind, workflowId, versionHash, WorkflowSchema);
@@ -428,20 +452,7 @@ export function newSaveVersionAuditStep(
             wf.metadata.version.id = "";
           }
           ctx.setNewState(wf);
-
-          if (persistOnRevert) {
-            try {
-              await store.saveResource(kind, workflowId, WorkflowSchema, wf);
-            } catch (persistError) {
-              logger.error("failed to re-persist workflow after reverting version hash", {
-                error:
-                  persistError instanceof Error
-                    ? persistError.message
-                    : String(persistError),
-                workflowId,
-              });
-            }
-          }
+          await flushRevert("reverting version hash");
           return;
         }
       }
@@ -468,6 +479,7 @@ export function newSaveVersionAuditStep(
           if (wf.metadata?.version !== undefined) {
             wf.metadata.version.tag = "";
             ctx.setNewState(wf);
+            await flushRevert("clearing its tag");
           }
         }
       }

package/src/extensions/__tests__/extension-composition.test.ts

@@ -8,7 +8,10 @@
  * services), and the registry-declared edition answers on getServerInfo.
  * Later entries add their own composed arms below: caller guards
  * (20260902.02), the require-authentication posture (20260904.02), the
- * O5 drivers, the O4 slots and hooks, the C2 tuple lifecycle.
+ * O5 drivers, the O4 slots and hooks, the C2 tuple lifecycle, and the
+ * organization directory's external-id lookup: scoped to the identity
+ * provider the request names, and answered only to a caller who may view
+ * that provider, with one NotFound for every miss.
  *
  * The empty-set arm — no extensions composed, wire behavior byte-identical
  * to before the parameter existed — is pinned where it belongs: the
@@ -43,6 +46,7 @@ import { ApiResourceKind } from "@stigmer/protos/ai/stigmer/commons/apiresource/
 import { ApiResourceVisibility } from "@stigmer/protos/ai/stigmer/commons/apiresource/enum_pb";
 import { ApiKeyCommandController } from "@stigmer/protos/ai/stigmer/iam/apikey/v1/command_pb";
 import { ApiKeyQueryController } from "@stigmer/protos/ai/stigmer/iam/apikey/v1/query_pb";
+import { IamPermission } from "@stigmer/protos/ai/stigmer/iam/v1/enum_pb";
 import {
   PlatformQueryController,
   ServerEdition,
@@ -62,6 +66,7 @@ import type { ComposedServer } from "../../boot/compose.js";
 import { createLogger } from "../../boot/logger.js";
 import { AUTHENTICATION_TOKEN_MISSING_MESSAGE } from "../../pipeline/interceptors/auth.js";
 import type { PipelineStep } from "../../pipeline/pipeline.js";
+import type { AuthzCheck } from "../authorizer.js";
 import type { GateSlotName } from "../gate-slots.js";
 import type { OrganizationDirectory } from "../organization-directory.js";
 import type {
@@ -73,6 +78,16 @@ import type {
 import type { AgentExecutionStatusTransition } from "../status-hooks.js";
 import type { ServerExtension } from "../registry.js";
 
+/** The refusal a call answered; a call that succeeds fails the case. */
+async function refusalOf(work: Promise<unknown>): Promise<ConnectError> {
+  try {
+    await work;
+  } catch (error) {
+    return ConnectError.from(error);
+  }
+  throw new Error("the call was admitted");
+}
+
 const BILLING_PROCEDURE =
   "/ai.stigmer.billing.v1.BillingQueryController/getBillingAccount";
 
@@ -1019,16 +1034,46 @@ describe("extension composition (C2 tuple lifecycle + organization directory)",
   // The directory answers are test-mutable so each case can stage its
   // own world without a second composed server.
   const myOrgIds: string[] = [];
+  // Providers by `org/slug` → id, and mappings by `providerId:externalId`:
+  // the directory scopes every lookup to the provider the request names.
+  const providers = new Map<string, string>([
+    ["c2seededorg/test-idp", "idp_viewable"],
+    ["c2seededorg/other-idp", "idp_other"],
+    ["c2seededorg/hidden-idp", "idp_hidden"],
+  ]);
   const externalOrgMap = new Map<string, string>();
   const fakeDirectory: OrganizationDirectory = {
     refusesEnumeration: true,
     listMyOrganizationIds: async () => [...myOrgIds],
-    getOrganizationIdByExternalOrgId: async (externalOrgId) =>
-      externalOrgMap.get(externalOrgId),
+    lookupExternalOrganization: async (ref, externalOrgId) => {
+      const providerId = providers.get(`${ref.org}/${ref.slug}`);
+      return providerId === undefined
+        ? { kind: "no-identity-provider" }
+        : {
+            kind: "resolved",
+            identityProviderId: providerId,
+            organizationId: externalOrgMap.get(`${providerId}:${externalOrgId}`),
+          };
+    },
   };
+  // Every check is allowed except viewing the providers named here, so the
+  // lookup's own authorization is the one refusal the suite can see.
+  const deniedProviders = new Set<string>(["idp_hidden"]);
+  const lookupChecks: AuthzCheck[] = [];
 
   const iamExtension: ServerExtension = {
     name: "fake-iam",
+    authorizer: {
+      authorize: (_caller, check) => {
+        if (check.resourceKind === ApiResourceKind.identity_provider) {
+          lookupChecks.push(check);
+          if (deniedProviders.has(check.resourceId)) {
+            return Promise.resolve({ kind: "deny", reason: "" });
+          }
+        }
+        return Promise.resolve({ kind: "allow" });
+      },
+    },
     drivers: {
       resourceAuthorizationLifecycle: fakeLifecycle,
       organizationDirectory: fakeDirectory,
@@ -1077,7 +1122,8 @@ describe("extension composition (C2 tuple lifecycle + organization directory)",
     expect(event.parentLinks).toEqual([]);
     expect(event.caller.identityId).not.toBe("");
     myOrgIds.push(org.metadata?.id ?? "");
-    externalOrgMap.set("ext-org-42", org.metadata?.id ?? "");
+    externalOrgMap.set("idp_viewable:ext-org-42", org.metadata?.id ?? "");
+    externalOrgMap.set("idp_hidden:ext-org-42", org.metadata?.id ?? "");
   });
 
   it("agent create fires creation events for the agent AND its in-process default instance", async () => {
@@ -1236,26 +1282,52 @@ describe("extension composition (C2 tuple lifecycle + organization directory)",
     expect(mine.entries.map((org) => org.metadata?.id)).toEqual(myOrgIds);
   });
 
-  it("getByExternalOrgId registers with the directory lookup and resolves the mapping", async () => {
+  it("getByExternalOrgId resolves a mapping under the named provider for a caller who may view it", async () => {
     const query = createClient(OrganizationQueryController, portTransport);
-    // identity_provider_ref is proto-required on the lookup message; the
-    // directory's resolution key is the (globally unique) external id.
-    const idpRef = { org: "c2seededorg", slug: "test-idp" };
+    lookupChecks.length = 0;
     const org = await query.getByExternalOrgId({
-      identityProviderRef: idpRef,
+      identityProviderRef: { org: "c2seededorg", slug: "test-idp" },
       externalOrgId: "ext-org-42",
     });
     expect(org.metadata?.id).toBe(myOrgIds[0]);
+    expect(lookupChecks).toEqual([
+      {
+        permission: IamPermission.can_view,
+        resourceKind: ApiResourceKind.identity_provider,
+        resourceId: "idp_viewable",
+      },
+    ]);
+  });
 
-    let missing: ConnectError | undefined;
-    try {
-      await query.getByExternalOrgId({
-        identityProviderRef: idpRef,
-        externalOrgId: "ext-org-unknown",
-      });
-    } catch (error) {
-      missing = ConnectError.from(error);
+  it("getByExternalOrgId refuses a caller who may not view the named provider, before saying whether a mapping exists", async () => {
+    const query = createClient(OrganizationQueryController, portTransport);
+    for (const externalOrgId of ["ext-org-42", "ext-org-unknown"]) {
+      const refused = await refusalOf(
+        query.getByExternalOrgId({
+          identityProviderRef: { org: "c2seededorg", slug: "hidden-idp" },
+          externalOrgId,
+        }),
+      );
+      expect(refused.code).toBe(Code.PermissionDenied);
+      expect(refused.rawMessage).toBe("unauthorized to view identity provider");
+    }
+  });
+
+  it("getByExternalOrgId answers one NotFound for an unknown provider, an unmapped id, and another provider's mapping", async () => {
+    const query = createClient(OrganizationQueryController, portTransport);
+    for (const [slug, externalOrgId] of [
+      ["no-such-idp", "ext-org-42"],
+      ["test-idp", "ext-org-unknown"],
+      ["other-idp", "ext-org-42"],
+    ] as const) {
+      const missing = await refusalOf(
+        query.getByExternalOrgId({
+          identityProviderRef: { org: "c2seededorg", slug },
+          externalOrgId,
+        }),
+      );
+      expect(missing.code).toBe(Code.NotFound);
+      expect(missing.rawMessage).toBe(`Organization not found: ${externalOrgId}`);
     }
-    expect(missing?.code).toBe(Code.NotFound);
   });
 });

package/src/extensions/organization-directory.ts

@@ -15,7 +15,11 @@
  *     and the built-in directory filter to what the caller may view.
  *   - `getByExternalOrgId` (capability `externalOrgLookup`): deliberately
  *     absent from the OSS partial registration (UNIMPLEMENTED by
- *     construction); the cloud resolves external IdP org ids.
+ *     construction); the cloud resolves external IdP org ids. The lookup
+ *     is scoped to the identity provider the request names: the directory
+ *     resolves that provider and the external id within it, and the
+ *     controller answers only a caller who may view the provider, so one
+ *     integrator's tenant ids never answer another's organizations.
  *
  * No directory composed = the trusted-local behavior, byte-identical; the
  * built-in directory (authorization/organization-directory.ts) composes
@@ -47,12 +51,34 @@ export interface OrganizationDirectory {
     caller: CallerIdentity,
   ): Promise<ReadonlyArray<string> | typeof ALL_ORGANIZATIONS>;
   /**
-   * Resolves an external IdP organization id to the org's resource id;
-   * undefined = no mapping. When this method is present, the controller
-   * registers `getByExternalOrgId` (its chain stays controller-owned);
-   * when absent, the RPC stays unregistered and answers UNIMPLEMENTED.
+   * Resolves the identity provider a lookup names, and the external IdP
+   * organization id within that provider alone. When this method is
+   * present, the controller registers `getByExternalOrgId` (its chain,
+   * the provider's authorization included, stays controller-owned); when
+   * absent, the RPC stays unregistered and answers UNIMPLEMENTED.
    */
-  getOrganizationIdByExternalOrgId?(
+  lookupExternalOrganization?(
+    identityProviderRef: IdentityProviderRef,
     externalOrgId: string,
-  ): Promise<string | undefined>;
+  ): Promise<ExternalOrganizationLookup>;
 }
+
+/** The identity provider a lookup names: its organization and its slug. */
+export interface IdentityProviderRef {
+  readonly org: string;
+  readonly slug: string;
+}
+
+/**
+ * What a directory found for a lookup: no such identity provider, or the
+ * provider's id with the organization its external id maps to under it
+ * (undefined = no mapping). The controller authorizes on the provider's
+ * id before it reveals whether a mapping exists.
+ */
+export type ExternalOrganizationLookup =
+  | { readonly kind: "no-identity-provider" }
+  | {
+      readonly kind: "resolved";
+      readonly identityProviderId: string;
+      readonly organizationId: string | undefined;
+    };

package/src/index.ts

@@ -116,7 +116,11 @@ export type {
   VisibilityTupleShape,
   ResolvedParentLink,
 } from "./extensions/resource-authorization.js";
-export type { OrganizationDirectory } from "./extensions/organization-directory.js";
+export type {
+  ExternalOrganizationLookup,
+  IdentityProviderRef,
+  OrganizationDirectory,
+} from "./extensions/organization-directory.js";
 export { ALL_ORGANIZATIONS } from "./extensions/organization-directory.js";
 // The license-status seam (drivers.licenseStatus): the provider an
 // Enterprise composition registers so getLicenseStatus answers from its

package/src/pipeline/steps/__tests__/guard-memory-capture.test.ts

@@ -7,8 +7,13 @@
  * the capability, the org-mismatch throw propagating untouched, and the
  * absent-capability posture staying byte-identical to the pre-seam gate
  * (trusted-local and OIDC callers admit; machine and
- * platform_client_id-carrying callers refuse).
+ * platform_client_id-carrying callers refuse). The claim counts only on a
+ * platform token (stigmer#1312): the refusing cases carry tokens signed by
+ * the envelope every Stigmer lane mints through, and another issuer's
+ * token carrying the same claim is admitted.
  */
+import { generateKeyPairSync } from "node:crypto";
+
 import { describe, expect, it } from "vitest";
 import { Code, ConnectError } from "@connectrpc/connect";
 import { create } from "@bufbuild/protobuf";
@@ -17,6 +22,9 @@ import { MemorySchema } from "@stigmer/protos/ai/stigmer/agentic/memory/v1/api_p
 import { ApiResourceKind } from "@stigmer/protos/ai/stigmer/commons/apiresource/apiresourcekind/api_resource_kind_pb";
 
 import type { CallerIdentity } from "../../../extensions/identity.js";
+import { signPlatformToken } from "../../../platformtoken/envelope.js";
+import { platformTokenKeyRingFromPem } from "../../../platformtoken/key-ring.js";
+import type { SigningPlatformTokenKeyRing } from "../../../platformtoken/key-ring.js";
 import type {
   MemoryCaptureDecision,
   RunnerCredentialProvider,
@@ -77,11 +85,40 @@ function providerWith(
   };
 }
 
+const { privateKey, publicKey } = generateKeyPairSync("rsa", {
+  modulusLength: 2048,
+});
+const built = platformTokenKeyRingFromPem({
+  privateKeyPem: privateKey.export({ format: "pem", type: "pkcs8" }).toString(),
+  publicKeyPems: [publicKey.export({ format: "pem", type: "spki" }).toString()],
+});
+if (built.signer === undefined) throw new Error("fixture ring must sign");
+const ring: SigningPlatformTokenKeyRing = { ...built, signer: built.signer };
+
+/** A platform token, signed as every Stigmer-minted lane signs it. */
+function mintedToken(claims: Record<string, string>): string {
+  return signPlatformToken(ring, { sub: "ida_minted", ...claims }).token;
+}
+
+/** Another issuer's JWT: the claims as given, never signed by the ring. */
 function jwtWith(payload: Record<string, unknown>): string {
-  const body = Buffer.from(JSON.stringify(payload)).toString("base64url");
-  return `header.${body}.signature`;
+  const segment = (value: object) =>
+    Buffer.from(JSON.stringify(value)).toString("base64url");
+  return `${segment({ alg: "RS256", typ: "JWT" })}.${segment(payload)}.signature`;
 }
 
+/** An OIDC login whose issuer happens to stamp a platform_client_id claim. */
+const FOREIGN_CLAIM_CALLER: CallerIdentity = {
+  identityId: "ida_oidc",
+  callerClass: "user",
+  issuer: "https://issuer.example",
+  rawToken: jwtWith({
+    iss: "https://issuer.example",
+    sub: "ida_oidc",
+    platform_client_id: "pc_1",
+  }),
+};
+
 async function rejectionOf(run: void | Promise<void>): Promise<unknown> {
   return Promise.resolve(run).then(
     () => {
@@ -172,13 +209,22 @@ describe("GuardMemoryCapture with the capability composed", () => {
       identityId: "ida_guest",
       callerClass: "guest",
       issuer: "stigmer",
-      rawToken: jwtWith({ platform_client_id: "pc_1" }),
+      rawToken: mintedToken({ platform_client_id: "pc_1" }),
     };
     await expect(step.execute(memoryCtx(minted))).rejects.toThrowError(
       MEMORY_CAPTURE_CALLER_MESSAGE,
     );
   });
 
+  it("no-opinion falls through: another issuer's platform_client_id claim is admitted", async () => {
+    // Both editions' capabilities answer no-opinion for a person, so this
+    // is the path an OIDC login takes in production.
+    const step = newGuardMemoryCaptureStep<typeof MemorySchema>(
+      providerWith(() => ({ verdict: "no-opinion" })),
+    );
+    await step.execute(memoryCtx(FOREIGN_CLAIM_CALLER));
+  });
+
   it("internal and in-process callers never consult the capability", async () => {
     const step = newGuardMemoryCaptureStep<typeof MemorySchema>(
       providerWith(() => {
@@ -220,12 +266,28 @@ describe("GuardMemoryCapture without the capability (the pre-seam gate)", () =>
       step.execute(
         memoryCtx({
           ...LOCAL_USER,
-          rawToken: jwtWith({ platform_client_id: "pc_1" }),
+          rawToken: mintedToken({ platform_client_id: "pc_1" }),
         }),
       ),
     ).rejects.toThrowError(MEMORY_CAPTURE_CALLER_MESSAGE);
   });
 
+  it("admits a platform_client_id claim on a token Stigmer did not issue", async () => {
+    const step = newGuardMemoryCaptureStep<typeof MemorySchema>(providerWith());
+    await step.execute(memoryCtx(FOREIGN_CLAIM_CALLER));
+  });
+
+  it("admits a platform token whose platform_client_id is empty", async () => {
+    const step = newGuardMemoryCaptureStep<typeof MemorySchema>(providerWith());
+    await step.execute(
+      memoryCtx({
+        ...LOCAL_USER,
+        issuer: "stigmer",
+        rawToken: mintedToken({ platform_client_id: "" }),
+      }),
+    );
+  });
+
   it("admits a runner-shaped caller — the recorded pre-fix posture", async () => {
     // With no capability composed the gate cannot classify runner
     // credentials — the single-user OSS posture admits them (the #564

package/src/pipeline/steps/guard-memory-capture.ts

@@ -14,7 +14,12 @@
  * every Stigmer-minted non-first-party credential carries the
  * `platform_client_id` claim (StigmerJwtIssuer stamps it on user, guest,
  * channel, and schedule tokens alike), so its presence IS the exclusion
- * the Java RequestCallerIdentity.isFirstPartyHumanOperator computes.
+ * the Java RequestCallerIdentity.isFirstPartyHumanOperator computes. The
+ * claim counts only on a platform token (`iss: "stigmer"`, read through
+ * decodeVerifiedPlatformTokenPayload as the PlatformClient origin guard
+ * reads it): a bearer another verifier claimed is some other issuer's,
+ * whatever claims it carries, and is never taken for a Stigmer-minted
+ * one (stigmer#1312).
  *
  * RUNNER credentials carry neither the machine class nor that claim —
  * their eligibility is EDITION POLICY, so the gate consults the composed
@@ -30,16 +35,21 @@
  * this gate's own logic applies). The capability throws its own
  * byte-pinned refusal for the org-mismatch arm. With no capability
  * composed the gate's logic is byte-identical to before the seam: OSS
- * trusted-local callers carry no token and OIDC console logins carry no
- * platform_client_id claim — the step admits both, so the single-user
- * posture is unchanged (proven by the rosters).
+ * trusted-local callers carry no token and OIDC console logins are not
+ * platform tokens — the step admits both, so the single-user posture is
+ * unchanged (proven by the rosters).
  */
 import type { DescMessage } from "@bufbuild/protobuf";
 import { Code, ConnectError } from "@connectrpc/connect";
 
+import { USER_TOKEN_CLAIMS } from "../../domain/platformclient/constants.js";
 import { isServerComposedRequest } from "../../extensions/identity.js";
 import type { PipelineStep } from "../pipeline.js";
 import type { RequestContext } from "../request-context.js";
+import {
+  decodeVerifiedPlatformTokenPayload,
+  stringClaim,
+} from "../../platformtoken/envelope.js";
 import type { RunnerCredentialProvider } from "../../runnerauth/runner-credential-provider.js";
 import { metadataOf } from "./shapes.js";
 
@@ -138,20 +148,15 @@ export function memoryCaptureCredentialOf<Desc extends DescMessage>(
   return undefined;
 }
 
+/**
+ * Whether the bearer is a platform token naming a PlatformClient. Anything
+ * that is not a platform token (no token, an API key, another issuer's
+ * JWT) is not one, whatever claims it carries.
+ */
 function carriesPlatformClientClaim(rawToken: string): boolean {
-  const segments = rawToken.split(".");
-  if (segments.length !== 3) {
-    return false; // not a JWT — the trusted-local no-token posture
-  }
-  try {
-    const payload = JSON.parse(
-      Buffer.from(segments[1], "base64url").toString("utf8"),
-    ) as { platform_client_id?: unknown };
-    return (
-      typeof payload.platform_client_id === "string" &&
-      payload.platform_client_id !== ""
-    );
-  } catch {
-    return false;
-  }
+  const payload = decodeVerifiedPlatformTokenPayload(rawToken);
+  return (
+    payload !== undefined &&
+    stringClaim(payload, USER_TOKEN_CLAIMS.platformClientId) !== undefined
+  );
 }