workaround paramiko error with agent keys

Xpra-org · Dec 23, 2023 · 55f2cc6 · 55f2cc6
1 parent 143e8a0
commit 55f2cc6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/xpra/net/ssh/paramiko_client.py b/xpra/net/ssh/paramiko_client.py
@@ -580,7 +580,12 @@ def auth_agent() -> None:
                     transport.auth_publickey(username, agent_key)
                     if transport.is_authenticated():
                         log("authenticated using agent and key '%s'", keymd5(agent_key))
-                        break
+                        return
+                except AttributeError as e:
+                    log(f"auth_publickey({username}, {agent_key})")
+                    log.warn("Warning: paramiko bug during public key agent authentication")
+                    log.warn(f" {type(e)}: {e}")
+                    log.warn(f" using key {type(agent_key)}: {agent_key}")
                 except SSHException as e:
                     auth_errors.setdefault("agent", []).append(str(e))
                     log.info("SSH agent key '%s' rejected for user '%s'", keymd5(agent_key), username)