Merge pull request #381 from moreati/ssh-7.5-permission-denied

Match "user@host: Permission denied ..." messages
2018-10-01 20:24:29 +01:00 · 2018-10-01 20:24:29 +01:00 · c408395182
parent 860618945b 2c2878012d
commit c408395182
1 changed files with 5 additions and 1 deletions
--- a/mitogen/ssh.py
+++ b/mitogen/ssh.py
@ -289,7 +289,11 @@ class Stream(mitogen.parent.Stream):
                self._host_key_prompt()
            elif HOSTKEY_FAIL in buf.lower():
                raise HostKeyError(self.hostkey_failed_msg)
-            elif buf.lower().startswith(PERMDENIED_PROMPT):
+            elif buf.lower().startswith((
+                    PERMDENIED_PROMPT,
+                    b("%s@%s: %s" % (self.username, self.hostname,
+                                     PERMDENIED_PROMPT)),
+                )):
                # issue #271: work around conflict with user shell reporting
                # 'permission denied' e.g. during chdir($HOME) by only matching
                # it at the start of the line.