Merge pull request mitogen-hq#757 from moreati/issue756

ssh: Match newer ssh host key prompt that accepts the fingerprint
msaladna · Nov 9, 2020 · 5942bfb · 5942bfb
2 parents a60c6c1 + b0ce29d
commit 5942bfb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -21,7 +21,8 @@ v0.2.10 (unreleased)
 To avail of fixes in an unreleased version, please download a ZIP file
 `directly from GitHub <https://github.com/dw/mitogen/>`_.
 
-*(no changes)*
+* :gh:issue:`756` ssh connections with `check_host_keys='accept'` would
+  timeout, when using recent OpenSSH client versions.
 
 
 v0.2.9 (2019-11-02)

diff --git a/mitogen/ssh.py b/mitogen/ssh.py
@@ -72,7 +72,10 @@
 )
 
 HOSTKEY_REQ_PATTERN = re.compile(
-    b(r'are you sure you want to continue connecting \(yes/no\)\?'),
+    b(
+            r'are you sure you want to continue connecting '
+            r'\(yes/no(?:/\[fingerprint\])?\)\?'
+    ),
     re.I
 )