ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

centralized bad password handling, fixed outputing of become method

Browse source
This commit is contained in:
Brian Coca 2015-06-15 01:40:53 -04:00
parent b89071e485
commit 1ce1c52f6f
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/plugins/connections/__init__.py
View file

@ -130,5 +130,6 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
def check_incorrect_password(self, output, prompt): def check_incorrect_password(self, output, prompt):
incorrect_password = gettext.dgettext(self._connection_info.become_method, C.BECOME_ERROR_STRINGS[self._connection_info.become_method]) incorrect_password = gettext.dgettext(self._connection_info.become_method, C.BECOME_ERROR_STRINGS[self._connection_info.become_method])
return output.endswith(incorrect_password) if output.endswith(incorrect_password):
raise AnsibleError('Incorrect %s password' % self._connection_info.become_method)

9
lib/ansible/plugins/connections/ssh.py
View file

@ -174,9 +174,7 @@ class Connection(ConnectionBase):
# fail early if the become password is wrong # fail early if the become password is wrong
if self._connection_info.become and sudoable: if self._connection_info.become and sudoable:
if self._connection_info.become_pass: if self._connection_info.become_pass:
if self.check_incorrect_password(stdout, prompt): self.check_incorrect_password(stdout, prompt)
raise AnsibleError('Incorrect %s password', self._connection_info.become_method)
elif self.check_password_prompt(stdout, prompt): elif self.check_password_prompt(stdout, prompt):
raise AnsibleError('Missing %s password', self._connection_info.become_method) raise AnsibleError('Missing %s password', self._connection_info.become_method)
@ -324,7 +322,7 @@ class Connection(ConnectionBase):
while True: while True:
if self.check_become_success(become_output, success_key) or \ if self.check_become_success(become_output, success_key) or \
self.check_password_prompt(become_output, prompt ): self.check_password_prompt(become_output, prompt):
break break
rfd, wfd, efd = select.select([p.stdout, p.stderr], [], [p.stdout], self._connection_info.timeout) rfd, wfd, efd = select.select([p.stdout, p.stderr], [], [p.stdout], self._connection_info.timeout)
if p.stderr in rfd: if p.stderr in rfd:
@ -333,8 +331,7 @@ class Connection(ConnectionBase):
raise AnsibleError('ssh connection closed waiting for privilege escalation password prompt') raise AnsibleError('ssh connection closed waiting for privilege escalation password prompt')
become_errput += chunk become_errput += chunk
if self.check_incorrect_password(become_errput, prompt): self.check_incorrect_password(become_errput, prompt)
raise AnsibleError('Incorrect %s password', self._connection_info.become_method)
if p.stdout in rfd: if p.stdout in rfd:
chunk = p.stdout.read() chunk = p.stdout.read()