Skip to content

A
ansible
Commit 2c98b271 by James Cammarata
Options

Make paramiko password detection logic match ssh connection

parent 3d77723e
Showing with 21 additions and 19 deletions
lib/ansible/plugins/connections/paramiko_ssh.py
...@@ -224,25 +224,27 @@ class Connection(ConnectionBase): ...@@ -224,25 +224,27 @@ class Connection(ConnectionBase):
try: try:
chan.exec_command(cmd) chan.exec_command(cmd)
if self._connection_info.prompt: if self._connection_info.prompt:
while True: if self._connection_info.become and self._connection_info.become_pass:
debug('Waiting for Privilege Escalation input') while True:
if self.check_become_success(become_output) or self.check_password_prompt(become_output): debug('Waiting for Privilege Escalation input')
break if self.check_become_success(become_output) or self.check_password_prompt(become_output):
chunk = chan.recv(bufsize) break
if not chunk: chunk = chan.recv(bufsize)
if 'unknown user' in become_output: print("chunk is: %s" % chunk)
raise AnsibleError( if not chunk:
'user %s does not exist' % become_user) if 'unknown user' in become_output:
else: raise AnsibleError(
raise AnsibleError('ssh connection ' + 'user %s does not exist' % become_user)
'closed waiting for password prompt') else:
become_output += chunk raise AnsibleError('ssh connection ' +
if not self.check_become_success(become_output): 'closed waiting for password prompt')
if self._connection_info.become: become_output += chunk
chan.sendall(self._connection_info.become_pass + '\n') if not self.check_become_success(become_output):
else: if self._connection_info.become:
no_prompt_out += become_output chan.sendall(self._connection_info.become_pass + '\n')
no_prompt_err += become_output else:
no_prompt_out += become_output
no_prompt_err += become_output
except socket.timeout: except socket.timeout:
raise AnsibleError('ssh timed out waiting for privilege escalation.\n' + become_output) raise AnsibleError('ssh timed out waiting for privilege escalation.\n' + become_output)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment