internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix password prompt matching (#24081)

Browse Source 
* Fix password prompt matching

* Add some tests for check_password_prompt

* Prevent pep8 line ends with a space error
This commit is contained in:
Matt Martz
2017-05-01 10:18:15 -05:00
committed by Brian Coca
parent d8f76bed97
commit 040fb4435a
2 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/plugins/connection/__init__.py
View File

@@ -254,10 +254,8 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
return False
elif isinstance(self._play_context.prompt, string_types):
b_prompt = to_bytes(self._play_context.prompt).strip()
b_lines = b_output.splitlines(True)
if not b_lines:
return False
return b_lines[-1].strip().endswith(b_prompt) or b_lines[0].strip().endswith(b_prompt)
b_lines = b_output.splitlines()
return any(l.strip().startswith(b_prompt) for l in b_lines)
else:
return self._play_context.prompt(b_output)