Fixing Merge Conflicts!

Author: devinmatte

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "3.3"
+  - "3.6"
 
 install:
   - "pip install -r requirements.txt"

README.md

@@ -31,8 +31,24 @@ Then, install the pipeline and frontend dependencies:
 npm install
 ```
 
+### Config
+
 You must create `config.py` in the top-level directory with the appropriate credentials for the application to run. See `config.sample.py` for an example.
 
+#### Add OIDC Config
+Reach out to an RTP to get OIDC credentials that will allow you to develop locally behind OIDC auth
+```
+# OIDC Config
+OIDC_ISSUER = "https://sso.csh.rit.edu/auth/realms/csh"
+OIDC_CLIENT_CONFIG = {
+    'client_id': '',
+    'client_secret': '',
+    'post_logout_redirect_uris': ['http://0.0.0.0:6969/logout']
+}
+```
+
+### Run
+
 Once you have all of the dependencies installed, simply run:
 
 ```

conditional/__init__.py

@@ -2,25 +2,36 @@
 from ._version import __version__
 
 import os
+import subprocess
 from datetime import datetime
 
 import structlog
 from csh_ldap import CSHLDAP
 from flask import Flask, redirect, request, 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
 
 from conditional import config
 
 app = Flask(__name__)
 
+config = os.path.join(app.config.get('ROOT_DIR', os.getcwd()), "config.py")
+
 app.config.from_object(config)
 if os.path.exists(os.path.join(os.getcwd(), "config.py")):
     app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
 
 app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
+app.config["GIT_REVISION"] = subprocess.check_output(['git',
+                                                      'rev-parse',
+                                                      '--short',
+                                                      'HEAD']).decode('utf-8').rstrip()
+
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 sentry = Sentry(app)
@@ -29,14 +40,17 @@
                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:
         start = datetime(datetime.today().year - 1, 6, 1)
     return start
 
-
 # pylint: disable=C0413
 from .models.models import UserLog
 
@@ -70,7 +84,6 @@ def database_processor(logger, log_method, event_dict):  # pylint: disable=unuse
         del event_dict['request']
     return event_dict
 
-
 structlog.configure(processors=[
     request_processor,
     database_processor,
@@ -79,6 +92,8 @@ def database_processor(logger, log_method, event_dict):  # pylint: disable=unuse
 
 logger = structlog.get_logger()
 
+from conditional.util.auth import get_user
+
 from .blueprints.dashboard import dashboard_bp  # pylint: disable=ungrouped-imports
 from .blueprints.attendance import attendance_bp
 from .blueprints.major_project_submission import major_project_bp
@@ -120,18 +135,17 @@ def static_proxy(path):
 def default_route():
     return redirect('/dashboard')
 
-
 @app.errorhandler(404)
 @app.errorhandler(500)
-def route_errors(error):
+@auth.oidc_auth
+@get_user
+def route_errors(error, user_dict=None):
     data = dict()
-    username = request.headers.get('x-webauth-user')
 
     # Handle the case where the header isn't present
-    if username is not None:
-        member = ldap_get_member(username)
-        data['username'] = member.uid
-        data['name'] = member.cn
+    if user_dict['username'] is not None:
+        data['username'] = user_dict['account'].uid
+        data['name'] = user_dict['account'].cn
     else:
         data['username'] = "unknown"
         data['name'] = "Unknown"