diff options
| author | Thomas Kluyver <takowl@gmail.com> | 2017-11-09 15:49:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-09 15:49:21 +0000 |
| commit | 3de3eee051ac5b107db5f638b348c455c76dba4c (patch) | |
| tree | 831069a607d32349a80c2ea1e282d65263681bb9 | |
| parent | c741080a46445e5b2dec037c4856617f679d4546 (diff) | |
| parent | 5d9795b3ed499ab467b852d64786184df6f542a6 (diff) | |
| download | pexpect-git-3de3eee051ac5b107db5f638b348c455c76dba4c.tar.gz | |
Merge pull request #452 from orulz/issue_451_pxssh_broken_with_password_in_banner
Issue #451: Check for "password:" as prompt instead of "password"
| -rw-r--r-- | pexpect/pxssh.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pexpect/pxssh.py b/pexpect/pxssh.py index 1f097ab..e2fccb6 100644 --- a/pexpect/pxssh.py +++ b/pexpect/pxssh.py @@ -277,7 +277,7 @@ class pxssh (spawn): # This does not distinguish between a remote server 'password' prompt # and a local ssh 'passphrase' prompt (for unlocking a private key). spawn._spawn(self, cmd) - i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT, "(?i)connection closed by remote host", EOF], timeout=login_timeout) + i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password:)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT, "(?i)connection closed by remote host", EOF], timeout=login_timeout) # First phase if i==0: @@ -285,13 +285,13 @@ class pxssh (spawn): # This is what you get if SSH does not have the remote host's # public key stored in the 'known_hosts' cache. self.sendline("yes") - i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT]) + i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password:)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT]) if i==2: # password or passphrase self.sendline(password) - i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT]) + i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password:)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT]) if i==4: self.sendline(terminal_type) - i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT]) + i = self.expect(["(?i)are you sure you want to continue connecting", original_prompt, "(?i)(?:password:)|(?:passphrase for key)", "(?i)permission denied", "(?i)terminal type", TIMEOUT]) if i==7: self.close() raise ExceptionPxssh('Could not establish connection to host') |