To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 73ef9193 authored by Alexander Dietmüller's avatar Alexander Dietmüller
Browse files

Backend: Consistent function returns for security.py

parent 74220165
...@@ -34,8 +34,7 @@ def api_get(endpoint, **params): ...@@ -34,8 +34,7 @@ def api_get(endpoint, **params):
formatted = {key: json.dumps(value) for (key, value) in params.items()} formatted = {key: json.dumps(value) for (key, value) in params.items()}
response = requests.get(url, params=formatted, headers=headers) response = requests.get(url, params=formatted, headers=headers)
if response.status_code == 200: return response.json() if (response.status_code == 200) else None
return response.json()
def request_cache(key): def request_cache(key):
...@@ -64,6 +63,7 @@ def get_user(): ...@@ -64,6 +63,7 @@ def get_user():
) )
if response: if response:
return response['_items'][0]['user'] return response['_items'][0]['user']
return None
@request_cache('nethz') @request_cache('nethz')
...@@ -72,6 +72,7 @@ def get_nethz(): ...@@ -72,6 +72,7 @@ def get_nethz():
if get_user() is not None: if get_user() is not None:
response = api_get('users/' + get_user()) response = api_get('users/' + get_user())
return response.get('nethz') return response.get('nethz')
return None
@request_cache('admin') @request_cache('admin')
...@@ -111,7 +112,7 @@ def is_admin(): ...@@ -111,7 +112,7 @@ def is_admin():
class APIAuth(TokenAuth): class APIAuth(TokenAuth):
"""Verifies the request token with AMIVAPI.""" """Verifies the request token with AMIVAPI."""
def check_auth(self, token, allowed_roles, resource, method): def check_auth(self, token, _, resource, method):
"""Allow request if token exists in AMIVAPI. """Allow request if token exists in AMIVAPI.
Furthermore, grant admin rights if the user is member of the Furthermore, grant admin rights if the user is member of the
...@@ -135,8 +136,9 @@ class APIAuth(TokenAuth): ...@@ -135,8 +136,9 @@ class APIAuth(TokenAuth):
if method in allowed_methods or is_admin(): if method in allowed_methods or is_admin():
return True return True
else:
abort(403) abort(403)
return False
# Dynamic Visibility Filter # Dynamic Visibility Filter
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment