authoravatarclover caruso<git@paperclover.net>2026-10-23 18:18:08-07:00
committeravatarclover caruso<git@paperclover.net>2026-10-24 19:01:23-07:00
log69ba225c6c6854475eff976b11d59f97cea15983
tree20093f0c9ec070665a418d4528c97cc0bc092468
parent608212cba743fa289f7d666112d5a4fc6e5b4fa9
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Show VM login username and a hidden-by-default password

The VM Password menu becomes Login, with copyable username and a password revealed on request. CopyField moves to the shared Copy component, and previews attached to a computer may read that VM's access. Assisted-by: claude-opus-5.5

10 files changed, 82 insertions(+), 51 deletions(-)

dashboard/web/components/Copy.css created+25
...@@ -0,0 +1,25 @@
1.copy-field > .copy, .copy-field.masked {
2 display: flex;
3 align-items: center;
4 gap: 10px;
5 width: 100%;
6 min-height: 34px;
7 padding: 6px 10px;
8 border: 2px solid var(--line);
9 border-radius: var(--radius);
10 background: var(--well);
11 color: var(--text);
12 font: 12.5px/1.45 var(--mono);
13 text-align: left;
14 white-space: normal;
15 cursor: copy;
16 transition: border-color 150ms, background-color 150ms;
17}
18.copy-field { flex: 1; min-width: 0; }
19.copy-field .value { flex: 1; min-width: 0; overflow-wrap: anywhere; }
20.copy-field .icon { flex: none; color: var(--muted); transition: color 150ms; }
21.copy-field > .copy:hover { border-color: var(--axis); background: var(--accent-wash); }
22.copy-field > .copy:hover .icon { color: var(--accent); }
23.copy-field.masked { box-sizing: border-box; cursor: default; color: var(--muted); letter-spacing: 0.1em; overflow: hidden; }
24.copy-field.masked .value { overflow-wrap: normal; white-space: nowrap; }
25
dashboard/web/components/Copy.tsx+7-1
...@@ -1,4 +1,10 @@...@@ -1,4 +1,10 @@
1import { createSignal, type JSX } from "solid-js";1import { createSignal, type JSX } from "solid-js";
2import CopyIcon from "lucide-solid/icons/copy";
3import "./Copy.css";
4
5export function CopyField(props: { value: string; label: string }) {
6 return <div class="copy-field"><Copy value={props.value} label={props.label}><span class="value">{props.value}</span><CopyIcon size={14} class="icon" aria-hidden="true" /></Copy></div>;
7}
28
3/**9/**
4 * Text that copies `value` on click; the tooltip turns into the result. Shows `value` unless given children, and10 * Text that copies `value` on click; the tooltip turns into the result. Shows `value` unless given children, and
...@@ -12,7 +18,7 @@ export function Copy(props: { value: string; label?: string; children?: JSX.Elem...@@ -12,7 +18,7 @@ export function Copy(props: { value: string; label?: string; children?: JSX.Elem
12 .then(() => setResult("copied"), () => setResult("Couldn't copy. Select the text instead"));18 .then(() => setResult("copied"), () => setResult("Couldn't copy. Select the text instead"));
13 return (19 return (
14 <>20 <>
15 <button type="button" class="copy" data-tip={result() || (props.label ? `copy ${props.label}` : "copy")} onClick={copy}21 <button type="button" class="copy" aria-label={props.label ? `Copy ${props.label}` : undefined} aria-description={props.label ? props.value : undefined} data-tip={result() || (props.label ? `copy ${props.label}` : "copy")} onClick={copy}
16 onPointerLeave={() => setResult("")} onBlur={() => setResult("")}>22 onPointerLeave={() => setResult("")} onBlur={() => setResult("")}>
17 {props.children ?? props.value}23 {props.children ?? props.value}
18 </button>24 </button>
dashboard/web/components/VMMenu.tsx+4-3
...@@ -1,14 +1,14 @@...@@ -1,14 +1,14 @@
1import { type JSX, onCleanup, onMount } from "solid-js";1import { type JSX, onCleanup, onMount } from "solid-js";
2import ChevronDown from "lucide-solid/icons/chevron-down";2import ChevronDown from "lucide-solid/icons/chevron-down";
33
4export function VMMenu(props: { label: string; children: JSX.Element }) {4export function VMMenu(props: { label: string; children: JSX.Element; onClose?: () => void }) {
5 let menu!: HTMLDetailsElement;5 let menu!: HTMLDetailsElement;
6 const outside = (event: PointerEvent) => {6 const outside = (event: PointerEvent) => {
7 if (event.target instanceof Node && !menu.contains(event.target)) menu.open = false;7 if (event.target instanceof Node && !menu.contains(event.target)) menu.open = false;
8 };8 };
9 onMount(() => document.addEventListener("pointerdown", outside));9 onMount(() => document.addEventListener("pointerdown", outside));
10 onCleanup(() => document.removeEventListener("pointerdown", outside));10 onCleanup(() => document.removeEventListener("pointerdown", outside));
11 return <details ref={menu} class="vm-menu" name="vm-actions" onKeyDown={(event) => {11 return <details ref={menu} class="vm-menu" name="vm-actions" onToggle={() => { if (!menu.open) props.onClose?.(); }} onKeyDown={(event) => {
12 if (event.key === "Escape") {12 if (event.key === "Escape") {
13 menu.open = false;13 menu.open = false;
14 menu.querySelector("summary")?.focus();14 menu.querySelector("summary")?.focus();
...@@ -17,7 +17,8 @@ export function VMMenu(props: { label: string; children: JSX.Element }) {...@@ -17,7 +17,8 @@ export function VMMenu(props: { label: string; children: JSX.Element }) {
17 }}>17 }}>
18 <summary>{props.label}<ChevronDown size={12} aria-hidden="true" /></summary>18 <summary>{props.label}<ChevronDown size={12} aria-hidden="true" /></summary>
19 <div role="group" aria-label={`${props.label} actions`} onClick={(event) => {19 <div role="group" aria-label={`${props.label} actions`} onClick={(event) => {
20 if (event.target instanceof HTMLElement && event.target.closest("button")) menu.open = false;20 const button = event.target instanceof Element ? event.target.closest("button") : null;
21 if (button?.parentElement === event.currentTarget) menu.open = false;
21 }}>{props.children}</div>22 }}>{props.children}</div>
22 </details>;23 </details>;
23}24}
dashboard/web/pages/AI.tsx+2-7
...@@ -1,19 +1,14 @@...@@ -1,19 +1,14 @@
1import { parseResponse } from "hono/client";1import { parseResponse } from "hono/client";
2import CopyIcon from "lucide-solid/icons/copy";
3import Download from "lucide-solid/icons/download";2import Download from "lucide-solid/icons/download";
4import EyeOff from "lucide-solid/icons/eye-off";3import EyeOff from "lucide-solid/icons/eye-off";
5import KeyRound from "lucide-solid/icons/key-round";4import KeyRound from "lucide-solid/icons/key-round";
6import { createResource, createSignal, For, Show } from "solid-js";5import { createResource, createSignal, For, Show } from "solid-js";
7import { api, reason } from "../api.ts";6import { api, reason } from "../api.ts";
8import { Copy } from "../components/Copy.tsx";7import { CopyField } from "../components/Copy.tsx";
9import { Loaded } from "../components/Loaded.tsx";8import { Loaded } from "../components/Loaded.tsx";
10import claude from "../../src/claude.svg?raw";9import claude from "../../src/claude.svg?raw";
11import openai from "../../src/openai.svg?raw";10import openai from "../../src/openai.svg?raw";
1211
13export function CopyField(props: { value: string; label: string }) {
14 return <div class="mcp-field"><Copy value={props.value} label={props.label}><span class="value">{props.value}</span><CopyIcon size={14} class="icon" /></Copy></div>;
15}
16
17export function ClientMark(props: { name: string }) {12export function ClientMark(props: { name: string }) {
18 const logo = () => /claude/i.test(props.name) ? claude : /codex|openai|chatgpt/i.test(props.name) ? openai : "";13 const logo = () => /claude/i.test(props.name) ? claude : /codex|openai|chatgpt/i.test(props.name) ? openai : "";
19 return <span class="mcp-client-mark" aria-hidden="true">14 return <span class="mcp-client-mark" aria-hidden="true">
...@@ -39,7 +34,7 @@ export function AI(props: { viewing: boolean }) {...@@ -39,7 +34,7 @@ export function AI(props: { viewing: boolean }) {
39 <h2 class="mcp-label">API key</h2>34 <h2 class="mcp-label">API key</h2>
40 <div class="mcp-key">35 <div class="mcp-key">
41 <Show when={key()} fallback={<>36 <Show when={key()} fallback={<>
42 <span class="mcp-field masked" aria-hidden="true"><span class="value">••••••••••••••••••••••••••••••••</span></span>37 <span class="copy-field masked" aria-hidden="true"><span class="value">••••••••••••••••••••••••••••••••</span></span>
43 <button ref={show} class="button" disabled={busy() || props.viewing} aria-busy={busy()}38 <button ref={show} class="button" disabled={busy() || props.viewing} aria-busy={busy()}
44 data-tip={props.viewing ? "Switch back to your account to see the key" : undefined} onClick={async () => {39 data-tip={props.viewing ? "Switch back to your account to see the key" : undefined} onClick={async () => {
45 setBusy(true); setError("");40 setBusy(true); setError("");
dashboard/web/pages/MCP.css-26
...@@ -12,32 +12,6 @@...@@ -12,32 +12,6 @@
12.mcp-page .hint, .mcp-approval .hint { margin: 6px 0 0; color: var(--muted); font-size: 12px; }12.mcp-page .hint, .mcp-approval .hint { margin: 6px 0 0; color: var(--muted); font-size: 12px; }
13.mcp-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; }13.mcp-actions { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; }
1414
15/* A value you copy: the whole well is the Copy button. */
16.mcp-field > .copy, .mcp-field.masked {
17 display: flex;
18 align-items: center;
19 gap: 10px;
20 width: 100%;
21 min-height: 34px;
22 padding: 6px 10px;
23 border: 2px solid var(--line);
24 border-radius: var(--radius);
25 background: var(--well);
26 color: var(--text);
27 font: 12.5px/1.45 var(--mono);
28 text-align: left;
29 white-space: normal;
30 cursor: copy;
31 transition: border-color 150ms, background-color 150ms;
32}
33.mcp-field { flex: 1; min-width: 0; }
34.mcp-field .value { flex: 1; min-width: 0; overflow-wrap: anywhere; }
35.mcp-field .icon { flex: none; color: var(--muted); transition: color 150ms; }
36.mcp-field > .copy:hover { border-color: var(--axis); background: var(--accent-wash); }
37.mcp-field > .copy:hover .icon { color: var(--accent); }
38.mcp-field.masked { box-sizing: border-box; cursor: default; color: var(--muted); letter-spacing: 0.1em; overflow: hidden; }
39.mcp-field.masked .value { overflow-wrap: normal; white-space: nowrap; }
40
41.mcp-key { display: flex; gap: 8px; align-items: stretch; }15.mcp-key { display: flex; gap: 8px; align-items: stretch; }
42.mcp-key .button { height: auto; min-height: 34px; }16.mcp-key .button { height: auto; min-height: 34px; }
43.mcp-section > .mcp-key + .error { margin: 6px 0 0; color: color-mix(in srgb, var(--critical) 80%, var(--text)); font-size: 13px; }17.mcp-section > .mcp-key + .error { margin: 6px 0 0; color: color-mix(in srgb, var(--critical) 80%, var(--text)); font-size: 13px; }
dashboard/web/pages/MCP.tsx+2-1
...@@ -15,7 +15,8 @@ import { Loaded } from "../components/Loaded.tsx";...@@ -15,7 +15,8 @@ import { Loaded } from "../components/Loaded.tsx";
15import { StatusLabel } from "../components/Status.tsx";15import { StatusLabel } from "../components/Status.tsx";
16import { TabBar } from "../components/TabBar.tsx";16import { TabBar } from "../components/TabBar.tsx";
17import { toast } from "../components/Toast.tsx";17import { toast } from "../components/Toast.tsx";
18import { AI, ClientMark, CopyField } from "./AI.tsx";18import { AI, ClientMark } from "./AI.tsx";
19import { CopyField } from "../components/Copy.tsx";
19import { MCPAccess } from "./MCPAccess.tsx";20import { MCPAccess } from "./MCPAccess.tsx";
20import type { Me } from "../types/model.ts";21import type { Me } from "../types/model.ts";
21import type { Access, Catalog, Connections } from "../types/mcp.ts";22import type { Access, Catalog, Connections } from "../types/mcp.ts";
dashboard/web/pages/VMs.css+10-2
...@@ -79,8 +79,10 @@...@@ -79,8 +79,10 @@
79.vm-console { display: flex; flex-direction: column; flex: 1; min-height: 0; overflow: hidden; background: var(--panel); }79.vm-console { display: flex; flex-direction: column; flex: 1; min-height: 0; overflow: hidden; background: var(--panel); }
80.vm-console-toolbar { display: flex; flex: none; align-items: center; flex-wrap: wrap; gap: 4px; padding: 6px 12px; border-bottom: 1px solid var(--grid); }80.vm-console-toolbar { display: flex; flex: none; align-items: center; flex-wrap: wrap; gap: 4px; padding: 6px 12px; border-bottom: 1px solid var(--grid); }
81.vm-console-status { color: var(--text-2); font-size: 12px; }81.vm-console-status { color: var(--text-2); font-size: 12px; }
82.vm-password { display: grid; gap: 6px; padding: 8px 10px; color: var(--muted); font-size: 11px; }82.vm-credentials { display: grid; gap: 16px; padding: 10px; }
83.vm-password input { width: 26ch; min-width: 0; padding: 5px 6px; color: var(--text); font: 12px monospace; }83.vm-credentials h2 { margin: 0 0 6px; color: var(--text-2); font-size: 12px; font-weight: 600; }
84.vm-credential-password { display: flex; gap: 8px; align-items: stretch; }
85.vm-credential-password > .button { height: auto; min-height: 34px; white-space: nowrap; }
84.vm-console-screen { flex: 1; background: #101014; min-height: 0; position: relative; }86.vm-console-screen { flex: 1; background: #101014; min-height: 0; position: relative; }
85.vm-console-screen video { display: block; width: 100%; height: 100%; object-fit: contain; outline: none; touch-action: none; }87.vm-console-screen video { display: block; width: 100%; height: 100%; object-fit: contain; outline: none; touch-action: none; }
86.vm-screen-canvas { position: absolute; inset: 0; width: 100%; height: 100%; object-fit: contain; pointer-events: none; background: #101014; }88.vm-screen-canvas { position: absolute; inset: 0; width: 100%; height: 100%; object-fit: contain; pointer-events: none; background: #101014; }
...@@ -136,6 +138,12 @@...@@ -136,6 +138,12 @@
136.vm-menu summary:hover, .vm-menu[open] summary { background: var(--hover); }138.vm-menu summary:hover, .vm-menu[open] summary { background: var(--hover); }
137.vm-menu > div { position: absolute; top: calc(100% + 6px); left: 0; min-width: 180px; max-width: 300px; z-index: 5; display: flex; flex-direction: column; padding: 4px; border: 1px solid var(--grid); border-radius: 7px; background: var(--panel); box-shadow: 0 6px 24px #0005; }139.vm-menu > div { position: absolute; top: calc(100% + 6px); left: 0; min-width: 180px; max-width: 300px; z-index: 5; display: flex; flex-direction: column; padding: 4px; border: 1px solid var(--grid); border-radius: 7px; background: var(--panel); box-shadow: 0 6px 24px #0005; }
138.vm-menu:last-of-type > div { left: auto; right: 0; }140.vm-menu:last-of-type > div { left: auto; right: 0; }
141.vm-menu > div:has(.vm-credentials) { left: auto; right: 0; width: min(380px, calc(100vw - 24px)); max-width: none; }
142@media (max-width: 900px) {
143 .vm-console-toolbar { position: relative; }
144 .vm-menu:has(.vm-credentials) { position: static; }
145 .vm-menu > div:has(.vm-credentials) { right: 12px; }
146}
139.vm-menu > div > button { display: flex; align-items: center; justify-content: flex-start; gap: 8px; width: 100%; border: 0; border-radius: 4px; background: transparent; color: var(--text); padding: 7px 10px; font: inherit; text-align: left; cursor: pointer; }147.vm-menu > div > button { display: flex; align-items: center; justify-content: flex-start; gap: 8px; width: 100%; border: 0; border-radius: 4px; background: transparent; color: var(--text); padding: 7px 10px; font: inherit; text-align: left; cursor: pointer; }
140.vm-menu > div > button svg { flex: none; }148.vm-menu > div > button svg { flex: none; }
141.vm-menu > div > button:hover:not(:disabled) { background: var(--hover); }149.vm-menu > div > button:hover:not(:disabled) { background: var(--hover); }
dashboard/web/pages/VMs.tsx+24-4
...@@ -16,6 +16,7 @@ import Trash from "lucide-solid/icons/trash";...@@ -16,6 +16,7 @@ import Trash from "lucide-solid/icons/trash";
16import Square from "lucide-solid/icons/square";16import Square from "lucide-solid/icons/square";
17import Pause from "lucide-solid/icons/pause";17import Pause from "lucide-solid/icons/pause";
18import KeyRound from "lucide-solid/icons/key-round";18import KeyRound from "lucide-solid/icons/key-round";
19import EyeOff from "lucide-solid/icons/eye-off";
19import Usb from "lucide-solid/icons/usb";20import Usb from "lucide-solid/icons/usb";
20import { createEffect, createMemo, createResource, createSignal, For, lazy, onCleanup, Show } from "solid-js";21import { createEffect, createMemo, createResource, createSignal, For, lazy, onCleanup, Show } from "solid-js";
21import { LIVE_INTERVAL } from "../types/model.ts";22import { LIVE_INTERVAL } from "../types/model.ts";
...@@ -25,7 +26,7 @@ import { DetailedError, parseResponse } from "hono/client";...@@ -25,7 +26,7 @@ import { DetailedError, parseResponse } from "hono/client";
25import { api, queries, reason, unconnected } from "../api.ts";26import { api, queries, reason, unconnected } from "../api.ts";
26import { VMConsole } from "../components/VMConsole.tsx";27import { VMConsole } from "../components/VMConsole.tsx";
27import { Checkbox } from "../components/Checkbox.tsx";28import { Checkbox } from "../components/Checkbox.tsx";
28import { Copy } from "../components/Copy.tsx";29import { Copy, CopyField } from "../components/Copy.tsx";
29import { showConfirmDialog, showTextDialog } from "../components/Dialog.tsx";30import { showConfirmDialog, showTextDialog } from "../components/Dialog.tsx";
30import { ListPage } from "../components/ListPage.tsx";31import { ListPage } from "../components/ListPage.tsx";
31import { lastGood, Loaded } from "../components/Loaded.tsx";32import { lastGood, Loaded } from "../components/Loaded.tsx";
...@@ -591,6 +592,9 @@ export function VMs() {...@@ -591,6 +592,9 @@ export function VMs() {
591 }>{(name) => {592 }>{(name) => {
592 const [access] = createResource(() => name, (name) => parseResponse(api.vms[":name"].access.$get({ param: { name } })));593 const [access] = createResource(() => name, (name) => parseResponse(api.vms[":name"].access.$get({ param: { name } })));
593 const login = lastGood(access);594 const login = lastGood(access);
595 const [passwordVisible, setPasswordVisible] = createSignal(false);
596 let showPassword!: HTMLButtonElement;
597 let hidePassword!: HTMLButtonElement;
594 const [consoleOpened, setConsoleOpened] = createSignal(false);598 const [consoleOpened, setConsoleOpened] = createSignal(false);
595 createEffect(() => { if (activeTab() === "console") setConsoleOpened(true); });599 createEffect(() => { if (activeTab() === "console") setConsoleOpened(true); });
596 return <Show when={latest().domains.find((vm) => vm.name === name)} fallback={600 return <Show when={latest().domains.find((vm) => vm.name === name)} fallback={
...@@ -627,9 +631,25 @@ export function VMs() {...@@ -627,9 +631,25 @@ export function VMs() {
627 }}><Disc2 size={14} aria-hidden="true" />Eject ISO</button>631 }}><Disc2 size={14} aria-hidden="true" />Eject ISO</button>
628 <span class="muted vm-menu-info">{vm().media.find((item) => item.source)?.source ?? "No ISO attached"}</span>632 <span class="muted vm-menu-info">{vm().media.find((item) => item.source)?.source ?? "No ISO attached"}</span>
629 </VMMenu></Show>633 </VMMenu></Show>
630 <Show when={login()}>{(credentials) => <VMMenu label="Password">634 <Show when={login()}>{(credentials) => <VMMenu label="Login" onClose={() => setPasswordVisible(false)}>
631 <label class="vm-password">Guest password<input aria-label="Guest password" value={credentials().password} readOnly spellcheck={false} /></label>635 <div class="vm-credentials">
632 <Copy value={credentials().password} label="guest password"><KeyRound size={14} aria-hidden="true" />Copy password</Copy>636 <div role="group" aria-label="Username">
637 <h2>Username</h2>
638 <CopyField value={credentials().username} label="username" />
639 </div>
640 <div role="group" aria-label="Password">
641 <h2>Password</h2>
642 <div class="vm-credential-password">
643 <Show when={passwordVisible()} fallback={<>
644 <span class="copy-field masked" aria-hidden="true"><span class="value">••••••••••••••••</span></span>
645 <button ref={showPassword} class="button" onClick={() => { setPasswordVisible(true); hidePassword.focus(); }}><KeyRound size={14} aria-hidden="true" />Show password</button>
646 </>}>
647 <CopyField value={credentials().password} label="password" />
648 <button ref={hidePassword} class="button" onClick={() => { setPasswordVisible(false); showPassword.focus(); }}><EyeOff size={14} aria-hidden="true" />Hide</button>
649 </Show>
650 </div>
651 </div>
652 </div>
633 </VMMenu>}</Show>653 </VMMenu>}</Show>
634 </>} />654 </>} />
635 </section>}</Show>;655 </section>}</Show>;
tools/dashboard-stage-test.py+5-4
...@@ -35,7 +35,7 @@ class PreviewBoundary(unittest.TestCase):...@@ -35,7 +35,7 @@ class PreviewBoundary(unittest.TestCase):
35 return json.loads(sent[4:]), host35 return json.loads(sent[4:]), host
3636
37 def test_denies_host_mutations_and_vm_streams_before_dispatch(self):37 def test_denies_host_mutations_and_vm_streams_before_dispatch(self):
38 for operation in ["vm.create", "vm.start", "vm.console", "vm.serial", "vm.guest", "vm.upload", "vm.computer", "vm.owner", "storage.destroy", "deploy.start", "deploy.secret.get", "shale.write", "copyparty.manage", []]:38 for operation in ["vm.create", "vm.start", "vm.console", "vm.serial", "vm.guest", "vm.upload", "vm.computer", "vm.owner", "vm.access", "storage.destroy", "deploy.start", "deploy.secret.get", "shale.write", "copyparty.manage", []]:
39 with self.subTest(operation=operation):39 with self.subTest(operation=operation):
40 response, host = self.call({"operation": operation})40 response, host = self.call({"operation": operation})
41 self.assertEqual(response["status"], 403)41 self.assertEqual(response["status"], 403)
...@@ -57,7 +57,7 @@ class PreviewBoundary(unittest.TestCase):...@@ -57,7 +57,7 @@ class PreviewBoundary(unittest.TestCase):
57 def test_attached_computer_cannot_target_another_vm(self):57 def test_attached_computer_cannot_target_another_vm(self):
58 host = stage.PreviewHost({"clone": "globe/staging/fixture", "computer": "mac-fixture"})58 host = stage.PreviewHost({"clone": "globe/staging/fixture", "computer": "mac-fixture"})
59 with patch.object(boundary.Host, "handle", return_value={"ok": True}) as call:59 with patch.object(boundary.Host, "handle", return_value={"ok": True}) as call:
60 for operation in ["vm.computer", "vm.owner", "vm.console", "vm.guest"]:60 for operation in ["vm.computer", "vm.owner", "vm.access", "vm.console", "vm.guest"]:
61 with self.assertRaises(boundary.dashboard_runs.Error):61 with self.assertRaises(boundary.dashboard_runs.Error):
62 host.handle({"operation": operation, "payload": {"name": "personal"}})62 host.handle({"operation": operation, "payload": {"name": "personal"}})
63 call.assert_not_called()63 call.assert_not_called()
...@@ -100,8 +100,9 @@ class PreviewBoundary(unittest.TestCase):...@@ -100,8 +100,9 @@ class PreviewBoundary(unittest.TestCase):
100 host.handle(request)100 host.handle(request)
101 call.assert_called_once_with(request)101 call.assert_called_once_with(request)
102 with patch.object(boundary.Host, "handle", return_value={"owner": "foreign-id", "ownerOnly": True}):102 with patch.object(boundary.Host, "handle", return_value={"owner": "foreign-id", "ownerOnly": True}):
103 with self.assertRaises(boundary.dashboard_runs.Error):103 for operation in ["vm.computer", "vm.access"]:
104 host.handle({"operation": "vm.computer", "payload": {"name": "ai-foreign"}})104 with self.subTest(operation=operation), self.assertRaises(boundary.dashboard_runs.Error):
105 host.handle({"operation": operation, "payload": {"name": "ai-foreign"}})
105106
106 def test_failed_child_creation_and_repeated_token_revoke_still_clean_parent(self):107 def test_failed_child_creation_and_repeated_token_revoke_still_clean_parent(self):
107 identity = "dashboard-preview-12345678"108 identity = "dashboard-preview-12345678"
tools/dashboard-stage.py+3-3
...@@ -38,7 +38,7 @@ class PreviewHost(boundary.Host):...@@ -38,7 +38,7 @@ class PreviewHost(boundary.Host):
38 def handle(self, request):38 def handle(self, request):
39 operation = request.get("operation") if isinstance(request, dict) else None39 operation = request.get("operation") if isinstance(request, dict) else None
40 owner = None40 owner = None
41 if self.stage.get("computer") and self.stage.get("mount") and operation in {"vm.computer", "vm.owner", "vm.console", "vm.guest", "vm.domains", "vm.computers", "vm.ai", "vm.act"}:41 if self.stage.get("computer") and self.stage.get("mount") and operation in {"vm.computer", "vm.owner", "vm.access", "vm.console", "vm.guest", "vm.domains", "vm.computers", "vm.ai", "vm.act"}:
42 with sqlite3.connect(f"file:{self.stage['mount']}/data/accounts.sqlite?mode=ro", uri=True) as accounts:42 with sqlite3.connect(f"file:{self.stage['mount']}/data/accounts.sqlite?mode=ro", uri=True) as accounts:
43 owner = accounts.execute("SELECT id FROM users WHERE username='preview'").fetchone()43 owner = accounts.execute("SELECT id FROM users WHERE username='preview'").fetchone()
44 if not owner:44 if not owner:
...@@ -47,7 +47,7 @@ class PreviewHost(boundary.Host):...@@ -47,7 +47,7 @@ class PreviewHost(boundary.Host):
47 payload = request.get("payload")47 payload = request.get("payload")
48 if not owner or not isinstance(payload, dict) or payload.get("owner") != owner[0]:48 if not owner or not isinstance(payload, dict) or payload.get("owner") != owner[0]:
49 raise boundary.dashboard_runs.Error(403, "Test VMs must belong to this preview account.")49 raise boundary.dashboard_runs.Error(403, "Test VMs must belong to this preview account.")
50 if operation in {"vm.computer", "vm.owner", "vm.act", "vm.console", "vm.guest"}:50 if operation in {"vm.computer", "vm.owner", "vm.access", "vm.act", "vm.console", "vm.guest"}:
51 payload = request.get("payload")51 payload = request.get("payload")
52 if not self.stage.get("computer") or not isinstance(payload, dict):52 if not self.stage.get("computer") or not isinstance(payload, dict):
53 raise boundary.dashboard_runs.Error(403, "Choose the VM explicitly attached to this preview.")53 raise boundary.dashboard_runs.Error(403, "Choose the VM explicitly attached to this preview.")
...@@ -112,7 +112,7 @@ def serve(stage):...@@ -112,7 +112,7 @@ def serve(stage):
112 if not slots.acquire(blocking=False):112 if not slots.acquire(blocking=False):
113 connection.close()113 connection.close()
114 continue114 continue
115 operations = OPERATIONS | {"vm.computer", "vm.owner", "vm.ai", "vm.act", "vm.console", "vm.guest"} if saved.get("computer") else OPERATIONS115 operations = OPERATIONS | {"vm.computer", "vm.owner", "vm.access", "vm.ai", "vm.act", "vm.console", "vm.guest"} if saved.get("computer") else OPERATIONS
116 work = workers.submit(boundary.serve_connection, connection, host, saved["uid"], operations)116 work = workers.submit(boundary.serve_connection, connection, host, saved["uid"], operations)
117 work.add_done_callback(lambda _: slots.release())117 work.add_done_callback(lambda _: slots.release())
118118