Adding flask_pyoidc

Author: devinmatte

conditional/__init__.py

@@ -1,14 +1,14 @@
 import os
 import subprocess
 from datetime import datetime
-from flask import Flask, redirect, request, render_template, g
-from flask_sqlalchemy import SQLAlchemy
-from flask_migrate import Migrate
+
+import structlog
 from csh_ldap import CSHLDAP
-from raven import fetch_git_sha
+from flask import Flask, redirect, render_template, g
+from flask_migrate import Migrate
+from flask_pyoidc.flask_pyoidc import OIDCAuthentication
+from flask_sqlalchemy import SQLAlchemy
 from raven.contrib.flask import Sentry
-from raven.exceptions import InvalidGitRepository
-import structlog
 
 app = Flask(__name__)
 
@@ -31,6 +31,11 @@
                app.config['LDAP_BIND_PW'],
                ro=app.config['LDAP_RO'])
 
+auth = OIDCAuthentication(app, issuer=app.config["OIDC_ISSUER"],
+                          client_registration_info=app.config["OIDC_CLIENT_CONFIG"])
+
+app.secret_key = app.config["SECRET_KEY"]
+
 def start_of_year():
     start = datetime(datetime.today().year, 6, 1)
     if datetime.today() < start:
@@ -41,7 +46,7 @@ def start_of_year():
 from conditional.models.models import UserLog
 
 # Configure Logging
-def request_processor(logger, log_method, event_dict): # pylint: disable=unused-argument, redefined-outer-name
+def request_processor(logger, log_method, event_dict):  # pylint: disable=unused-argument, redefined-outer-name
     if 'request' in event_dict:
         flask_request = event_dict['request']
         event_dict['user'] = flask_request.headers.get("x-webauth-user")
@@ -52,7 +57,7 @@ def request_processor(logger, log_method, event_dict): # pylint: disable=unused-
     return event_dict
 
 
-def database_processor(logger, log_method, event_dict): # pylint: disable=unused-argument, redefined-outer-name
+def database_processor(logger, log_method, event_dict):  # pylint: disable=unused-argument, redefined-outer-name
     if 'request' in event_dict:
         if event_dict['method'] != 'GET':
             log = UserLog(
@@ -77,8 +82,9 @@ def database_processor(logger, log_method, event_dict): # pylint: disable=unused
 
 logger = structlog.get_logger()
 
+from conditional.util.auth import get_username
 
-from conditional.blueprints.dashboard import dashboard_bp # pylint: disable=ungrouped-imports
+from conditional.blueprints.dashboard import dashboard_bp  # pylint: disable=ungrouped-imports
 from conditional.blueprints.attendance import attendance_bp
 from conditional.blueprints.major_project_submission import major_project_bp
 from conditional.blueprints.intro_evals import intro_evals_bp
@@ -115,14 +121,23 @@ def static_proxy(path):
 
 
 @app.route('/')
+@auth.oidc_auth
 def default_route():
     return redirect('/dashboard')
 
+
+@app.route("/logout")
+@auth.oidc_logout
+def logout():
+    return redirect("/", 302)
+
+
 @app.errorhandler(404)
 @app.errorhandler(500)
-def route_errors(error):
+@auth.oidc_auth
+@get_username
+def route_errors(error, username=None):
     data = dict()
-    username = request.headers.get('x-webauth-user')
 
     # Handle the case where the header isn't present
     if username is not None: