Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
0a2a9557
Commit
0a2a9557
authored
Jul 01, 2015
by
Brian Coca
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
now allows for users to use ^D to not input a password
fixes #11413
parent
4fe2d7fc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
29 deletions
+35
-29
lib/ansible/cli/__init__.py
+35
-29
No files found.
lib/ansible/cli/__init__.py
View file @
0a2a9557
...
...
@@ -108,21 +108,24 @@ class CLI(object):
vault_pass
=
None
new_vault_pass
=
None
if
ask_vault_pass
:
vault_pass
=
getpass
.
getpass
(
prompt
=
"Vault password: "
)
if
ask_vault_pass
and
confirm_vault
:
vault_pass2
=
getpass
.
getpass
(
prompt
=
"Confirm Vault password: "
)
if
vault_pass
!=
vault_pass2
:
raise
errors
.
AnsibleError
(
"Passwords do not match"
)
if
ask_new_vault_pass
:
new_vault_pass
=
getpass
.
getpass
(
prompt
=
"New Vault password: "
)
if
ask_new_vault_pass
and
confirm_new
:
new_vault_pass2
=
getpass
.
getpass
(
prompt
=
"Confirm New Vault password: "
)
if
new_vault_pass
!=
new_vault_pass2
:
raise
errors
.
AnsibleError
(
"Passwords do not match"
)
try
:
if
ask_vault_pass
:
vault_pass
=
getpass
.
getpass
(
prompt
=
"Vault password: "
)
if
ask_vault_pass
and
confirm_vault
:
vault_pass2
=
getpass
.
getpass
(
prompt
=
"Confirm Vault password: "
)
if
vault_pass
!=
vault_pass2
:
raise
errors
.
AnsibleError
(
"Passwords do not match"
)
if
ask_new_vault_pass
:
new_vault_pass
=
getpass
.
getpass
(
prompt
=
"New Vault password: "
)
if
ask_new_vault_pass
and
confirm_new
:
new_vault_pass2
=
getpass
.
getpass
(
prompt
=
"Confirm New Vault password: "
)
if
new_vault_pass
!=
new_vault_pass2
:
raise
errors
.
AnsibleError
(
"Passwords do not match"
)
except
EOFError
:
pass
# enforce no newline chars at the end of passwords
if
vault_pass
:
...
...
@@ -141,20 +144,23 @@ class CLI(object):
becomepass
=
None
become_prompt
=
''
if
op
.
ask_pass
:
sshpass
=
getpass
.
getpass
(
prompt
=
"SSH password: "
)
become_prompt
=
"
%
s password[defaults to SSH password]: "
%
op
.
become_method
.
upper
()
if
sshpass
:
sshpass
=
to_bytes
(
sshpass
,
errors
=
'strict'
,
nonstring
=
'simplerepr'
)
else
:
become_prompt
=
"
%
s password: "
%
op
.
become_method
.
upper
()
if
op
.
become_ask_pass
:
becomepass
=
getpass
.
getpass
(
prompt
=
become_prompt
)
if
op
.
ask_pass
and
becomepass
==
''
:
becomepass
=
sshpass
if
becomepass
:
becomepass
=
to_bytes
(
becomepass
)
try
:
if
op
.
ask_pass
:
sshpass
=
getpass
.
getpass
(
prompt
=
"SSH password: "
)
become_prompt
=
"
%
s password[defaults to SSH password]: "
%
op
.
become_method
.
upper
()
if
sshpass
:
sshpass
=
to_bytes
(
sshpass
,
errors
=
'strict'
,
nonstring
=
'simplerepr'
)
else
:
become_prompt
=
"
%
s password: "
%
op
.
become_method
.
upper
()
if
op
.
become_ask_pass
:
becomepass
=
getpass
.
getpass
(
prompt
=
become_prompt
)
if
op
.
ask_pass
and
becomepass
==
''
:
becomepass
=
sshpass
if
becomepass
:
becomepass
=
to_bytes
(
becomepass
)
except
EOFError
:
pass
return
(
sshpass
,
becomepass
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment