Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

fix(admin): restore internal member override editor (#1089)

Joshua France4eb6537bab50
diff --git a/docs/images/admin-internal-member-overrides.png b/docs/images/admin-internal-member-overrides.png
new file mode 100644
index 000000000..0e41bdec5
Binary files /dev/null and b/docs/images/admin-internal-member-overrides.png differ
diff --git a/plugins/admin/public/index.html b/plugins/admin/public/index.html
index 0294be09e..949916489 100644
--- a/plugins/admin/public/index.html
+++ b/plugins/admin/public/index.html
@@ -5590,6 +5590,33 @@
><span class="status" id="st-external-slack-participants"></span>
</div>
</section>
+ <section class="card sv-governance setting-row hidden" id="card-internal-member-overrides">
+ <div class="head">
+ <h2 id="internal-member-overrides-title">Internal member overrides</h2>
+ <p id="internal-member-overrides-help">
+ Treat listed Slack users as internal members, including guests and people missing from the
+ directory. This grants internal-member access, not just permission to mention the agent. Rooms
+ containing only internal members may use organization credentials. Add only trusted colleagues.
+ Enter one Slack user ID or Slack-profile email per line (commas also accepted).
+ </p>
+ </div>
+ <div class="body">
+ <textarea
+ id="internal-member-overrides"
+ rows="4"
+ aria-labelledby="internal-member-overrides-title"
+ aria-describedby="internal-member-overrides-help internal-member-overrides-count"
+ spellcheck="false"
+ placeholder="[email protected]&#10;U0123ABCDE"
+ style="width: 100%; max-width: 560px; font-family: var(--mono, monospace)"
+ ></textarea>
+ <small class="muted" id="internal-member-overrides-count"></small>
+ </div>
+ <div class="foot">
+ <button class="primary" data-save="internal-member-overrides">Apply</button
+ ><span class="status" id="st-internal-member-overrides"></span>
+ </div>
+ </section>
<section class="card sv-customize setting-row hidden" id="card-org-ambient">
<div class="head">
<h2>Ambient behavior</h2>
@@ -6345,6 +6372,7 @@
$("card-sharing-posture"),
governanceAmbient,
$("card-external-slack"),
+ $("card-internal-member-overrides"),
$("card-command-policy"),
$("card-egress"),
].forEach((card) => content.appendChild(card));
@@ -8011,6 +8039,15 @@
.querySelectorAll('[data-checkbox-for="external-slack-participants"]')
.forEach((input) => (input.checked = input.value === (r.data.externalSlackParticipants ? "on" : "off")));
}
+ const showInternalOverrides = scope.startsWith("org:") && "internalMemberOverrides" in r.data;
+ $("card-internal-member-overrides").classList.toggle("hidden", !showInternalOverrides);
+ if (showInternalOverrides) {
+ const members = Array.isArray(r.data.internalMemberOverrides) ? r.data.internalMemberOverrides : [];
+ $("internal-member-overrides").value = members.join("\n");
+ $("internal-member-overrides-count").textContent = members.length
+ ? members.length + " override" + (members.length === 1 ? "" : "s")
+ : "No overrides configured.";
+ }
const showOrgAmbient = scope.startsWith("org:") && "orgAmbient" in r.data;
$("card-org-ambient").classList.toggle("hidden", !showOrgAmbient);
$("card-governance-org-ambient").classList.toggle("hidden", !showOrgAmbient);
@@ -10632,6 +10669,16 @@
"ambient-policy": () => collectAmbientPolicy(),
egress: () => collectEgress(),
"external-slack-participants": () => ({ on: $("external-slack-participants").checked }),
+ "internal-member-overrides": () => ({
+ members: [
+ ...new Set(
+ $("internal-member-overrides")
+ .value.split(/[\n,]/)
+ .map((m) => m.trim().toLowerCase())
+ .filter(Boolean),
+ ),
+ ],
+ }),
"org-ambient": () => ({ on: $("org-ambient").checked }),
"channel-header-pin-default": () => ({ on: $("channel-header-pin-default").checked }),
runtime: () => ({
@@ -10662,6 +10709,7 @@
"ambient-policy": "st-ambient-policy",
egress: "st-egress",
"external-slack-participants": "st-external-slack-participants",
+ "internal-member-overrides": "st-internal-member-overrides",
"org-ambient": "st-org-ambient",
"channel-header-pin-default": "st-channel-header-pin-default",
runtime: "st-runtime",
@@ -10672,6 +10720,7 @@
branding: "st-branding",
};
const SAVE_RELOADS = new Set([
+ "internal-member-overrides",
"auto-flagger",
"soul",
"external-slack-participants",
@@ -10797,6 +10846,32 @@
danger: !!body.on,
});
}
+ if (key === "internal-member-overrides") {
+ const norm = (list) => [
+ ...new Set((Array.isArray(list) ? list : []).map((m) => String(m).trim().toLowerCase()).filter(Boolean)),
+ ];
+ const before = norm(JSON.parse(sectionSnapshots.get(key) || "{}").members);
+ const after = norm(body.members);
+ const added = after.filter((m) => !before.includes(m));
+ const removed = before.filter((m) => !after.includes(m));
+ if (!added.length && !removed.length) return Promise.resolve(true);
+ const show = (list) => (list.length ? list.join(", ") : "none");
+ return reviewGovernanceChange({
+ title: "Change internal member overrides?",
+ subtitle: "These users count as internal members throughout the organization, not just for mentions.",
+ facts: [
+ ["Scope", governanceScopeName()],
+ ["Adding", show(added)],
+ ["Removing", show(removed)],
+ ["Total after", String(after.length)],
+ ],
+ warning: added.length
+ ? "These users receive internal-member access. Rooms containing only internal members may use organization credentials, and replies are visible to everyone there. Only add trusted colleagues."
+ : "Removed users without another source of internal membership return to external treatment after the directory refreshes.",
+ confirmLabel: "Apply overrides",
+ danger: added.length > 0,
+ });
+ }
return Promise.resolve(true);
}
function renderSharingPosture(data) {
diff --git a/plugins/admin/test/internal-member-overrides.test.ts b/plugins/admin/test/internal-member-overrides.test.ts
index 01a3e1523..a5f835360 100644
--- a/plugins/admin/test/internal-member-overrides.test.ts
+++ b/plugins/admin/test/internal-member-overrides.test.ts
@@ -1,8 +1,197 @@
import test from "node:test";
import assert from "node:assert/strict";
import { readFileSync } from "node:fs";
+import vm from "node:vm";
+import { createServer, type IncomingMessage } from "node:http";
+import type { AddressInfo } from "node:net";
-test("the org page does not expose internal member overrides", () => {
+const calls: { method: string; url: string; body: string; actor: string | null; signed: boolean }[] = [];
+const core = createServer((req: IncomingMessage, res) => {
+ let body = "";
+ req.on("data", (c) => (body += c));
+ req.on("end", () => {
+ calls.push({
+ method: req.method ?? "",
+ url: req.url ?? "",
+ body,
+ actor: (req.headers["x-admin-actor"] as string) ?? null,
+ signed: Boolean(req.headers["x-timestamp"] && req.headers["x-signature"]),
+ });
+ const denied = req.headers["x-admin-actor"] === "U-member@acme";
+ res.writeHead(denied ? 403 : 200, { "content-type": "application/json" });
+ res.end(JSON.stringify(denied ? { error: "admin_required" } : { ok: true }));
+ });
+});
+await new Promise<void>((r) => core.listen(0, r));
+process.env.CORE_API_URL = `http://localhost:${(core.address() as AddressInfo).port}`;
+process.env.CORE_SIGNING_SECRET = "admin-overrides-proxy-secret";
+
+const { server } = await import("../src/index.ts");
+await new Promise<void>((r) => server.listen(0, r));
+const base = `http://localhost:${(server.address() as AddressInfo).port}`;
+test.after(() => {
+ server.close();
+ core.close();
+});
+
+test("the org page ships an Internal member overrides card wired to the save machinery", () => {
const shell = readFileSync(new URL("../public/index.html", import.meta.url), "utf8");
- assert.doesNotMatch(shell, /internal-member-overrides/);
+ assert.match(shell, /id="card-internal-member-overrides"/, "card exists");
+ assert.match(shell, /<textarea[^>]*id="internal-member-overrides"/, "one-per-line textarea");
+ assert.match(shell, /data-save="internal-member-overrides"/, "save button keyed to the core resource id");
+ assert.match(shell, /"internalMemberOverrides" in r\.data/, "shown only when the org scope carries the key");
+ assert.match(shell, /"internal-member-overrides": "st-internal-member-overrides"/, "status target registered");
+ assert.match(shell, /key === "internal-member-overrides"/, "changes go through the governance review dialog");
+});
+
+test("PUT /api/scopes/org:acme/internal-member-overrides forwards the members body to core", async () => {
+ const r = await fetch(`${base}/api/scopes/${encodeURIComponent("org:acme")}/internal-member-overrides`, {
+ method: "PUT",
+ headers: { cookie: "admin=U-admin", "content-type": "application/json" },
+ body: JSON.stringify({ members: ["[email protected]", "U123ABC"] }),
+ });
+ assert.equal(r.status, 200);
+ const c = calls.at(-1)!;
+ assert.equal(c.actor, "U-admin@acme");
+ assert.equal(c.signed, true);
+ assert.equal(c.method, "PUT");
+ assert.equal(c.url, "/v1/admin/scopes/org%3Aacme/internal-member-overrides");
+ assert.deepEqual(JSON.parse(c.body), { members: ["[email protected]", "U123ABC"] });
+});
+
+const shell = readFileSync(new URL("../public/index.html", import.meta.url), "utf8");
+function slice(from: string, to: string) {
+ const start = shell.indexOf(from);
+ const end = shell.indexOf(to, start);
+ assert.ok(start >= 0 && end > start, `could not extract ${from}`);
+ return shell.slice(start, end);
+}
+
+test("signed-out writes never reach core; core admin denials are preserved", async () => {
+ const url = `${base}/api/scopes/org%3Aacme/internal-member-overrides`;
+ const count = calls.length;
+ const signedOut = await fetch(url, { method: "PUT", body: JSON.stringify({ members: [] }) });
+ assert.equal(signedOut.status, 401);
+ assert.equal(calls.length, count);
+ const denied = await fetch(url, {
+ method: "PUT",
+ headers: { cookie: "admin=U-member", "content-type": "application/json" },
+ body: JSON.stringify({ members: [] }),
+ });
+ assert.equal(denied.status, 403);
+ assert.deepEqual(await denied.json(), { error: "admin_required" });
+});
+
+test("the proxy supports clearing the entire override list", async () => {
+ const response = await fetch(`${base}/api/scopes/org%3Aacme/internal-member-overrides`, {
+ method: "PUT",
+ headers: { cookie: "admin=U-admin", "content-type": "application/json" },
+ body: JSON.stringify({ members: [] }),
+ });
+ assert.equal(response.status, 200);
+ assert.deepEqual(JSON.parse(calls.at(-1)!.body), { members: [] });
+});
+
+test("editor is visible only for org payloads that support overrides", () => {
+ for (const [scope, data, hidden, value, count] of [
+ ["org:acme", { internalMemberOverrides: [] }, false, "", "No overrides configured."],
+ ["org:acme", { internalMemberOverrides: ["u123abc"] }, false, "u123abc", "1 override"],
+ [
+ "org:acme",
+ { internalMemberOverrides: ["u123abc", "[email protected]"] },
+ false,
+ "u123abc\[email protected]",
+ "2 overrides",
+ ],
+ ["org:acme", {}, true, "", ""],
+ ["personal:demo", { internalMemberOverrides: ["u123abc"] }, true, "", ""],
+ ["channel:test", { internalMemberOverrides: [] }, true, "", ""],
+ ] as const) {
+ let actualHidden: boolean | undefined;
+ const input = { value: "" };
+ const label = { textContent: "" };
+ vm.runInNewContext(slice(" const showInternalOverrides =", " const showOrgAmbient ="), {
+ scope,
+ r: { data },
+ $: (id: string) => {
+ if (id === "internal-member-overrides") return input;
+ if (id.endsWith("-count")) return label;
+ return {
+ classList: {
+ toggle: (_name: string, on: boolean) => {
+ actualHidden = on;
+ },
+ },
+ };
+ },
+ });
+ assert.equal(actualHidden, hidden);
+ assert.equal(input.value, value);
+ assert.equal(label.textContent, count);
+ }
+});
+
+test("collector trims, lowercases, deduplicates and supports clearing", () => {
+ const collector = slice(' "internal-member-overrides": () =>', ' "org-ambient": () =>');
+ for (const [value, expected] of [
+ [" [email protected] , U123ABC\r\[email protected]\n", ["[email protected]", "u123abc"]],
+ [" ,\n ", []],
+ ] as const) {
+ const body = vm.runInNewContext(`({${collector}})["internal-member-overrides"]()`, { $: () => ({ value }) });
+ assert.deepEqual(JSON.parse(JSON.stringify(body)), { members: expected });
+ }
+});
+
+test("confirmation shows added/removed members, unique total, and returns the user's decision", async () => {
+ const review = slice(" function governanceSaveReview(", " function renderSharingPosture(");
+ for (const accepted of [false, true]) {
+ let shown: { facts: [string, string][]; warning: string; danger: boolean } | undefined;
+ const result = await vm.runInNewContext(
+ review + '\ngovernanceSaveReview("internal-member-overrides", {members:["[email protected]", "[email protected]"]})',
+ {
+ sectionSnapshots: new Map([["internal-member-overrides", JSON.stringify({ members: ["[email protected]"] })]]),
+ governanceScopeName: () => "Acme",
+ reviewGovernanceChange: (options: typeof shown) => {
+ shown = options;
+ return Promise.resolve(accepted);
+ },
+ },
+ );
+ assert.equal(result, accepted);
+ assert.ok(shown);
+ assert.deepEqual(JSON.parse(JSON.stringify(shown.facts)), [
+ ["Scope", "Acme"],
+ ["Adding", "[email protected]"],
+ ["Removing", "[email protected]"],
+ ["Total after", "1"],
+ ]);
+ assert.equal(shown.danger, true);
+ assert.match(shown.warning, /internal-member access/);
+ }
+});
+
+test("clearing reviews removals, while a normalized unchanged list needs no review", async () => {
+ const review = slice(" function governanceSaveReview(", " function renderSharingPosture(");
+ let reviews = 0;
+ const context = vm.createContext({
+ sectionSnapshots: new Map([["internal-member-overrides", JSON.stringify({ members: ["[email protected]"] })]]),
+ governanceScopeName: () => "Acme",
+ reviewGovernanceChange: (options: { danger: boolean; facts: [string, string][] }) => {
+ reviews++;
+ assert.equal(options.danger, false);
+ assert.equal(options.facts.find(([key]) => key === "Total after")?.[1], "0");
+ return Promise.resolve(true);
+ },
+ });
+ vm.runInContext(review, context);
+ assert.equal(
+ await vm.runInContext(
+ 'governanceSaveReview("internal-member-overrides", {members:[" [email protected] "]})',
+ context,
+ ),
+ true,
+ );
+ assert.equal(reviews, 0);
+ assert.equal(await vm.runInContext('governanceSaveReview("internal-member-overrides", {members:[]})', context), true);
+ assert.equal(reviews, 1);
});