a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

now allows for users to use ^D to not input a password 

fixes #11413
pull/4420/head
Brian Coca 2015-07-01 05:21:46 -04:00
parent 4fe2d7fc8d
commit 0a2a9557b8
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/ansible/cli/__init__.py
View File

@ -108,21 +108,24 @@ class CLI(object):
vault_pass = None vault_pass = None
new_vault_pass = None new_vault_pass = None
if ask_vault_pass: try:
vault_pass = getpass.getpass(prompt="Vault password: ") if ask_vault_pass:
vault_pass = getpass.getpass(prompt="Vault password: ")
if ask_vault_pass and confirm_vault: if ask_vault_pass and confirm_vault:
vault_pass2 = getpass.getpass(prompt="Confirm Vault password: ") vault_pass2 = getpass.getpass(prompt="Confirm Vault password: ")
if vault_pass != vault_pass2: if vault_pass != vault_pass2:
raise errors.AnsibleError("Passwords do not match") raise errors.AnsibleError("Passwords do not match")
if ask_new_vault_pass: if ask_new_vault_pass:
new_vault_pass = getpass.getpass(prompt="New Vault password: ") new_vault_pass = getpass.getpass(prompt="New Vault password: ")
if ask_new_vault_pass and confirm_new: if ask_new_vault_pass and confirm_new:
new_vault_pass2 = getpass.getpass(prompt="Confirm New Vault password: ") new_vault_pass2 = getpass.getpass(prompt="Confirm New Vault password: ")
if new_vault_pass != new_vault_pass2: if new_vault_pass != new_vault_pass2:
raise errors.AnsibleError("Passwords do not match") raise errors.AnsibleError("Passwords do not match")
except EOFError:
pass
# enforce no newline chars at the end of passwords # enforce no newline chars at the end of passwords
if vault_pass: if vault_pass:
@ -141,20 +144,23 @@ class CLI(object):
becomepass = None becomepass = None
become_prompt = '' become_prompt = ''
if op.ask_pass: try:
sshpass = getpass.getpass(prompt="SSH password: ") if op.ask_pass:
become_prompt = "%s password[defaults to SSH password]: " % op.become_method.upper() sshpass = getpass.getpass(prompt="SSH password: ")
if sshpass: become_prompt = "%s password[defaults to SSH password]: " % op.become_method.upper()
sshpass = to_bytes(sshpass, errors='strict', nonstring='simplerepr') if sshpass:
else: sshpass = to_bytes(sshpass, errors='strict', nonstring='simplerepr')
become_prompt = "%s password: " % op.become_method.upper() else:
become_prompt = "%s password: " % op.become_method.upper()
if op.become_ask_pass: if op.become_ask_pass:
becomepass = getpass.getpass(prompt=become_prompt) becomepass = getpass.getpass(prompt=become_prompt)
if op.ask_pass and becomepass == '': if op.ask_pass and becomepass == '':
becomepass = sshpass becomepass = sshpass
if becomepass: if becomepass:
becomepass = to_bytes(becomepass) becomepass = to_bytes(becomepass)
except EOFError:
pass
return (sshpass, becomepass) return (sshpass, becomepass)