Merge pull request #175 from devinmatte/docker

Fixing Logging to allow submission of Forms

Author: mbillow

conditional/__init__.py

@@ -53,11 +53,13 @@ def start_of_year():
 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")
         event_dict['ip'] = flask_request.remote_addr
         event_dict['method'] = flask_request.method
         event_dict['blueprint'] = flask_request.blueprint
         event_dict['path'] = flask_request.full_path
+    if 'auth_dict' in event_dict:
+        auth_dict = event_dict['auth_dict']
+        event_dict['user'] = auth_dict['username']
     return event_dict
 
 

conditional/blueprints/attendance.py

@@ -30,8 +30,9 @@
 
 @attendance_bp.route('/attendance/ts_members')
 @auth.oidc_auth
-def get_all_members():
-    log = logger.new(request=request)
+@get_user
+def get_all_members(user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Retrieve Technical Seminar Attendance List')
 
     members = ldap_get_current_students()
@@ -57,8 +58,9 @@ def get_all_members():
 
 @attendance_bp.route('/attendance/hm_members')
 @auth.oidc_auth
-def get_non_alumni_non_coop(internal=False):
-    log = logger.new(request=request)
+@get_user
+def get_non_alumni_non_coop(internal=False, user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Retrieve House Meeting Attendance List')
 
     # Get all active members as a base house meeting attendance.
@@ -101,8 +103,9 @@ def get_non_alumni_non_coop(internal=False):
 
 @attendance_bp.route('/attendance/cm_members')
 @auth.oidc_auth
-def get_non_alumni():
-    log = logger.new(request=request)
+@get_user
+def get_non_alumni(user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Retrieve Committee Meeting Attendance List')
 
     current_students = ldap_get_current_students()
@@ -128,8 +131,9 @@ def get_non_alumni():
 
 @attendance_bp.route('/attendance_cm')
 @auth.oidc_auth
-def display_attendance_cm():
-    log = logger.new(request=request)
+@get_user
+def display_attendance_cm(user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Committee Meeting Attendance Page')
 
     return render_template('attendance_cm.html',
@@ -139,8 +143,9 @@ def display_attendance_cm():
 
 @attendance_bp.route('/attendance_ts')
 @auth.oidc_auth
-def display_attendance_ts():
-    log = logger.new(request=request)
+@get_user
+def display_attendance_ts(user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Technical Seminar Attendance Page')
 
     return render_template('attendance_ts.html',
@@ -152,7 +157,7 @@ def display_attendance_ts():
 @auth.oidc_auth
 @get_user
 def display_attendance_hm(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display House Meeting Attendance Page')
 
     if not ldap_is_eval_director(user_dict['account']):
@@ -168,7 +173,7 @@ def display_attendance_hm(user_dict=None):
 @auth.oidc_auth
 @get_user
 def submit_committee_attendance(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     approved = ldap_is_eboard(user_dict['account'])
     post_data = request.get_json()
@@ -203,7 +208,7 @@ def submit_committee_attendance(user_dict=None):
 @auth.oidc_auth
 @get_user
 def submit_seminar_attendance(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Submit Technical Seminar Attendance')
 
     approved = ldap_is_eboard(user_dict['account'])
@@ -238,7 +243,7 @@ def submit_seminar_attendance(user_dict=None):
 @auth.oidc_auth
 @get_user
 def submit_house_attendance(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Submit House Meeting Attendance')
 
     # status: Attended | Excused | Absent
@@ -288,7 +293,7 @@ def submit_house_attendance(user_dict=None):
 @auth.oidc_auth
 @get_user
 def alter_house_attendance(uid, hid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be evals", 403
@@ -318,7 +323,7 @@ def alter_house_attendance(uid, hid, user_dict=None):
 @auth.oidc_auth
 @get_user
 def alter_house_excuse(uid, hid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403
@@ -380,7 +385,7 @@ def get_seminar_attendees(meeting_id):
                              FreshmanAccount.id == freshman).first().name)
         return attendees
 
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eboard(user_dict['account']):
         return jsonify({"success": False, "error": "Not EBoard"}), 403
@@ -442,7 +447,7 @@ def get_seminar_attendees(meeting_id):
 @auth.oidc_auth
 @get_user
 def alter_committee_attendance(cid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Edit Committee Meeting Attendance')
 
     if not ldap_is_eboard(user_dict['account']):
@@ -474,7 +479,7 @@ def alter_committee_attendance(cid, user_dict=None):
 @auth.oidc_auth
 @get_user
 def alter_seminar_attendance(sid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Edit Technical Seminar Attendance')
 
     if not ldap_is_eboard(user_dict['account']):
@@ -521,7 +526,7 @@ def get_cm_attendees(sid, user_dict=None):
         return jsonify({"attendees": attendees}), 200
 
     else:
-        log = logger.new(request=request)
+        log = logger.new(request=request, auth_dict=user_dict)
         log.info('Delete Technical Seminar {}'.format(sid))
 
         if not ldap_is_eboard(user_dict['account']):
@@ -559,7 +564,7 @@ def get_ts_attendees(cid, user_dict=None):
         return jsonify({"attendees": attendees}), 200
 
     else:
-        log = logger.new(request=request)
+        log = logger.new(request=request, auth_dict=user_dict)
         log.info('Delete Committee Meeting {}'.format(cid))
 
         if not ldap_is_eboard(user_dict['account']):
@@ -582,7 +587,7 @@ def get_ts_attendees(cid, user_dict=None):
 @auth.oidc_auth
 @get_user
 def approve_cm(cid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Approve Committee Meeting {} Attendance'.format(cid))
 
     if not ldap_is_eboard(user_dict['account']):
@@ -600,7 +605,7 @@ def approve_cm(cid, user_dict=None):
 @auth.oidc_auth
 @get_user
 def approve_ts(sid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Approve Technical Seminar {} Attendance'.format(sid))
 
     if not ldap_is_eboard(user_dict['account']):

conditional/blueprints/cache_management.py

@@ -29,7 +29,7 @@ def restart_app(user_dict=None):
     if not ldap_is_rtp(user_dict['account']):
         return redirect("/dashboard")
 
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Restart Conditional')
     os.kill(os.getpid(), signal.SIGINT)
     return "application restarted", 200
@@ -42,7 +42,7 @@ def clear_cache(user_dict=None):
     if not ldap_is_eval_director(user_dict['account']) and not ldap_is_rtp(user_dict['account']):
         return redirect("/dashboard")
 
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Purge All Caches')
 
     _ldap_is_member_of_directorship.cache_clear()

conditional/blueprints/co_op.py

@@ -16,7 +16,7 @@
 @auth.oidc_auth
 @get_user
 def display_co_op_form(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Co-Op Submission Page')
 
     co_op = CurrentCoops.query.filter(
@@ -32,7 +32,7 @@ def display_co_op_form(user_dict=None):
 @auth.oidc_auth
 @get_user
 def submit_co_op_form(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     post_data = request.get_json()
     semester = post_data['semester']
@@ -55,7 +55,7 @@ def submit_co_op_form(user_dict=None):
 @auth.oidc_auth
 @get_user
 def delete_co_op(uid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403

conditional/blueprints/conditional.py

@@ -19,7 +19,7 @@
 @auth.oidc_auth
 @get_user
 def display_conditionals(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Conditional Listing Page')
 
     conditionals = [
@@ -43,7 +43,7 @@ def display_conditionals(user_dict=None):
 @auth.oidc_auth
 @get_user
 def create_conditional(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403
@@ -80,7 +80,7 @@ def create_conditional(user_dict=None):
 @auth.oidc_auth
 @get_user
 def conditional_review(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eval_director(user_dict['account']):
         return redirect("/dashboard", code=302)
@@ -117,7 +117,7 @@ def conditional_review(user_dict=None):
 @auth.oidc_auth
 @get_user
 def conditional_delete(cid, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Delete conditional-{}'.format(cid))
 
     if ldap_is_eval_director(user_dict['account']):

conditional/blueprints/dashboard.py

@@ -26,7 +26,7 @@
 @auth.oidc_auth
 @get_user
 def display_dashboard(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('display dashboard')
 
     # Get the list of voting members.

conditional/blueprints/housing.py

@@ -23,7 +23,7 @@
 @auth.oidc_auth
 @get_user
 def display_housing(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Housing Board')
 
     housing = {}
@@ -65,7 +65,7 @@ def display_housing(user_dict=None):
 @auth.oidc_auth
 @get_user
 def change_queue_state(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403
@@ -91,7 +91,7 @@ def change_queue_state(user_dict=None):
 @auth.oidc_auth
 @get_user
 def change_room_numbers(rmnumber, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     update = request.get_json()
 
@@ -137,7 +137,7 @@ def get_occupants(rmnumber):
 @auth.oidc_auth
 @get_user
 def clear_all_rooms(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403

conditional/blueprints/intro_evals.py

@@ -28,7 +28,7 @@
 @auth.oidc_auth
 @get_user
 def display_intro_evals(internal=False, user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Intro Evals Listing')
 
     # get user data

conditional/blueprints/intro_evals_form.py

@@ -18,7 +18,7 @@
 @auth.oidc_auth
 @get_user
 def display_intro_evals_form(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Intro Evals Form')
 
     if not ldap_is_intromember(user_dict['account']):
@@ -39,7 +39,7 @@ def display_intro_evals_form(user_dict=None):
 @auth.oidc_auth
 @get_user
 def submit_intro_evals(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Submit Intro Evals Form')
 
     post_data = request.get_json()

conditional/blueprints/logs.py

@@ -17,7 +17,7 @@
 @auth.oidc_auth
 @get_user
 def display_logs(user_dict=None):
-    log = logger.new(request=request)
+    log = logger.new(request=request, auth_dict=user_dict)
     log.info('Display Logs')
 
     log.info(user_dict['account'].displayName)