Skip to content

Commit 86e66ac

Browse files
authored
Merge pull request #175 from devinmatte/docker
Fixing Logging to allow submission of Forms
2 parents fda8f2a + 953533b commit 86e66ac

14 files changed

+83
-72
lines changed

conditional/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ def start_of_year():
5353
def request_processor(logger, log_method, event_dict): # pylint: disable=unused-argument, redefined-outer-name
5454
if 'request' in event_dict:
5555
flask_request = event_dict['request']
56-
event_dict['user'] = flask_request.headers.get("x-webauth-user")
5756
event_dict['ip'] = flask_request.remote_addr
5857
event_dict['method'] = flask_request.method
5958
event_dict['blueprint'] = flask_request.blueprint
6059
event_dict['path'] = flask_request.full_path
60+
if 'auth_dict' in event_dict:
61+
auth_dict = event_dict['auth_dict']
62+
event_dict['user'] = auth_dict['username']
6163
return event_dict
6264

6365

conditional/blueprints/attendance.py

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030

3131
@attendance_bp.route('/attendance/ts_members')
3232
@auth.oidc_auth
33-
def get_all_members():
34-
log = logger.new(request=request)
33+
@get_user
34+
def get_all_members(user_dict=None):
35+
log = logger.new(request=request, auth_dict=user_dict)
3536
log.info('Retrieve Technical Seminar Attendance List')
3637

3738
members = ldap_get_current_students()
@@ -57,8 +58,9 @@ def get_all_members():
5758

5859
@attendance_bp.route('/attendance/hm_members')
5960
@auth.oidc_auth
60-
def get_non_alumni_non_coop(internal=False):
61-
log = logger.new(request=request)
61+
@get_user
62+
def get_non_alumni_non_coop(internal=False, user_dict=None):
63+
log = logger.new(request=request, auth_dict=user_dict)
6264
log.info('Retrieve House Meeting Attendance List')
6365

6466
# Get all active members as a base house meeting attendance.
@@ -101,8 +103,9 @@ def get_non_alumni_non_coop(internal=False):
101103

102104
@attendance_bp.route('/attendance/cm_members')
103105
@auth.oidc_auth
104-
def get_non_alumni():
105-
log = logger.new(request=request)
106+
@get_user
107+
def get_non_alumni(user_dict=None):
108+
log = logger.new(request=request, auth_dict=user_dict)
106109
log.info('Retrieve Committee Meeting Attendance List')
107110

108111
current_students = ldap_get_current_students()
@@ -128,8 +131,9 @@ def get_non_alumni():
128131

129132
@attendance_bp.route('/attendance_cm')
130133
@auth.oidc_auth
131-
def display_attendance_cm():
132-
log = logger.new(request=request)
134+
@get_user
135+
def display_attendance_cm(user_dict=None):
136+
log = logger.new(request=request, auth_dict=user_dict)
133137
log.info('Display Committee Meeting Attendance Page')
134138

135139
return render_template('attendance_cm.html',
@@ -139,8 +143,9 @@ def display_attendance_cm():
139143

140144
@attendance_bp.route('/attendance_ts')
141145
@auth.oidc_auth
142-
def display_attendance_ts():
143-
log = logger.new(request=request)
146+
@get_user
147+
def display_attendance_ts(user_dict=None):
148+
log = logger.new(request=request, auth_dict=user_dict)
144149
log.info('Display Technical Seminar Attendance Page')
145150

146151
return render_template('attendance_ts.html',
@@ -152,7 +157,7 @@ def display_attendance_ts():
152157
@auth.oidc_auth
153158
@get_user
154159
def display_attendance_hm(user_dict=None):
155-
log = logger.new(request=request)
160+
log = logger.new(request=request, auth_dict=user_dict)
156161
log.info('Display House Meeting Attendance Page')
157162

158163
if not ldap_is_eval_director(user_dict['account']):
@@ -168,7 +173,7 @@ def display_attendance_hm(user_dict=None):
168173
@auth.oidc_auth
169174
@get_user
170175
def submit_committee_attendance(user_dict=None):
171-
log = logger.new(request=request)
176+
log = logger.new(request=request, auth_dict=user_dict)
172177

173178
approved = ldap_is_eboard(user_dict['account'])
174179
post_data = request.get_json()
@@ -203,7 +208,7 @@ def submit_committee_attendance(user_dict=None):
203208
@auth.oidc_auth
204209
@get_user
205210
def submit_seminar_attendance(user_dict=None):
206-
log = logger.new(request=request)
211+
log = logger.new(request=request, auth_dict=user_dict)
207212
log.info('Submit Technical Seminar Attendance')
208213

209214
approved = ldap_is_eboard(user_dict['account'])
@@ -238,7 +243,7 @@ def submit_seminar_attendance(user_dict=None):
238243
@auth.oidc_auth
239244
@get_user
240245
def submit_house_attendance(user_dict=None):
241-
log = logger.new(request=request)
246+
log = logger.new(request=request, auth_dict=user_dict)
242247
log.info('Submit House Meeting Attendance')
243248

244249
# status: Attended | Excused | Absent
@@ -288,7 +293,7 @@ def submit_house_attendance(user_dict=None):
288293
@auth.oidc_auth
289294
@get_user
290295
def alter_house_attendance(uid, hid, user_dict=None):
291-
log = logger.new(request=request)
296+
log = logger.new(request=request, auth_dict=user_dict)
292297

293298
if not ldap_is_eval_director(user_dict['account']):
294299
return "must be evals", 403
@@ -318,7 +323,7 @@ def alter_house_attendance(uid, hid, user_dict=None):
318323
@auth.oidc_auth
319324
@get_user
320325
def alter_house_excuse(uid, hid, user_dict=None):
321-
log = logger.new(request=request)
326+
log = logger.new(request=request, auth_dict=user_dict)
322327

323328
if not ldap_is_eval_director(user_dict['account']):
324329
return "must be eval director", 403
@@ -380,7 +385,7 @@ def get_seminar_attendees(meeting_id):
380385
FreshmanAccount.id == freshman).first().name)
381386
return attendees
382387

383-
log = logger.new(request=request)
388+
log = logger.new(request=request, auth_dict=user_dict)
384389

385390
if not ldap_is_eboard(user_dict['account']):
386391
return jsonify({"success": False, "error": "Not EBoard"}), 403
@@ -442,7 +447,7 @@ def get_seminar_attendees(meeting_id):
442447
@auth.oidc_auth
443448
@get_user
444449
def alter_committee_attendance(cid, user_dict=None):
445-
log = logger.new(request=request)
450+
log = logger.new(request=request, auth_dict=user_dict)
446451
log.info('Edit Committee Meeting Attendance')
447452

448453
if not ldap_is_eboard(user_dict['account']):
@@ -474,7 +479,7 @@ def alter_committee_attendance(cid, user_dict=None):
474479
@auth.oidc_auth
475480
@get_user
476481
def alter_seminar_attendance(sid, user_dict=None):
477-
log = logger.new(request=request)
482+
log = logger.new(request=request, auth_dict=user_dict)
478483
log.info('Edit Technical Seminar Attendance')
479484

480485
if not ldap_is_eboard(user_dict['account']):
@@ -521,7 +526,7 @@ def get_cm_attendees(sid, user_dict=None):
521526
return jsonify({"attendees": attendees}), 200
522527

523528
else:
524-
log = logger.new(request=request)
529+
log = logger.new(request=request, auth_dict=user_dict)
525530
log.info('Delete Technical Seminar {}'.format(sid))
526531

527532
if not ldap_is_eboard(user_dict['account']):
@@ -559,7 +564,7 @@ def get_ts_attendees(cid, user_dict=None):
559564
return jsonify({"attendees": attendees}), 200
560565

561566
else:
562-
log = logger.new(request=request)
567+
log = logger.new(request=request, auth_dict=user_dict)
563568
log.info('Delete Committee Meeting {}'.format(cid))
564569

565570
if not ldap_is_eboard(user_dict['account']):
@@ -582,7 +587,7 @@ def get_ts_attendees(cid, user_dict=None):
582587
@auth.oidc_auth
583588
@get_user
584589
def approve_cm(cid, user_dict=None):
585-
log = logger.new(request=request)
590+
log = logger.new(request=request, auth_dict=user_dict)
586591
log.info('Approve Committee Meeting {} Attendance'.format(cid))
587592

588593
if not ldap_is_eboard(user_dict['account']):
@@ -600,7 +605,7 @@ def approve_cm(cid, user_dict=None):
600605
@auth.oidc_auth
601606
@get_user
602607
def approve_ts(sid, user_dict=None):
603-
log = logger.new(request=request)
608+
log = logger.new(request=request, auth_dict=user_dict)
604609
log.info('Approve Technical Seminar {} Attendance'.format(sid))
605610

606611
if not ldap_is_eboard(user_dict['account']):

conditional/blueprints/cache_management.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def restart_app(user_dict=None):
2929
if not ldap_is_rtp(user_dict['account']):
3030
return redirect("/dashboard")
3131

32-
log = logger.new(request=request)
32+
log = logger.new(request=request, auth_dict=user_dict)
3333
log.info('Restart Conditional')
3434
os.kill(os.getpid(), signal.SIGINT)
3535
return "application restarted", 200
@@ -42,7 +42,7 @@ def clear_cache(user_dict=None):
4242
if not ldap_is_eval_director(user_dict['account']) and not ldap_is_rtp(user_dict['account']):
4343
return redirect("/dashboard")
4444

45-
log = logger.new(request=request)
45+
log = logger.new(request=request, auth_dict=user_dict)
4646
log.info('Purge All Caches')
4747

4848
_ldap_is_member_of_directorship.cache_clear()

conditional/blueprints/co_op.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@auth.oidc_auth
1717
@get_user
1818
def display_co_op_form(user_dict=None):
19-
log = logger.new(request=request)
19+
log = logger.new(request=request, auth_dict=user_dict)
2020
log.info('Display Co-Op Submission Page')
2121

2222
co_op = CurrentCoops.query.filter(
@@ -32,7 +32,7 @@ def display_co_op_form(user_dict=None):
3232
@auth.oidc_auth
3333
@get_user
3434
def submit_co_op_form(user_dict=None):
35-
log = logger.new(request=request)
35+
log = logger.new(request=request, auth_dict=user_dict)
3636

3737
post_data = request.get_json()
3838
semester = post_data['semester']
@@ -55,7 +55,7 @@ def submit_co_op_form(user_dict=None):
5555
@auth.oidc_auth
5656
@get_user
5757
def delete_co_op(uid, user_dict=None):
58-
log = logger.new(request=request)
58+
log = logger.new(request=request, auth_dict=user_dict)
5959

6060
if not ldap_is_eval_director(user_dict['account']):
6161
return "must be eval director", 403

conditional/blueprints/conditional.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@auth.oidc_auth
2020
@get_user
2121
def display_conditionals(user_dict=None):
22-
log = logger.new(request=request)
22+
log = logger.new(request=request, auth_dict=user_dict)
2323
log.info('Display Conditional Listing Page')
2424

2525
conditionals = [
@@ -43,7 +43,7 @@ def display_conditionals(user_dict=None):
4343
@auth.oidc_auth
4444
@get_user
4545
def create_conditional(user_dict=None):
46-
log = logger.new(request=request)
46+
log = logger.new(request=request, auth_dict=user_dict)
4747

4848
if not ldap_is_eval_director(user_dict['account']):
4949
return "must be eval director", 403
@@ -80,7 +80,7 @@ def create_conditional(user_dict=None):
8080
@auth.oidc_auth
8181
@get_user
8282
def conditional_review(user_dict=None):
83-
log = logger.new(request=request)
83+
log = logger.new(request=request, auth_dict=user_dict)
8484

8585
if not ldap_is_eval_director(user_dict['account']):
8686
return redirect("/dashboard", code=302)
@@ -117,7 +117,7 @@ def conditional_review(user_dict=None):
117117
@auth.oidc_auth
118118
@get_user
119119
def conditional_delete(cid, user_dict=None):
120-
log = logger.new(request=request)
120+
log = logger.new(request=request, auth_dict=user_dict)
121121
log.info('Delete conditional-{}'.format(cid))
122122

123123
if ldap_is_eval_director(user_dict['account']):

conditional/blueprints/dashboard.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@auth.oidc_auth
2727
@get_user
2828
def display_dashboard(user_dict=None):
29-
log = logger.new(request=request)
29+
log = logger.new(request=request, auth_dict=user_dict)
3030
log.info('display dashboard')
3131

3232
# Get the list of voting members.

conditional/blueprints/housing.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
@auth.oidc_auth
2424
@get_user
2525
def display_housing(user_dict=None):
26-
log = logger.new(request=request)
26+
log = logger.new(request=request, auth_dict=user_dict)
2727
log.info('Display Housing Board')
2828

2929
housing = {}
@@ -65,7 +65,7 @@ def display_housing(user_dict=None):
6565
@auth.oidc_auth
6666
@get_user
6767
def change_queue_state(user_dict=None):
68-
log = logger.new(request=request)
68+
log = logger.new(request=request, auth_dict=user_dict)
6969

7070
if not ldap_is_eval_director(user_dict['account']):
7171
return "must be eval director", 403
@@ -91,7 +91,7 @@ def change_queue_state(user_dict=None):
9191
@auth.oidc_auth
9292
@get_user
9393
def change_room_numbers(rmnumber, user_dict=None):
94-
log = logger.new(request=request)
94+
log = logger.new(request=request, auth_dict=user_dict)
9595

9696
update = request.get_json()
9797

@@ -137,7 +137,7 @@ def get_occupants(rmnumber):
137137
@auth.oidc_auth
138138
@get_user
139139
def clear_all_rooms(user_dict=None):
140-
log = logger.new(request=request)
140+
log = logger.new(request=request, auth_dict=user_dict)
141141

142142
if not ldap_is_eval_director(user_dict['account']):
143143
return "must be eval director", 403

conditional/blueprints/intro_evals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@auth.oidc_auth
2929
@get_user
3030
def display_intro_evals(internal=False, user_dict=None):
31-
log = logger.new(request=request)
31+
log = logger.new(request=request, auth_dict=user_dict)
3232
log.info('Display Intro Evals Listing')
3333

3434
# get user data

conditional/blueprints/intro_evals_form.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@auth.oidc_auth
1919
@get_user
2020
def display_intro_evals_form(user_dict=None):
21-
log = logger.new(request=request)
21+
log = logger.new(request=request, auth_dict=user_dict)
2222
log.info('Display Intro Evals Form')
2323

2424
if not ldap_is_intromember(user_dict['account']):
@@ -39,7 +39,7 @@ def display_intro_evals_form(user_dict=None):
3939
@auth.oidc_auth
4040
@get_user
4141
def submit_intro_evals(user_dict=None):
42-
log = logger.new(request=request)
42+
log = logger.new(request=request, auth_dict=user_dict)
4343
log.info('Submit Intro Evals Form')
4444

4545
post_data = request.get_json()

conditional/blueprints/logs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@auth.oidc_auth
1818
@get_user
1919
def display_logs(user_dict=None):
20-
log = logger.new(request=request)
20+
log = logger.new(request=request, auth_dict=user_dict)
2121
log.info('Display Logs')
2222

2323
log.info(user_dict['account'].displayName)

0 commit comments

Comments
 (0)