diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-05-19 20:16:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-19 20:16:13 +0100 |
commit | e56ae50ed96fcbe6fa7104c6acf94e66300e7d2f (patch) | |
tree | bafdf785f6a5ced1baa7c3e8c1ddeb2da772b793 /nixos/tests | |
parent | 90344e9f40c9462f382231dc7682ffcec77b6b9d (diff) | |
parent | 14e2c1e4fb972145bb2d8ed5f60a435fc3319276 (diff) |
Merge pull request #173109 from Mic92/upterm
nixos/upterm: additional hardening
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/uptermd.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/tests/uptermd.nix b/nixos/tests/uptermd.nix index b2ff9a1e0d9cf..d504ef0641916 100644 --- a/nixos/tests/uptermd.nix +++ b/nixos/tests/uptermd.nix @@ -30,11 +30,14 @@ in server.wait_for_unit("uptermd.service") server.wait_for_unit("network-online.target") + # wait for upterm port to be reachable + client1.wait_until_succeeds("nc -z -v server 1337") + # Add SSH hostkeys from the server to both clients # uptermd needs an '@cert-authority entry so we need to modify the known_hosts file - client1.execute("sleep 3; mkdir -p ~/.ssh && ssh -o StrictHostKeyChecking=no -p 1337 server ls") + client1.execute("mkdir -p ~/.ssh && ssh -o StrictHostKeyChecking=no -p 1337 server ls") client1.execute("echo @cert-authority $(cat ~/.ssh/known_hosts) > ~/.ssh/known_hosts") - client2.execute("sleep 3; mkdir -p ~/.ssh && ssh -o StrictHostKeyChecking=no -p 1337 server ls") + client2.execute("mkdir -p ~/.ssh && ssh -o StrictHostKeyChecking=no -p 1337 server ls") client2.execute("echo @cert-authority $(cat ~/.ssh/known_hosts) > ~/.ssh/known_hosts") client1.wait_for_unit("multi-user.target") |