diff options
Diffstat (limited to 'gluster/swift/common/middleware/gswauth/bin')
8 files changed, 35 insertions, 15 deletions
diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account index fcad757..37064ae 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-account @@ -30,16 +30,18 @@ if __name__ == '__main__': default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/)') parser.add_option('-U', '--admin-user', dest='admin_user', - default='.super_admin', help='The user with admin rights to add users ' - '(default: .super_admin).') + default='.super_admin', help='The user with admin rights to add ' + 'accounts (default: .super_admin).') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for the user with admin rights to add users.') + help='The key for the user with admin rights is required.') args = argv[1:] if not args: args.append('-h') (options, args) = parser.parse_args(args) if len(args) != 1: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) account = args[0] parsed = urlparse(options.admin_url) if parsed.scheme not in ('http', 'https'): diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user index 78af60d..a6de161 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-add-user @@ -43,13 +43,15 @@ if __name__ == '__main__': default='.super_admin', help='The user with admin rights to add users ' '(default: .super_admin).') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for the user with admin rights to add users.') + help='The key for the user with admin rights to add users is required.') args = argv[1:] if not args: args.append('-h') (options, args) = parser.parse_args(args) if len(args) != 3: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) account, user, password = args parsed = urlparse(options.admin_url) if parsed.scheme not in ('http', 'https'): diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens index 621124e..cc2d18d 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-cleanup-tokens @@ -44,7 +44,7 @@ if __name__ == '__main__': default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/)') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for .super_admin.') + help='The key for .super_admin is required.') parser.add_option('', '--purge', dest='purge_account', help='Purges all ' 'tokens for a given account whether the tokens have expired or not.') parser.add_option('', '--purge-all', dest='purge_all', action='store_true', @@ -56,6 +56,8 @@ if __name__ == '__main__': (options, args) = parser.parse_args(args) if len(args) != 0: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) options.admin_url = options.admin_url.rstrip('/') if not options.admin_url.endswith('/v1.0'): options.admin_url += '/v1.0' diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account index be8ace8..b1440f4 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-account @@ -30,16 +30,20 @@ if __name__ == '__main__': default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/') parser.add_option('-U', '--admin-user', dest='admin_user', - default='.super_admin', help='The user with admin rights to add users ' + default='.super_admin', + help='The user with admin rights to delete accounts ' '(default: .super_admin).') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for the user with admin rights to add users.') + help='The key for the user with admin rights to delete accounts ' + 'is required.') args = argv[1:] if not args: args.append('-h') (options, args) = parser.parse_args(args) if len(args) != 1: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) account = args[0] parsed = urlparse(options.admin_url) if parsed.scheme not in ('http', 'https'): diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user index 2b4f4fe..f778603 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-delete-user @@ -30,16 +30,20 @@ if __name__ == '__main__': default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/') parser.add_option('-U', '--admin-user', dest='admin_user', - default='.super_admin', help='The user with admin rights to add users ' + default='.super_admin', + help='The user with admin rights to delete users ' '(default: .super_admin).') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for the user with admin rights to add users.') + help='The key for the user with admin rights to delete ' + 'users is required.') args = argv[1:] if not args: args.append('-h') (options, args) = parser.parse_args(args) if len(args) != 2: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) account, user = args parsed = urlparse(options.admin_url) if parsed.scheme not in ('http', 'https'): diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-list b/gluster/swift/common/middleware/gswauth/bin/gswauth-list index 23175e9..4f2d834 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-list +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-list @@ -55,16 +55,18 @@ If the [user] is '.groups', the active groups for the account will be listed. default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/') parser.add_option('-U', '--admin-user', dest='admin_user', - default='.super_admin', help='The user with admin rights to add users ' + default='.super_admin', help='The user with admin rights ' '(default: .super_admin).') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for the user with admin rights to add users.') + help='The key for the user with admin rights is required.') args = argv[1:] if not args: args.append('-h') (options, args) = parser.parse_args(args) if len(args) > 2: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) parsed = urlparse(options.admin_url) if parsed.scheme not in ('http', 'https'): raise Exception('Cannot handle protocol scheme %s for url %s' % diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-prep b/gluster/swift/common/middleware/gswauth/bin/gswauth-prep index 74071d5..d153719 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-prep +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-prep @@ -30,16 +30,18 @@ if __name__ == '__main__': default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/') parser.add_option('-U', '--admin-user', dest='admin_user', - default='.super_admin', help='The user with admin rights to add users ' + default='.super_admin', help='The user with admin rights ' '(default: .super_admin).') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for the user with admin rights to add users.') + help='The key for the user with admin rights is required.') args = argv[1:] if not args: args.append('-h') (options, args) = parser.parse_args(args) if args: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) parsed = urlparse(options.admin_url) if parsed.scheme not in ('http', 'https'): raise Exception('Cannot handle protocol scheme %s for url %s' % diff --git a/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service b/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service index b78524d..5be8319 100755 --- a/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service +++ b/gluster/swift/common/middleware/gswauth/bin/gswauth-set-account-service @@ -40,16 +40,18 @@ Example: %prog -K gswauthkey test storage local http://127.0.0.1:8080/v1/AUTH_01 default='http://127.0.0.1:8080/auth/', help='The URL to the auth ' 'subsystem (default: http://127.0.0.1:8080/auth/)') parser.add_option('-U', '--admin-user', dest='admin_user', - default='.super_admin', help='The user with admin rights to add users ' + default='.super_admin', help='The user with admin rights ' '(default: .super_admin).') parser.add_option('-K', '--admin-key', dest='admin_key', - help='The key for the user with admin rights to add users.') + help='The key for the user with admin rights is required.') args = argv[1:] if not args: args.append('-h') (options, args) = parser.parse_args(args) if len(args) != 4: parser.parse_args(['-h']) + if options.admin_key is None: + parser.parse_args(['-h']) account, service, name, url = args parsed = urlparse(options.admin_url) if parsed.scheme not in ('http', 'https'): |