ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #14400 from d3matt/FIX/paramiko_lecture

Browse source 
paramiko transport appears to hang if it gets a sudo lecture
This commit is contained in:
James Cammarata 2016-04-19 13:31:17 -04:00
commit f32592f092
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/plugins/connection/paramiko_ssh.py
View file

@ -282,13 +282,9 @@ class Connection(ConnectionBase):
chan.exec_command(cmd) chan.exec_command(cmd)
if self._play_context.prompt: if self._play_context.prompt:
passprompt = False passprompt = False
while True: become_sucess = False
while not (become_sucess or passprompt):
display.debug('Waiting for Privilege Escalation input') display.debug('Waiting for Privilege Escalation input')
if self.check_become_success(become_output):
break
elif self.check_password_prompt(become_output):
passprompt = True
break
chunk = chan.recv(bufsize) chunk = chan.recv(bufsize)
display.debug("chunk is: %s" % chunk) display.debug("chunk is: %s" % chunk)
@ -299,6 +295,17 @@ class Connection(ConnectionBase):
break break
#raise AnsibleError('ssh connection closed waiting for password prompt') #raise AnsibleError('ssh connection closed waiting for password prompt')
become_output += chunk become_output += chunk
# need to check every line because we might get lectured
# and we might get the middle of a line in a chunk
for l in become_output.splitlines(True):
if self.check_become_success(l):
become_sucess = True
break
elif self.check_password_prompt(l):
passprompt = True
break
if passprompt: if passprompt:
if self._play_context.become and self._play_context.become_pass: if self._play_context.become and self._play_context.become_pass:
chan.sendall(self._play_context.become_pass + '\n') chan.sendall(self._play_context.become_pass + '\n')