clan-cli: fix clan ssh --json and --png

This fixes `clan ssh` with the `--json` and `--png` flags.

It will now correctly use the actual fields that are present in the
generated json.

- probes if the ports are accessible
- if accessible will attempt a single ssh connection with the provided
password, in order to not spam ssh attempts

Fixes #1177

pkgs/clan-cli/tests/test_ssh_cli.py

@@ -33,7 +33,6 @@ def test_ssh_no_pass(
         "shell",
         fp.any(),
         "-c",
-        "torify",
         "ssh",
         "-o",
         "UserKnownHostsFile=/dev/null",
@@ -63,7 +62,6 @@ def test_ssh_with_pass(
         "shell",
         fp.any(),
         "-c",
-        "torify",
         "sshpass",
         "-p",
         fp.any(),
@@ -77,6 +75,65 @@ def test_ssh_with_pass(
     assert fp.call_count(cmd) == 1
 
 
+def test_ssh_no_pass_with_torify(
+    fp: pytest_subprocess.fake_process.FakeProcess, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    host = "somehost"
+    user = "user"
+    if os.environ.get("IN_NIX_SANDBOX"):
+        monkeypatch.delenv("IN_NIX_SANDBOX")
+    cmd: list[str | utils.Any] = [
+        "nix",
+        fp.any(),
+        "shell",
+        fp.any(),
+        "-c",
+        "torify",
+        "ssh",
+        "-o",
+        "UserKnownHostsFile=/dev/null",
+        "-o",
+        "StrictHostKeyChecking=no",
+        f"{user}@{host}",
+        fp.any(),
+    ]
+    fp.register(cmd)
+    cli.ssh(
+        host=host,
+        user=user,
+        torify=True,
+    )
+    assert fp.call_count(cmd) == 1
+
+
+def test_ssh_with_pass_with_torify(
+    fp: pytest_subprocess.fake_process.FakeProcess, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    host = "somehost"
+    user = "user"
+    if os.environ.get("IN_NIX_SANDBOX"):
+        monkeypatch.delenv("IN_NIX_SANDBOX")
+    cmd: list[str | utils.Any] = [
+        "nix",
+        fp.any(),
+        "shell",
+        fp.any(),
+        "-c",
+        "torify",
+        "sshpass",
+        "-p",
+        fp.any(),
+    ]
+    fp.register(cmd)
+    cli.ssh(
+        host=host,
+        user=user,
+        password="XXX",
+        torify=True,
+    )
+    assert fp.call_count(cmd) == 1
+
+
 def test_qrcode_scan(fp: pytest_subprocess.fake_process.FakeProcess) -> None:
     cmd: list[str | utils.Any] = [fp.any()]
     fp.register(cmd, stdout="https://test.test")