Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
edcfd8f853 | ||
|
|
994fdb1cfb |
No files matched your search
+1
-5
@@ -48,8 +48,6 @@ and the pointer driver.
|
||||
| `vm-ipc` | the **compositor's IPC**: both sockets exist at the names `docs/CONTRACT-sessions.md` §5 freezes and fit inside `sun_path`, `hyprctl` answers, the broker's own `HyprlandIPC` reaches it, and a subscriber on the **event** socket receives an `openwindow` for a window the test creates | yes |
|
||||
| `vm-containers` | one `hh-*` output per session at the container mode, the application's window on it, a second window of the same application beside it, an unmatched window **quarantined**, `grim -o` capturing that container alone, and teardown removing the output and freeing its workspace slot | yes |
|
||||
| `vm-pointer` | the **lease and the driver**: a version-2 virtual pointer, a warp that lands where it was aimed *as the application reports it*, a click delivered as one press and one release, a contended acquire refused with BUSY, an expired lease swept with its held button lifted, and a broker restart that leaves the lock free, the bookmark intact and the driver reachable | yes |
|
||||
| `vm-keyboard` | the **keymap, the focus and a decoded symbol**: the keymap the driver uploads reaching a real compositor, `pointer acquire` leaving the aimed window holding the *keyboard* and not merely the cursor, and `hhs-keyboard-target` decoding `hello` from the keymap it was **forwarded** — so a driver that stopped uploading one arrives as `sym=?` and goes red | yes |
|
||||
| `vm-keyboard-de` | the same file with `sessions.keyboard.layout = "de"`, because that option reaches the uploaded keymap through exactly one path — `--xkb-layout` on the driver unit — and a single-layout check cannot tell that path from a hardcoded `us`: keysym `y`'s evdev code swaps (21 against 44), the forwarded `symbols=` name with it, and `ü` goes from exit 2 to `udiaeresis` | yes |
|
||||
| `vm-stream-firewall` | the stream's **port**: the guest's own running firewall accepts the configured port and not the module's default, a peer outside the guest reaches it, and is refused on a port beside it that was never opened | yes |
|
||||
|
||||
All of them at once:
|
||||
@@ -72,8 +70,6 @@ nix build -L .#checks.x86_64-linux.vm-sessions
|
||||
nix build -L .#checks.x86_64-linux.vm-ipc
|
||||
nix build -L .#checks.x86_64-linux.vm-containers
|
||||
nix build -L .#checks.x86_64-linux.vm-pointer
|
||||
nix build -L .#checks.x86_64-linux.vm-keyboard
|
||||
nix build -L .#checks.x86_64-linux.vm-keyboard-de
|
||||
nix build -L .#checks.x86_64-linux.vm-stream-firewall
|
||||
```
|
||||
|
||||
@@ -225,11 +221,11 @@ checks/
|
||||
vm-ipc.nix nixosTest, the compositor's request and event sockets
|
||||
vm-containers.nix nixosTest, one output and one workspace per session
|
||||
vm-pointer.nix nixosTest, the lease, the driver and a click that lands
|
||||
vm-stream-firewall.nix nixosTest, the stream's port in the guest's firewall
|
||||
vm-keyboard.nix nixosTest, the uploaded keymap, keyboard focus, and a
|
||||
symbol a client decoded. Exposed TWICE -- `vm-keyboard`
|
||||
(layout us) and `vm-keyboard-de` -- because the layout
|
||||
reaches the keymap only through the driver unit's argv
|
||||
vm-stream-firewall.nix nixosTest, the stream's port in the guest's firewall
|
||||
lib/test-tools.nix packages the tests/ helpers for the guest
|
||||
lib/session-tools.nix packages the two guest programs below
|
||||
lib/session-machine.nix the guest the three session checks share
|
||||
|
||||
+6
-7
@@ -7,9 +7,9 @@
|
||||
# vm-ipc -- the compositor's IPC sockets, and an event that arrives
|
||||
# vm-containers -- one output and one workspace per session
|
||||
# vm-pointer -- the lease, the driver, and a click the application saw
|
||||
# vm-stream-firewall -- the stream's port in the guest's own running firewall
|
||||
# vm-keyboard -- the uploaded keymap, keyboard focus, and a decoded symbol
|
||||
# vm-keyboard-de -- the same check with sessions.keyboard.layout = "de"
|
||||
# vm-stream-firewall -- the stream's port in the guest's own running firewall
|
||||
#
|
||||
# What the guests need lives in checks/lib: `test-tools.nix` for the fake
|
||||
# capture and the contract asserter, `session-tools.nix` for the event
|
||||
@@ -62,15 +62,14 @@ in
|
||||
|
||||
vm-pointer = pkgs.callPackage ./vm-pointer.nix sessionArgs;
|
||||
|
||||
vm-keyboard = pkgs.callPackage ./vm-keyboard.nix sessionArgs;
|
||||
|
||||
vm-keyboard-de = pkgs.callPackage ./vm-keyboard.nix (
|
||||
sessionArgs // { keyboardLayout = "de"; }
|
||||
);
|
||||
|
||||
# Not a `sessionArgs` consumer: this one is about the module's own options,
|
||||
# not about the broker or the compositor (see the file's header).
|
||||
vm-stream-firewall = pkgs.callPackage ./vm-stream-firewall.nix {
|
||||
inherit hhstream hhsModule testTools;
|
||||
};
|
||||
vm-keyboard = pkgs.callPackage ./vm-keyboard.nix sessionArgs;
|
||||
|
||||
vm-keyboard-de = pkgs.callPackage ./vm-keyboard.nix (
|
||||
sessionArgs // { keyboardLayout = "de"; }
|
||||
);
|
||||
}
|
||||
+57
-57
@@ -625,6 +625,63 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
# The session-stream web app — `hhstream-live`, the router that serves a
|
||||
# live view of one session per phrase, over one port
|
||||
# (`docs/plans/2026-10-04-session-stream-webapp.md`).
|
||||
#
|
||||
# Only the *reach* of it is declared here so far: the port every stream
|
||||
# shares, the address it will bind, and whether that port is opened in
|
||||
# the firewall. The unit that runs the app, the phrases the broker keeps
|
||||
# in its records and the `session stream enable` verbs are later stages
|
||||
# of that plan — and deliberately so: a stream is switched on per
|
||||
# session, never for all of them, so nothing here turns one on.
|
||||
stream = {
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 9988;
|
||||
description = ''
|
||||
The single TCP port every stream shares.
|
||||
|
||||
One listener rather than one per session is what makes the phrase
|
||||
speakable: there is one address to give a person, one thing to
|
||||
firewall and one thing to stop. It is also why this is a fixed
|
||||
number with no range to fall back on — a stream at a port nobody
|
||||
was told about is worse than a stream that is down, so a taken port
|
||||
fails loudly instead of moving.
|
||||
'';
|
||||
};
|
||||
|
||||
bind = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
description = ''
|
||||
The address the web app will bind.
|
||||
|
||||
Loopback by default, where the reachable path is an ssh tunnel
|
||||
(`ssh -L 9988:127.0.0.1:9988`) and nothing else. Set it to an
|
||||
address a peer can reach (`"0.0.0.0"`) when
|
||||
{option}`sessions.stream.openFirewall` is set: opening the port for
|
||||
a listener that is not on it is a hole with no service behind it,
|
||||
which is why that pairing is refused rather than allowed.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open {option}`sessions.stream.port` in the firewall.
|
||||
|
||||
Off by default, and deliberately not implied by
|
||||
{option}`sessions.enable`: a live view of this desktop is readable
|
||||
by anyone who can reach the port, and the phrase in the URL is its
|
||||
only credential — no TLS, no second factor
|
||||
(`docs/plans/2026-10-04-…` §4). Opening it is an explicit act, and
|
||||
it opens exactly one port.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# The keyboard has no `enable` of its own: it is the same unit, the same
|
||||
# process and the same lease as the pointer (`hhstream session keyboard
|
||||
# …` refuses with exit 9 until `pointer acquire`). What it needs from an
|
||||
@@ -699,63 +756,6 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
# The session-stream web app — `hhstream-live`, the router that serves a
|
||||
# live view of one session per phrase, over one port
|
||||
# (`docs/plans/2026-10-04-session-stream-webapp.md`).
|
||||
#
|
||||
# Only the *reach* of it is declared here so far: the port every stream
|
||||
# shares, the address it will bind, and whether that port is opened in
|
||||
# the firewall. The unit that runs the app, the phrases the broker keeps
|
||||
# in its records and the `session stream enable` verbs are later stages
|
||||
# of that plan — and deliberately so: a stream is switched on per
|
||||
# session, never for all of them, so nothing here turns one on.
|
||||
stream = {
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 9988;
|
||||
description = ''
|
||||
The single TCP port every stream shares.
|
||||
|
||||
One listener rather than one per session is what makes the phrase
|
||||
speakable: there is one address to give a person, one thing to
|
||||
firewall and one thing to stop. It is also why this is a fixed
|
||||
number with no range to fall back on — a stream at a port nobody
|
||||
was told about is worse than a stream that is down, so a taken port
|
||||
fails loudly instead of moving.
|
||||
'';
|
||||
};
|
||||
|
||||
bind = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
description = ''
|
||||
The address the web app will bind.
|
||||
|
||||
Loopback by default, where the reachable path is an ssh tunnel
|
||||
(`ssh -L 9988:127.0.0.1:9988`) and nothing else. Set it to an
|
||||
address a peer can reach (`"0.0.0.0"`) when
|
||||
{option}`sessions.stream.openFirewall` is set: opening the port for
|
||||
a listener that is not on it is a hole with no service behind it,
|
||||
which is why that pairing is refused rather than allowed.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open {option}`sessions.stream.port` in the firewall.
|
||||
|
||||
Off by default, and deliberately not implied by
|
||||
{option}`sessions.enable`: a live view of this desktop is readable
|
||||
by anyone who can reach the port, and the phrase in the URL is its
|
||||
only credential — no TLS, no second factor
|
||||
(`docs/plans/2026-10-04-…` §4). Opening it is an explicit act, and
|
||||
it opens exactly one port.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
stateDir = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/var/lib/hhstream";
|
||||
|
||||
+1
-1
@@ -34,10 +34,10 @@ python3.pkgs.buildPythonApplication {
|
||||
"hhstream_pointer.ops"
|
||||
"hhstream_pointer.keymap"
|
||||
"hhstream_pointer._protocol.wlr_virtual_pointer_unstable_v1"
|
||||
"hhstream_pointer._protocol.virtual_keyboard_unstable_v1"
|
||||
# The web app: importing the server pulls in the router, the publisher and
|
||||
# the pages.
|
||||
"hhstream_live.server"
|
||||
"hhstream_pointer._protocol.virtual_keyboard_unstable_v1"
|
||||
];
|
||||
|
||||
# `pythonImportsCheck` only *imports*, and `hhstream_live.phrase` reads its
|
||||
|
||||
+13
-38
@@ -75,18 +75,12 @@ def test_a_failure_after_a_good_frame_keeps_the_known_size():
|
||||
|
||||
|
||||
def test_env_is_overlaid_on_our_own_environment():
|
||||
argv = [
|
||||
sys.executable,
|
||||
"-c",
|
||||
"import os,sys;sys.stdout.write(os.environ['WAYLAND_DISPLAY']+':'+"
|
||||
+ "('PATH' in os.environ and 'haspath' or 'nopath'))",
|
||||
]
|
||||
before = os.environ.get("WAYLAND_DISPLAY")
|
||||
argv = [sys.executable, "-c",
|
||||
"import os,sys;sys.stdout.write(os.environ['WAYLAND_DISPLAY']+':'+"
|
||||
"('PATH' in os.environ and 'haspath' or 'nopath'))"]
|
||||
capture = CommandCapture(argv, env={"WAYLAND_DISPLAY": "wayland-9"})
|
||||
assert capture.grab() == b"wayland-9:haspath"
|
||||
assert os.environ.get("WAYLAND_DISPLAY") == before, (
|
||||
"our own environment was mutated"
|
||||
)
|
||||
assert "WAYLAND_DISPLAY" not in os.environ, "our own environment was mutated"
|
||||
|
||||
|
||||
def test_empty_argv_and_bad_timeout_are_rejected_up_front():
|
||||
@@ -97,10 +91,8 @@ def test_empty_argv_and_bad_timeout_are_rejected_up_front():
|
||||
|
||||
|
||||
def test_the_helpers_stdin_is_closed_so_it_cannot_steal_ours():
|
||||
code = (
|
||||
"import sys;"
|
||||
"sys.stdout.buffer.write(b'EMPTY' if not sys.stdin.read() else b'DATA')"
|
||||
)
|
||||
code = ("import sys;"
|
||||
"sys.stdout.buffer.write(b'EMPTY' if not sys.stdin.read() else b'DATA')")
|
||||
assert CommandCapture([sys.executable, "-c", code]).grab() == b"EMPTY"
|
||||
|
||||
|
||||
@@ -110,32 +102,15 @@ def test_image_size_reads_png_headers(width, height):
|
||||
|
||||
|
||||
def test_image_size_reads_a_jpeg_sof_header():
|
||||
jpeg = (
|
||||
b"\xff\xd8"
|
||||
+ b"\xff\xe0"
|
||||
+ (16).to_bytes(2, "big")
|
||||
+ b"JFIF\x00"
|
||||
+ b"\x00" * 9
|
||||
+ b"\xff\xc0"
|
||||
+ (17).to_bytes(2, "big")
|
||||
+ b"\x08"
|
||||
+ (720).to_bytes(2, "big")
|
||||
+ (1280).to_bytes(2, "big")
|
||||
+ b"\x03"
|
||||
+ b"\x00" * 9
|
||||
)
|
||||
jpeg = (b"\xff\xd8"
|
||||
+ b"\xff\xe0" + (16).to_bytes(2, "big") + b"JFIF\x00" + b"\x00" * 9
|
||||
+ b"\xff\xc0" + (17).to_bytes(2, "big") + b"\x08"
|
||||
+ (720).to_bytes(2, "big") + (1280).to_bytes(2, "big")
|
||||
+ b"\x03" + b"\x00" * 9)
|
||||
assert image_size(jpeg) == (1280, 720)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"data",
|
||||
[
|
||||
b"",
|
||||
b"not an image",
|
||||
b"\x89PNG\r\n\x1a\n",
|
||||
b"\xff\xd8",
|
||||
b"\xff\xd8\xff\xc0\x00\x11",
|
||||
],
|
||||
)
|
||||
@pytest.mark.parametrize("data", [b"", b"not an image", b"\x89PNG\r\n\x1a\n",
|
||||
b"\xff\xd8", b"\xff\xd8\xff\xc0\x00\x11"])
|
||||
def test_image_size_returns_none_when_it_cannot_tell(data):
|
||||
assert image_size(data) is None
|
||||
Reference in new issue
Block a user