From cc334f17272fe72a9ed8291a515cb5a70d115fe6 Mon Sep 17 00:00:00 2001 From: Tobias Kurze Date: Tue, 28 Jul 2020 15:09:08 +0200 Subject: [PATCH] oidc working again (getting less info to limit cookie size) --- backend/__init__.py | 6 +++++- backend/__main__.py | 22 +++++++++++++++------- backend/api/auth_api.py | 7 ++++--- backend/auth/oidc.py | 10 +++++++--- backend/auth/oidc_config.py | 6 +++++- backend/config.py | Bin 4744 -> 5228 bytes backend/cron/cron_state_checker.py | 4 ++-- backend/serve_frontend.py | 3 ++- 8 files changed, 40 insertions(+), 18 deletions(-) diff --git a/backend/__init__.py b/backend/__init__.py index e83ceb3..51da985 100644 --- a/backend/__init__.py +++ b/backend/__init__.py @@ -3,6 +3,7 @@ Backend base module """ import logging +import os from io import StringIO from logging.config import dictConfig from logging.handlers import MemoryHandler @@ -120,7 +121,10 @@ class LrcException(Exception): app = Flask(__name__) -app.config.from_object('backend.config.Config') +if os.environ.get('FLASK_ENV', None) == "development": + app.config.from_object('backend.config.DevelopmentConfig') +else: + app.config.from_object('backend.config.Config') db = SQLAlchemy(app) login_manager = LoginManager() diff --git a/backend/__main__.py b/backend/__main__.py index 7775e89..f737a44 100644 --- a/backend/__main__.py +++ b/backend/__main__.py @@ -26,7 +26,6 @@ def _start_initial_recorder_state_update(run_in_thread=True): async_permanent_cron_recorder_checker.check_object_state() # initial check of all recorders - def _create_and_start_default_scheduler(): print("Starting Scheduler") scheduler = get_default_scheduler() @@ -48,14 +47,23 @@ def main(): add_test_recorder() print(app.config.get("SERVER_NAME", None)) - server_name = app.config.get("SERVER_NAME", None) - if server_name is not None and "ubkaps154.ubka.uni-karlsruhe.de" in server_name: + + if app.config.get("USE_SSL", False): try: context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) - context.load_cert_chain('cert.pem', 'key.pem') - app.run(debug=True, ssl_context=context, threaded=True) + context.load_cert_chain(app.config.get("CERT", 'cert.pem'), app.config.get("KEY", 'key.pem')) + print("using ssl context!") + app.run(debug=True, ssl_context=context, threaded=True, + #host="0.0.0.0", + host=app.config.get("HOST", "0.0.0.0"), + port=app.config.get("PORT", 5443) + ) except FileNotFoundError: - app.run(debug=True, threaded=True) + print("Could not find cert/key.pem!") + app.run(debug=True, threaded=True, + host=app.config.get("HOST", None), + port=app.config.get("PORT", 5443) + ) try: db.create_all() @@ -63,7 +71,7 @@ def main(): logging.critical(e) scheduler = _create_and_start_default_scheduler() - #_start_initial_recorder_state_update(run_in_thread=False) + # _start_initial_recorder_state_update(run_in_thread=False) wsb = WebSocketBase() print("running websocket...(replaces normal app.run()") diff --git a/backend/api/auth_api.py b/backend/api/auth_api.py index 5cc4a05..516b9e5 100644 --- a/backend/api/auth_api.py +++ b/backend/api/auth_api.py @@ -28,6 +28,7 @@ from werkzeug.routing import BuildError from backend import db, app, jwt_extended from backend.api import auth_api_bp, auth_api_providers_ns, auth_api_register_ns from backend.auth import AUTH_PROVIDERS, oidc_auth +from backend.auth.oidc_config import PROVIDER_NAME from backend.models.user_model import User, Group, BlacklistToken logger = logging.getLogger("lrc.api.auth") @@ -133,6 +134,7 @@ def create_or_retrieve_user_from_userinfo(userinfo): try: email = userinfo["email"] except KeyError: + logger.error("email is missing in OIDC userinfo! Can't create user!") return None user_groups = check_and_create_groups(groups=userinfo.get("memberOf", [])) @@ -161,13 +163,12 @@ def create_or_retrieve_user_from_userinfo(userinfo): @auth_api_bp.route('/oidc', methods=['GET']) @auth_api_bp.route('/oidc/', methods=['GET']) -@oidc_auth.oidc_auth() +@oidc_auth.oidc_auth(provider_name=PROVIDER_NAME) def oidc(redirect_url=None): logger.debug("oidc auth endpoint:") - return "fuck!" user = create_or_retrieve_user_from_userinfo(flask.session['userinfo']) if user is None: - logger.error("Could not authenticate: could not find or create user.") + logger.error(f"Could not authenticate: could not find or create user:\n{str(flask.session['userinfo'])}") return "Could not authenticate: could not find or create user.", 401 if current_app.config.get("AUTH_RETURN_EXTERNAL_JWT", False): token = jwt.encode(flask.session['id_token'], current_app.config['SECRET_KEY']) diff --git a/backend/auth/oidc.py b/backend/auth/oidc.py index ca87038..3f4151b 100644 --- a/backend/auth/oidc.py +++ b/backend/auth/oidc.py @@ -18,7 +18,7 @@ from .oidc_config import PROVIDER_NAME, OIDC_PROVIDERS OIDCAuthentication.oidc_auth_orig = OIDCAuthentication.oidc_auth OIDCAuthentication.oidc_logout_orig = OIDCAuthentication.oidc_logout - +''' def oidc_auth_default_provider(self): """monkey patch oidc_auth""" return self.oidc_auth_orig(PROVIDER_NAME) @@ -31,6 +31,7 @@ def oidc_logout_default_provider(self): OIDCAuthentication.oidc_auth = oidc_auth_default_provider OIDCAuthentication.oidc_logout = oidc_logout_default_provider +''' oidc_auth = OIDCAuthentication(OIDC_PROVIDERS) @@ -40,6 +41,7 @@ def create_or_retrieve_user_from_userinfo(userinfo): try: email = userinfo["email"] except KeyError: + app.logger.error("email is missing in OIDC userinfo! Can't create user!") return None user = User.get_by_identifier(email) @@ -62,7 +64,7 @@ def create_or_retrieve_user_from_userinfo(userinfo): @auth_bp.route('/oidc', methods=['GET']) -@oidc_auth.oidc_auth() +@oidc_auth.oidc_auth(provider_name=PROVIDER_NAME) def oidc(): user_session = UserSession(flask.session) app.logger.info(user_session.userinfo) @@ -78,8 +80,10 @@ def oidc(): @auth_bp.route('/oidc_logout', methods=['GET']) +@oidc_auth.oidc_logout def oidc_logout(): - oidc_auth.oidc_logout() + # oidc_auth.oidc_logout() + app.logger.debug("Logging out current user!") return redirect('/') diff --git a/backend/auth/oidc_config.py b/backend/auth/oidc_config.py index 1c795fb..a925d89 100644 --- a/backend/auth/oidc_config.py +++ b/backend/auth/oidc_config.py @@ -10,6 +10,10 @@ PROVIDER_URL = "https://oidc.scc.kit.edu/auth/realms/kit" PROVIDER_NAME = 'kit_oidc' PROVIDER_CONFIG = ProviderConfiguration(issuer=PROVIDER_URL, client_metadata=CLIENT_METADATA, - auth_request_params={'scope': ['openid', 'email', 'profile']}) + auth_request_params={'scope': ['openid', 'email']} + # auth_request_params={'scope': ['openid', 'profile']} # avoid to get profile + # -> cookie is getting too large + # auth_request_params={'scope': ['openid', 'email', 'profile']} + ) OIDC_PROVIDERS = {PROVIDER_NAME: PROVIDER_CONFIG} diff --git a/backend/config.py b/backend/config.py index 37999f49768eb6c3059fcbd2558b704f1f6faf23..3525ee4f9b84bd04ba91493e3c22cafb68c4fef9 100644 GIT binary patch literal 5228 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 WyUxpzi1O-UrMKGZFJ8B3dkAuXC^Yi` diff --git a/backend/cron/cron_state_checker.py b/backend/cron/cron_state_checker.py index 0020dca..376524d 100644 --- a/backend/cron/cron_state_checker.py +++ b/backend/cron/cron_state_checker.py @@ -170,6 +170,6 @@ async_cron_recorder_checker = StateChecker([check_capture_agent_state, ping_capt async_permanent_cron_recorder_checker = StateChecker( [check_capture_agent_state, ping_capture_agent, check_stream_sanity], Recorder) -for r in Recorder.get_all(): - async_permanent_cron_recorder_checker.add_object_to_state_check(r.id) +#for r in Recorder.get_all(): +# async_permanent_cron_recorder_checker.add_object_to_state_check(r.id) diff --git a/backend/serve_frontend.py b/backend/serve_frontend.py index 59e1b25..7ccacb9 100644 --- a/backend/serve_frontend.py +++ b/backend/serve_frontend.py @@ -10,6 +10,7 @@ from flask_pyoidc.user_session import UserSession from backend import app from backend.auth import oidc_auth +from backend.auth.oidc_config import PROVIDER_NAME fe_path = os.path.abspath(os.path.join(app.root_path, os.pardir, os.pardir, "frontend", "dist")) if not os.path.exists(fe_path) or not os.path.exists(os.path.join(fe_path, "index.html")): @@ -37,7 +38,7 @@ def send_img(path): @fe_bp.route('/test') -@oidc_auth.oidc_auth() +@oidc_auth.oidc_auth(provider_name=PROVIDER_NAME) def test_oidc(): user_session = UserSession(flask.session) access_token = user_session.access_token