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

Better vault pass prompt behav on EOF, more unit tests (#27981)

Browse Source
This commit is contained in:
Adrian Likins
2017-08-10 09:34:57 -04:00
committed by GitHub
parent 82f550e8cd
commit 220db9cdd2
2 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/parsing/vault/__init__.py
View File

@@ -263,7 +263,7 @@ class PromptVaultSecret(VaultSecret):
try:
vault_pass = display.prompt(prompt, private=True)
except EOFError:
pass
break
b_vault_pass = to_bytes(vault_pass, errors='strict', nonstring='simplerepr').strip()
b_vault_passwords.append(b_vault_pass)
@@ -358,10 +358,10 @@ class ScriptVaultSecret(FileVaultSecret):
raise AnsibleError(msg)
stdout, dummy = p.communicate()
stdout, stderr = p.communicate()
if p.returncode != 0:
raise AnsibleError("Vault password script %s returned non-zero (%s): %s" % (filename, p.returncode, p.stderr))
raise AnsibleError("Vault password script %s returned non-zero (%s): %s" % (filename, p.returncode, stderr))
vault_pass = stdout.strip(b'\r\n')
return vault_pass