Merge pull request #757 from moreati/issue756

s1113950 · web-flow · commit 5942bfb7d55d · 2020-11-08T21:48:17.000-08:00
ssh: Match newer ssh host key prompt that accepts the fingerprint
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
 )
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,10 @@`
`72`	`72`	`)`
`73`	`73`
`74`	`74`	`HOSTKEY_REQ_PATTERN = re.compile(`
`75`		`- b(r'are you sure you want to continue connecting \(yes/no\)\?'),`
	`75`	`+ b(`
	`76`	`+ r'are you sure you want to continue connecting '`
	`77`	`+ r'\(yes/no(?:/\[fingerprint\])?\)\?'`
	`78`	`+ ),`
`76`	`79`	`re.I`
`77`	`80`	`)`
`78`	`81`