Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Preserve configured email sign-in admission (#1633)

Joshua France892f715512c8
diff --git a/src/api/routes/auth-broker.ts b/src/api/routes/auth-broker.ts
index 57078d393..7dc7a6ff9 100644
--- a/src/api/routes/auth-broker.ts
+++ b/src/api/routes/auth-broker.ts
@@ -58,11 +58,14 @@ async function emailAllowed(ctx: ApiCtx): Promise<void> {
if (!validEmail(email)) return sendJson(res, 400, { error: "bad_request", message: "email required" });
if (!deps.identity) return sendJson(res, 200, { allowed: false });
await deps.identity.refresh();
+ if (deps.identity.deactivationSource(email) === "manual") return sendJson(res, 200, { allowed: false });
const member = deps.identity.externalMember(email);
+ const configured =
+ deps.emailAuthPrincipals?.includes(email) ||
+ Boolean(deps.emailAuthDomain && email.endsWith(`@${deps.emailAuthDomain}`));
const allowed =
- member !== undefined && externalMemberActive(member) && deps.identity.classify(email).type === "internal";
- if (allowed) return sendJson(res, 200, { allowed: true, expiresAt: member.expiresAt });
- if (deps.identity.deactivationSource(email) === "manual") return sendJson(res, 200, { allowed: false });
+ deps.identity.classify(email).type === "internal" && (member ? externalMemberActive(member) : configured);
+ if (allowed) return sendJson(res, 200, { allowed: true, expiresAt: member?.expiresAt });
const grants = (await deps.acl?.list()) ?? [];
const deployments = await app.listDeployments();
const appOnly = deployments.some(
diff --git a/test/admin-external-users.test.ts b/test/admin-external-users.test.ts
index 29f3833f1..b99de12f4 100644
--- a/test/admin-external-users.test.ts
+++ b/test/admin-external-users.test.ts
@@ -13,7 +13,7 @@ import { createInsecureTestServer, createServer } from "../src/api/server.ts";
import { buildApp } from "../src/wiring.ts";
import { INVITE_EMAIL_NOT_CONFIGURED, renderInviteEmail, type InviteMailer } from "../src/admin/invite-email.ts";
import { adminStatusFromGrants } from "../src/admin/admin-service.ts";
-import { coreEmailAllowed } from "../plugins/chassis/src/external-members.ts";
+import { coreEmailAdmission, coreEmailAllowed } from "../plugins/chassis/src/external-members.ts";
import { mintCapabilityToken, CAPABILITY_TTL_MS, CONTROL_PLANE_AUD } from "../src/auth/capability-token.ts";
import { scopeId, type TurnRequest } from "../src/types.ts";
import { testConfig } from "./support/test-config.ts";
@@ -96,6 +96,33 @@ const capFor = (actorId: string) =>
SECRET,
);
+test("broker admission preserves configured email members without external invitations", async (t) => {
+ const s = start({ signed: true, emailAuthDomain: "corp.example", emailAuthPrincipals: ["[email protected]"] });
+ t.after(s.close);
+ for (const email of ["[email protected]", "[email protected]"]) {
+ assert.equal(s.built.identity.externalMember(email), undefined);
+ assert.deepEqual(await coreEmailAdmission(s.base, SECRET, email), { allowed: true });
+ }
+ for (const email of ["[email protected]", "[email protected]", "[email protected]"]) {
+ assert.deepEqual(await coreEmailAdmission(s.base, SECRET, email), { allowed: false });
+ }
+ await s.built.identity.deactivate("[email protected]");
+ assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
+ s.built.config.setInternalMemberOverrides(["[email protected]"]);
+ assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
+ await s.built.identity.putExternalMember({
+ email: "[email protected]",
+ role: "member",
+ expiresAt: Date.now() - 1,
+ invitedBy: ALICE,
+ createdAt: Date.now() - DAY_MS,
+ updatedAt: Date.now(),
+ });
+ assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
+ s.built.config.setInternalMemberOverrides(["[email protected]"]);
+ assert.deepEqual(await coreEmailAdmission(s.base, SECRET, "[email protected]"), { allowed: false });
+});
+
test("inviting an external user stores the record, lists it as active, audits, and reports the missing mailer", async () => {
const s = start();
try {