62d07833db
The swauth tools did not handle an invalid admin_url, so it just failed printing the stacktrace, which is not useful to end users. This fix catches the exception and prints an error message that can help user solve the issue. Change-Id: I806c1cf191b5921e904b155f65cdbde5f2aac695 Signed-off-by: Thiago da Silva <thiago@redhat.com> Reviewed-on: http://review.gluster.org/6431 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
76 lines
2.9 KiB
Python
Executable File
76 lines
2.9 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# Copyright (c) 2010-2011 OpenStack, LLC.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import gettext
|
|
import socket
|
|
|
|
from optparse import OptionParser
|
|
from sys import argv, exit
|
|
|
|
from swift.common.bufferedhttp import http_connect_raw as http_connect
|
|
from swift.common.utils import urlparse
|
|
|
|
|
|
if __name__ == '__main__':
|
|
gettext.install('gswauth', unicode=1)
|
|
parser = OptionParser(usage='Usage: %prog [options]')
|
|
parser.add_option('-A', '--admin-url', dest='admin_url',
|
|
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 '
|
|
'(default: .super_admin).')
|
|
parser.add_option('-K', '--admin-key', dest='admin_key',
|
|
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' %
|
|
(parsed.scheme, repr(options.admin_url)))
|
|
parsed_path = parsed.path
|
|
if not parsed_path:
|
|
parsed_path = '/'
|
|
elif parsed_path[-1] != '/':
|
|
parsed_path += '/'
|
|
path = '%sv2/.prep' % parsed_path
|
|
headers = {'X-Auth-Admin-User': options.admin_user,
|
|
'X-Auth-Admin-Key': options.admin_key}
|
|
try:
|
|
conn = http_connect(parsed.hostname, parsed.port, 'POST', path, headers,
|
|
ssl=(parsed.scheme == 'https'))
|
|
resp = conn.getresponse()
|
|
except socket.gaierror, err:
|
|
exit('gswauth preparation failed: %s. ' \
|
|
'Check that the admin_url is valid' % err)
|
|
except socket.error, (errno, msg):
|
|
exit('gswauth preparation failed: %s. ' \
|
|
'Check that the admin_url is valid' % msg)
|
|
|
|
if resp.status // 100 != 2:
|
|
if resp.status == 401:
|
|
exit('gswauth preparation failed: %s %s: Invalid user/key provided' %
|
|
(resp.status, resp.reason))
|
|
else:
|
|
exit('gswauth preparation failed: %s %s' %
|
|
(resp.status, resp.reason))
|