diff --git a/nomad/api/app.py b/nomad/api/app.py
index 40936cc62fab571fa1c0290ca12c93f094ba28c8..14f65dc308ee7f0b4c29655e02de1edf5541130b 100644
--- a/nomad/api/app.py
+++ b/nomad/api/app.py
@@ -26,6 +26,8 @@ import inspect
from datetime import datetime
import pytz
import random
+from flask_oidc import OpenIDConnect
+import json
from nomad import config, utils
@@ -59,6 +61,24 @@ app.config.RESTPLUS_MASK_SWAGGER = False # type: ignore
app.config.SWAGGER_UI_OPERATION_ID = True # type: ignore
app.config.SWAGGER_UI_REQUEST_DURATION = True # type: ignore
+oidc_issuer_url = '%s/realms/%s' % (config.keycloak.server_url.rstrip('/'), config.keycloak.realm_name)
+oidc_client_secrets = dict(
+ client_id=config.keycloak.client_id,
+ client_secret=config.keycloak.client_secret_key,
+ issuer=oidc_issuer_url,
+ auth_uri='%s/protocol/openid-connect/auth' % oidc_issuer_url,
+ token_uri='%s/protocol/openid-connect/token' % oidc_issuer_url,
+ userinfo_uri='%s/protocol/openid-connect/userinfo' % oidc_issuer_url,
+ token_introspection_uri='%s/protocol/openid-connect/token/introspect' % oidc_issuer_url,
+ redirect_uris=['http://localhost/fairdi/nomad/latest'])
+oidc_client_secrets_file = os.path.join(config.fs.tmp, 'oidc_client_secrets')
+with open(oidc_client_secrets_file, 'wt') as f:
+ json.dump(dict(web=oidc_client_secrets), f)
+app.config.update(dict(
+ SECRET_KEY=config.services.api_secret,
+ OIDC_CLIENT_SECRETS=oidc_client_secrets_file,
+ OIDC_OPENID_REALM=config.keycloak.realm_name))
+
def api_base_path_response(env, resp):
resp('200 OK', [('Content-Type', 'text/plain')])
@@ -70,6 +90,7 @@ def api_base_path_response(env, resp):
app.wsgi_app = DispatcherMiddleware( # type: ignore
api_base_path_response, {config.services.api_base_path: app.wsgi_app})
+oidc = OpenIDConnect(app)
CORS(app)
diff --git a/nomad/api/auth.py b/nomad/api/auth.py
index 94093427bc45be487c7a13f22ea1f041784adaa2..d6a2903d6b7a0f4e5ec872b671d63296b30e9707 100644
--- a/nomad/api/auth.py
+++ b/nomad/api/auth.py
@@ -13,77 +13,111 @@
# limitations under the License.
"""
-Endpoints can use *flask_httpauth* based authentication either with basic HTTP
-authentication or access tokens. Currently the authentication is validated against
-users and sessions in the NOMAD-coe repository postgres db.
-
-There are two authentication "schemes" to authenticate users. First we use
-HTTP Basic Authentication (username, password), which also works with username=token,
-password=''. Second, there is a curstom HTTP header 'X-Token' that can be used to
-give a token. The first precedes the second. The used tokens are given and stored
-by the NOMAD-coe repository GUI.
+The API is protected with *keycloak* and *OpenIDConnect*. All API endpoints that require
+or support authentication accept OIDC bearer tokens via HTTP header (``Authentication``,
+recommended), query (``access_token``), or form parameter (``access_token``). These
+token can be acquired from the NOMAD keycloak server or through the ``/auth`` endpoint
+that also supports HTTP Basic authentication and passes the given credentials to
+keycloak.
Authenticated user information is available via FLASK's build in flask.g.user object.
It is set to None, if no user information is available.
-There are two decorators for FLASK API endpoints that can be used if endpoints require
-authenticated user information for authorization or otherwise.
+There are three decorators for FLASK API endpoints that can be used to protect
+endpoints that require or support authentication.
.. autofunction:: login_if_available
.. autofunction:: login_really_required
+.. autofunction:: admin_login_required
"""
+from typing import Tuple
from flask import g, request
from flask_restplus import abort, Resource, fields
-from flask_httpauth import HTTPBasicAuth
from datetime import datetime
+import functools
+import basicauth
-from nomad import config, processing, files, utils, coe_repo
-from nomad.coe_repo import User, LoginException
+from nomad import config, processing, files, utils, coe_repo, infrastructure
+from nomad.coe_repo import LoginException
-from .app import app, api, RFC3339DateTime
+from .app import api, RFC3339DateTime, oidc
-app.config['SECRET_KEY'] = config.services.api_secret
-auth = HTTPBasicAuth()
+class User:
+ """
+ A data class that holds all information for a single user. This can be the logged in
+ and authenticated user, or other users (i.e. co-authors, etc.).
+ """
+ def __init__(
+ self, email, name=None, first_name='', last_name='', affiliation=None,
+ created: datetime = None, **kwargs):
+ assert email is not None, 'Users must have an email, it is used as unique id'
+
+ self.email = email
+
+ first_name = kwargs.get('firstName', first_name)
+ last_name = kwargs.get('lastName', last_name)
+ name = kwargs.get('username', name)
+ created_timestamp = kwargs.get('createdTimestamp', None)
+
+ if len(last_name) > 0 and len(first_name) > 0:
+ name = '%s, %s' % (last_name, first_name)
+ elif len(last_name) != 0:
+ name = last_name
+ elif len(first_name) != 0:
+ name = first_name
+ elif name is None:
+ name = 'unnamed user'
+
+ self.name = name
+
+ if created is not None:
+ self.created = None
+ elif created_timestamp is not None:
+ self.created = datetime.fromtimestamp(created_timestamp)
+ else:
+ self.created = None
-# Authentication scheme definitions, for swagger only.
-api.authorizations = {
- 'HTTP Basic': {
- 'type': 'basic'
- },
- 'X-Token': {
- 'type': 'apiKey',
- 'in': 'header',
- 'name': 'X-Token'
- }
-}
+ # TODO affliation
-@auth.verify_password
-def verify_password(username_or_token, password):
- if username_or_token is None or username_or_token == '':
- g.user = None
- return True
+def _validate_token(require_token: bool = True, **kwargs) -> Tuple[bool, str]:
+ """
+ Uses OIDC to check if the request carries token based authentication and if
+ this authentication is valid.
- if password is None or password == '':
- g.user = User.verify_auth_token(username_or_token)
- return g.user is not None
- else:
- try:
- g.user = User.verify_user_password(username_or_token, password)
- except LoginException:
- return False
- except Exception as e:
- utils.get_logger(__name__).error('could not verify password', exc_info=e)
- return False
+ Returns: A tuple with bool and potential error message
+ """
+ token = None
+ if 'Authorization' in request.headers and request.headers['Authorization'].startswith('Bearer '):
+ token = request.headers['Authorization'].split(None, 1)[1].strip()
+ if 'access_token' in request.form:
+ token = request.form['access_token']
+ elif 'access_token' in request.args:
+ token = request.args['access_token']
+
+ validity = oidc.validate_token(token, **kwargs)
+
+ if validity:
+ g.oidc_id_token = g.oidc_token_info
- return g.user is not None
+ return (validity is True) or (not require_token), validity
-@auth.error_handler
-def auth_error_handler():
- abort(401, 'Could not authenticate user, bad credentials')
+def _get_user():
+ """
+ Retrieves OIDC user info and populate the global flask ``g.user`` variable.
+ """
+ if g.oidc_id_token:
+ try:
+ g.user = User(**oidc.user_getinfo([
+ 'email', 'firstName', 'lastName', 'username', 'createdTimestamp']))
+ except Exception as e:
+ ## TODO logging
+ raise e
+ else:
+ g.user = None
def login_if_available(func):
@@ -91,22 +125,17 @@ def login_if_available(func):
A decorator for API endpoint implementations that might authenticate users, but
provide limited functionality even without users.
"""
+ @functools.wraps(func)
@api.response(401, 'Not authorized, some data require authentication and authorization')
- @api.doc(security=list(api.authorizations.keys()))
- @auth.login_required
+ @api.doc(security=list('OpenIDConnect Bearer Token'))
def wrapper(*args, **kwargs):
- # TODO the cutom X-Token based authentication should be replaced by a real
- # Authentication header based token authentication
- if not g.user and 'X-Token' in request.headers:
- token = request.headers['X-Token']
- g.user = User.verify_auth_token(token)
- if not g.user:
- abort(401, message='Not authorized, some data require authentication and authorization')
-
- return func(*args, **kwargs)
+ valid, msg = _validate_token(require_token=False)
+ if valid:
+ _get_user()
+ return func(*args, **kwargs)
+ else:
+ abort(401, message=msg)
- wrapper.__name__ = func.__name__
- wrapper.__doc__ = func.__doc__
return wrapper
@@ -115,16 +144,17 @@ def login_really_required(func):
A decorator for API endpoint implementations that forces user authentication on
endpoints.
"""
- @api.response(401, 'Authentication required or not authorized to access requested data')
- @api.doc(security=list(api.authorizations.keys()))
- @login_if_available
+ @functools.wraps(func)
+ @api.response(401, 'Not authorized, this endpoint required authorization')
+ @api.doc(security=list('OpenIDConnect Bearer Token'))
def wrapper(*args, **kwargs):
- if g.user is None:
- abort(401, message='Authentication required or not authorized to access requested data')
- else:
+ valid, msg = _validate_token(require_token=True)
+ if valid:
+ _get_user()
return func(*args, **kwargs)
- wrapper.__name__ = func.__name__
- wrapper.__doc__ = func.__doc__
+ else:
+ abort(401, message=msg)
+
return wrapper
@@ -132,17 +162,16 @@ def admin_login_required(func):
"""
A decorator for API endpoint implementations that should only work for the admin user.
"""
+ @functools.wraps(func)
@api.response(401, 'Authentication required or not authorized as admin user. Only admin can access this endpoint.')
- @api.doc(security=list(api.authorizations.keys()))
- @login_really_required
+ @api.doc(security=list('OpenIDConnect Bearer Token'))
+ @oidc.accept_token(require_token=True)
def wrapper(*args, **kwargs):
- if not g.user.is_admin:
- abort(401, message='Only the admin user can perform reset.')
- else:
+ if oidc.user_getfield('email') == config.keycloak.adminEmail:
return func(*args, **kwargs)
+ else:
+ abort(401, message='Only the admin user can perform reset.')
- wrapper.__name__ = func.__name__
- wrapper.__doc__ = func.__doc__
return wrapper
@@ -167,40 +196,51 @@ user_model = api.model('User', {
})
-@ns.route('/user')
-class UserResource(Resource):
- @api.doc('get_user')
- @api.marshal_with(user_model, skip_none=True, code=200, description='User data send')
- @login_really_required
+@ns.route('/')
+class AuthResource(Resource):
+ @api.doc('get_token')
+ @api.marshal_with(user_model, skip_none=True, code=200, description='User info send')
+ @login_if_available
def get(self):
- """
- Get user information including a long term access token for the authenticated user.
-
- You can use basic authentication to access this endpoint and receive a
- token for further api access. This token will expire at some point and presents
- a more secure method of authentication.
- """
- try:
+ if g.user is not None:
return g.user
- except LoginException:
- abort(
- 401,
- message='User not logged in, provide credentials via Basic HTTP authentication.')
+ if 'Authorization' in request.headers and request.headers['Authorization'].startswith('Basic '):
+ try:
+ username, password = basicauth.decode(request.headers['Authorization'])
+ token = infrastructure.keycloak_oidc_client.token(username=username, password=password)
+ validity = oidc.validate_token(token['access_token'])
+ except Exception as e:
+ # TODO logging
+ abort(401, message='Could not authenticate Basic auth: %s' % str(e))
+
+ if validity is not True:
+ abort(401, message=validity)
+ else:
+ g.oidc_id_token = g.oidc_token_info
+ _get_user()
+ else:
+ abort(401, message='Authentication credentials found in your request')
+
+ if g.user is None:
+ abort(401, message='User not authenticated')
+
+ return g.user
+
+
+@ns.route('/user')
+class UserResource(Resource):
@api.doc('create_user')
@api.expect(user_model)
@api.response(400, 'Invalid user data')
@api.marshal_with(user_model, skip_none=True, code=200, description='User created')
- @login_really_required
+ @admin_login_required
def put(self):
"""
Creates a new user account. Currently only the admin user is allows. The
NOMAD-CoE repository GUI should be used to create user accounts for now.
Passwords have to be encrypted by the client with bcrypt and 2y indent.
"""
- if not g.user.is_admin:
- abort(401, message='Only the admin user can perform create user.')
-
data = request.get_json()
if data is None:
data = {}
@@ -222,27 +262,6 @@ class UserResource(Resource):
return user, 200
- @api.doc('update_user')
- @api.expect(user_model)
- @api.response(400, 'Invalid user data')
- @api.marshal_with(user_model, skip_none=True, code=200, description='User updated')
- @login_really_required
- def post(self):
- """
- Allows to edit the authenticated user and change his password. Password
- have to be encrypted by the client with bcrypt and 2y indent.
- """
- data = request.get_json()
- if data is None:
- data = {}
-
- if 'email' in data:
- abort(400, message='Cannot change the users email.')
-
- g.user.update(crypted=True, **data)
-
- return g.user, 200
-
token_model = api.model('Token', {
'user': fields.Nested(user_model),
diff --git a/nomad/config.py b/nomad/config.py
index daa6808c76152f5caab89032f0fbd7fc7d4f22e6..672ac5a8c5a7c22bf617d58f05205d3aef480306 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -129,7 +129,7 @@ keycloak = NomadConfig(
realm_name='fairdi_nomad_test',
username='admin',
password='password',
- client_id='nomad_api',
+ client_id='nomad_api_dev',
client_secret_key='0f9ec82f-a1dc-4405-a80e-593160aeea42'
)
diff --git a/requirements.txt b/requirements.txt
index 9f6bfb7446aac42bb9ac44e1c081fe6615a30b1a..dedfa36ac4ca0da754d45f3d773bc7f6732ba8a1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,6 +49,8 @@ tabulate
cachetools
zipfile37
python-keycloak
+Flask-OIDC
+basicauth
# dev/ops related
setuptools
diff --git a/tests/conftest.py b/tests/conftest.py
index d322b9f5a162a4cfee3c301883762e2b56775b0d..4bd59dfa58b33e929433518267f41295b4654787 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -28,6 +28,7 @@ import os.path
import datetime
import base64
from bravado.client import SwaggerClient
+import basicauth
from nomad import config, infrastructure, parsing, processing, coe_repo, api
@@ -201,6 +202,13 @@ def elastic(elastic_infra):
return elastic_infra
+@pytest.fixture(scope='session')
+def keycloak():
+ infrastructure.setup_keycloak()
+
+ return infrastructure.keycloak_oidc_client
+
+
@contextmanager
def create_postgres_infra(patch=None, **kwargs):
"""
@@ -306,10 +314,14 @@ def create_auth_headers(user):
'Authorization': 'Basic %s' % basic_auth_base64
}
-
@pytest.fixture(scope='module')
def test_user_auth(test_user: coe_repo.User):
- return create_auth_headers(test_user)
+ return dict(Authorization=basicauth.encode('sheldon.cooper@nomad-coe.eu', 'password'))
+
+
+# @pytest.fixture(scope='module')
+# def test_user_auth(test_user: coe_repo.User):
+# return create_auth_headers(test_user)
@pytest.fixture(scope='module')
diff --git a/tests/test_api.py b/tests/test_api.py
index 113a41375e492fe477f7aebe2fab3fba232f3a3b..b005311c49cce84fb93485c335607bf17c5e985a 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -99,6 +99,14 @@ class TestAdmin:
class TestAuth:
+ def test_auth_wo_credentials(self, client, keycloak, no_warn):
+ rv = client.get('/auth/')
+ assert rv.status_code == 401
+
+ def test_auth(self, client, test_user_auth, keycloak):
+ rv = client.get('/auth/', headers=test_user_auth)
+ assert rv.status_code == 200
+
def test_xtoken_auth(self, client, test_user: coe_repo.User, no_warn):
rv = client.get('/uploads/', headers={
'X-Token': test_user.first_name.lower() # the test users have their firstname as tokens for convinience