cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-09 23:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: API (apikeys) behaviour does not match swagger definition (#868)

Browse Source
This commit is contained in:
jbe-dw 2021-01-24 09:06:51 +01:00 committed by GitHub
parent 54b257768f
commit 3cd98251b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
powerdnsadmin/routes/api.py
View File

@ -294,13 +294,23 @@ def api_generate_apikey():
apikey = None apikey = None
domain_obj_list = [] domain_obj_list = []
abort(400) if 'domains' not in data else None
abort(400) if not isinstance(data['domains'], (list, )) else None
abort(400) if 'role' not in data else None abort(400) if 'role' not in data else None
if 'domains' not in data:
domains = []
elif not isinstance(data['domains'], (list, )):
abort(400)
else:
domains = [d['name'] if isinstance(d, dict) else d for d in data['domains']]
description = data['description'] if 'description' in data else None description = data['description'] if 'description' in data else None
if isinstance(data['role'], str):
role_name = data['role'] role_name = data['role']
domains = data['domains'] elif isinstance(data['role'], dict) and 'name' in data['role'].keys():
role_name = data['role']['name']
else:
abort(400)
if role_name == 'User' and len(domains) == 0: if role_name == 'User' and len(domains) == 0:
current_app.logger.error("Apikey with User role must have domains") current_app.logger.error("Apikey with User role must have domains")
@ -347,7 +357,7 @@ def api_generate_apikey():
current_app.logger.error('Error: {0}'.format(e)) current_app.logger.error('Error: {0}'.format(e))
raise ApiKeyCreateFail(message='Api key create failed') raise ApiKeyCreateFail(message='Api key create failed')
return jsonify(apikey_plain_schema.dump([apikey])), 201 return jsonify(apikey_plain_schema.dump([apikey])[0]), 201
@api_bp.route('/pdnsadmin/apikeys', defaults={'domain_name': None}) @api_bp.route('/pdnsadmin/apikeys', defaults={'domain_name': None})
@ -453,10 +463,25 @@ def api_update_apikey(apikey_id):
# that domains update domains # that domains update domains
data = request.get_json() data = request.get_json()
description = data['description'] if 'description' in data else None description = data['description'] if 'description' in data else None
role_name = data['role'] if 'role' in data else None
domains = data['domains'] if 'domains' in data else None
domain_obj_list = None domain_obj_list = None
if 'role' in data:
if isinstance(data['role'], str):
role_name = data['role']
elif isinstance(data['role'], dict) and 'name' in data['role'].keys():
role_name = data['role']['name']
else:
abort(400)
else:
role_name = None
if 'domains' not in data:
domains = None
elif not isinstance(data['domains'], (list, )):
abort(400)
else:
domains = [d['name'] if isinstance(d, dict) else d for d in data['domains']]
apikey = ApiKey.query.get(apikey_id) apikey = ApiKey.query.get(apikey_id)
if not apikey: if not apikey: