pybridge: Improve beiboot error reporting for fatal login failures

After all SSH authentication attemps fail, e.g. entering the wrong
password three times, ferny throws an InteractionError. Merely exiting
cockpit-beiboot gets interpreted as "Internal error" which is unfriendly.

Translate the most common errors (DNS resolution and and authentication
failure) to proper cockpit protocol error codes, so that they get
presented properly and translated. As this involves parsing SSH output,
keep the `internal-error` fallback for everything else.

src/cockpit/beiboot.py

@@ -22,7 +22,6 @@
 import logging
 import os
 import shlex
-import sys
 from pathlib import Path
 from typing import Dict, Iterable, Optional, Sequence
 
@@ -316,8 +315,18 @@ async def run(args) -> None:
         bridge.write_control(**message)
         bridge.ssh_peer.thaw_endpoint()
     except ferny.InteractionError as exc:
-        sys.exit(str(exc))
+        logger.debug("ferny.InteractionError: %s", exc)
+        msg = str(exc)
+        if 'Permission denied' in msg:
+            problem = 'authentication-failed'
+        elif 'resolve host' in msg:
+            problem = 'unknown-host'
+        else:
+            problem = 'internal-error'
+        bridge.write_control(command='init', problem=problem, message=msg)
+        return
     except CockpitProblem as exc:
+        logger.debug("CockpitProblem: %s", exc)
         bridge.write_control(command='init', problem=exc.problem, **exc.kwargs)
         return
 

test/verify/check-client

@@ -147,13 +147,11 @@ Command = /usr/bin/env python3 -m cockpit.beiboot
             b.wait_text("#conversation-prompt", "admin@10.111.113.2's password: ")
             b.set_val("#conversation-input", "wrong")
             b.click("#login-button")
-        b.wait_in_text("#login-fatal-message", "admin@10.111.113.2: Permission denied")
-        b.click("#login-again")
-        b.wait_text("#brand", "Connect to:")
-        # resets the host field
-        b.wait_val("#server-field", "")
+        b.wait_in_text("#login-error-message", "Authentication failed")
+        b.wait_val("#server-field", "10.111.113.2")
 
         # connect to most recent host
+        b.open("/")  # reset URL from /metrics and last remote =host
         b.click("#recent-hosts-list .host-line button.host-name")
         b.wait_text("#conversation-prompt", "admin@10.111.113.2's password: ")
         b.set_val("#conversation-input", "foobar")
@@ -208,9 +206,8 @@ Command = /usr/bin/env python3 -m cockpit.beiboot
         # unreachable host
         b.set_val("#server-field", "unknownhost")
         b.click("#login-button")
-        b.wait_in_text("#login-fatal-message", "Could not resolve hostname unknownhost")
-        b.click("#login-again")
-        b.wait_text("#brand", "Connect to:")
+        b.wait_in_text("#login-error-message", "Host is unknown")
+        b.wait_val("#server-field", "unknownhost")
         # does not appear in recent hosts
         b.wait_in_text("#recent-hosts-list", "10.111.113.2")
         self.assertNotIn("unknownhost", b.text("#recent-hosts-list"))

test/verify/check-static-login

@@ -1017,9 +1017,10 @@ Command = /usr/bin/env python3 -m cockpit.beiboot
             b.wait_text("#conversation-prompt", f"admin@{my_ip}'s password: ")
             b.set_val("#conversation-input", "wrong")
             b.click("#login-button")
-        # FIXME: better error message
-        b.wait_in_text("#login-fatal-message", "Internal error in login process")
+        b.wait_in_text("#login-error-message", "Authentication failed")
         check_no_processes()
+        # goes back to normal login form
+        b.wait_visible('#login-user-input')
 
         # colliding usernames; user names in "Connect to:" are *not* supported,
         # but pin down the behaviour