admin/registry-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(bearer_request): support GET as auth-method + make 'service' and 'scope' optional arguments to auth request

Browse Source
This commit is contained in:
Vishal Shah
2018-12-26 14:45:09 -05:00
parent 9d5fab2eab
commit f4ba381575
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
registry.py
View File

@@ -79,17 +79,25 @@ class Requests:
pprint.pprint(oauth['bearer']) pprint.pprint(oauth['bearer'])
# print('[info] retreiving bearer token for {0}'.format(oauth['bearer']['scope'])) # print('[info] retreiving bearer token for {0}'.format(oauth['bearer']['scope']))
request_url = '{0}?service={1}&scope={2}'.format(oauth['bearer']['realm'], request_url = '{0}'.format(oauth['bearer']['realm'])
oauth['bearer']['service'], query_separator = '?'
oauth['bearer']['scope']) if 'service' in oauth['bearer']:
request_url += '{0}service={1}'.format(query_separator, oauth['bearer']['service'])
query_separator = '&'
if 'scope' in oauth['bearer']:
request_url += '{0}scope={1}'.format(query_separator, oauth['bearer']['scope'])
if DEBUG: if DEBUG:
print('[debug][auth][request] Refreshing auth token: POST {0}'.format(request_url)) print('[debug][auth][request] Refreshing auth token: POST {0}'.format(request_url))
try_oauth = requests.post(request_url, auth=auth, **kwargs) if args.auth_method == 'GET':
try_oauth = requests.get(request_url, auth=auth, **kwargs)
else:
try_oauth = requests.post(request_url, auth=auth, **kwargs)
try: try:
token = ast.literal_eval(try_oauth._content)['token'] oauth_response = ast.literal_eval(try_oauth._content.decode('utf-8'))
token = oauth_response['access_token'] if 'access_token' in oauth_response else oauth_response['token']
except SyntaxError: except SyntaxError:
print('\n\n[ERROR] couldnt accure token: {0}'.format(try_oauth._content)) print('\n\n[ERROR] couldnt accure token: {0}'.format(try_oauth._content))
sys.exit(1) sys.exit(1)
@@ -532,7 +540,12 @@ for more detail on garbage collection read here:
default='HEAD', default='HEAD',
metavar="HEAD|GET" metavar="HEAD|GET"
) )
parser.add_argument(
'--auth-method',
help=('Use POST or GET to get JWT tokens'),
default='POST',
metavar="POST|GET"
)
return parser.parse_args(args) return parser.parse_args(args)