Commit 0a2a9557 by Brian Coca

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

fixes #11413
parent 4fe2d7fc
...@@ -108,6 +108,7 @@ class CLI(object): ...@@ -108,6 +108,7 @@ class CLI(object):
vault_pass = None vault_pass = None
new_vault_pass = None new_vault_pass = None
try:
if ask_vault_pass: if ask_vault_pass:
vault_pass = getpass.getpass(prompt="Vault password: ") vault_pass = getpass.getpass(prompt="Vault password: ")
...@@ -123,6 +124,8 @@ class CLI(object): ...@@ -123,6 +124,8 @@ class CLI(object):
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,6 +144,7 @@ class CLI(object): ...@@ -141,6 +144,7 @@ class CLI(object):
becomepass = None becomepass = None
become_prompt = '' become_prompt = ''
try:
if op.ask_pass: if op.ask_pass:
sshpass = getpass.getpass(prompt="SSH password: ") sshpass = getpass.getpass(prompt="SSH password: ")
become_prompt = "%s password[defaults to SSH password]: " % op.become_method.upper() become_prompt = "%s password[defaults to SSH password]: " % op.become_method.upper()
...@@ -155,6 +159,8 @@ class CLI(object): ...@@ -155,6 +159,8 @@ class CLI(object):
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment