Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions shib/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,11 @@ def main():
' Defaults to 1 hour / {0} seconds, min {1} max 12 hours / {2} '
'seconds.'.format(str(60*60),str(60*15),str(60*60*12)))
parser.add_argument('--storepass',
help='Store the password to the system keyring service and retrieve on following requests'
' If unset you will be prompted for password on every request',
help='Store the password to the system keyring service to allow for automatic retrieval'
' on following requests. If set, you will be prompted for a password that will then'
' be stored in the system keyring service. If unset, the script will attempt to retrieve'
' a previously stored password from the system keyring service and then prompt you for'
' a password if there is not a stored password.',
action='store_true')
parser.add_argument('--user',
help='Login as this user'
Expand Down Expand Up @@ -259,7 +262,7 @@ def main():
password = None
password_stored = False

if keyring is not None:
if keyring is not None and not args.storepass:
try:
password = keyring.get_password("aws-federated-auth", "password")
except Exception:
Expand Down