I DID IT

Author: pikachu0542

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/python:3.8-buster
+FROM docker.io/python:3.12-bookworm
 MAINTAINER Computer Science House <webmaster@csh.rit.edu>
 
 RUN mkdir /opt/conditional
@@ -8,7 +8,7 @@ ADD requirements.txt /opt/conditional
 WORKDIR /opt/conditional
 
 RUN apt-get -yq update && \
-    apt-get -yq install libsasl2-dev libldap2-dev libssl-dev gcc g++ make && \
+    apt-get -yq install libsasl2-dev libldap2-dev libldap-common libssl-dev gcc g++ make && \
     pip install -r requirements.txt && \
     apt-get -yq clean all
 
@@ -29,4 +29,5 @@ RUN rm -rf node_modules && \
 
 RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
 
-CMD ["ddtrace-run", "gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]
+#CMD ["ddtrace-run", "gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]
+CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=256"]

conditional/__init__.py

@@ -7,6 +7,7 @@
 from flask_migrate import Migrate
 from flask_gzip import Gzip
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
+from flask_pyoidc.provider_configuration import ProviderConfiguration, ClientMetadata
 from flask_sqlalchemy import SQLAlchemy
 
 import sentry_sdk
@@ -39,8 +40,12 @@
                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"])
+#auth = OIDCAuthentication(app, issuer=app.config["OIDC_ISSUER"], client_registration_info=app.config["OIDC_CLIENT_CONFIG"])
+
+client_metadata = ClientMetadata(app.config["OIDC_CLIENT_CONFIG"])
+provider_config = ProviderConfiguration(issuer=app.config["OIDC_ISSUER"], client_registration_info=client_metadata)
+
+auth = OIDCAuthentication({'default': provider_config}, app)
 
 app.secret_key = app.config["SECRET_KEY"]
 
@@ -137,7 +142,7 @@ def static_proxy(path):
 
 
 @app.route('/')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 def default_route():
     return redirect('/dashboard')
 
@@ -158,7 +163,7 @@ def health():
 
 @app.errorhandler(404)
 @app.errorhandler(500)
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def route_errors(error, user_dict=None):
     data = dict()

conditional/blueprints/attendance.py

@@ -29,7 +29,7 @@
 
 
 @attendance_bp.route('/attendance/ts_members')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def get_all_members(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -57,7 +57,7 @@ def get_all_members(user_dict=None):
 
 
 @attendance_bp.route('/attendance/hm_members')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def get_non_alumni_non_coop(internal=False, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -102,7 +102,7 @@ def get_non_alumni_non_coop(internal=False, user_dict=None):
 
 
 @attendance_bp.route('/attendance/cm_members')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def get_non_alumni(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -130,7 +130,7 @@ def get_non_alumni(user_dict=None):
 
 
 @attendance_bp.route('/attendance_cm')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_attendance_cm(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -142,7 +142,7 @@ def display_attendance_cm(user_dict=None):
 
 
 @attendance_bp.route('/attendance_ts')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_attendance_ts(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -154,7 +154,7 @@ def display_attendance_ts(user_dict=None):
 
 
 @attendance_bp.route('/attendance_hm')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_attendance_hm(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -170,7 +170,7 @@ def display_attendance_hm(user_dict=None):
 
 
 @attendance_bp.route('/attendance/submit/cm', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def submit_committee_attendance(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -205,7 +205,7 @@ def submit_committee_attendance(user_dict=None):
 
 
 @attendance_bp.route('/attendance/submit/ts', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def submit_seminar_attendance(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -240,7 +240,7 @@ def submit_seminar_attendance(user_dict=None):
 
 
 @attendance_bp.route('/attendance/submit/hm', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def submit_house_attendance(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -290,7 +290,7 @@ def submit_house_attendance(user_dict=None):
 
 
 @attendance_bp.route('/attendance/alter/hm/<uid>/<hid>', methods=['GET'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def alter_house_attendance(uid, hid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -320,7 +320,7 @@ def alter_house_attendance(uid, hid, user_dict=None):
 
 
 @attendance_bp.route('/attendance/alter/hm/<uid>/<hid>', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def alter_house_excuse(uid, hid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -357,7 +357,7 @@ def alter_house_excuse(uid, hid, user_dict=None):
 
 
 @attendance_bp.route('/attendance/history', methods=['GET'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def attendance_history(user_dict=None):
 
@@ -444,7 +444,7 @@ def get_seminar_attendees(meeting_id):
 
 
 @attendance_bp.route('/attendance/alter/cm/<cid>', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def alter_committee_attendance(cid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -476,7 +476,7 @@ def alter_committee_attendance(cid, user_dict=None):
 
 
 @attendance_bp.route('/attendance/alter/ts/<sid>', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def alter_seminar_attendance(sid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -508,7 +508,7 @@ def alter_seminar_attendance(sid, user_dict=None):
 
 
 @attendance_bp.route('/attendance/ts/<sid>', methods=['GET', 'DELETE'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def get_cm_attendees(sid, user_dict=None):
     if request.method == 'GET':
@@ -545,7 +545,7 @@ def get_cm_attendees(sid, user_dict=None):
 
 
 @attendance_bp.route('/attendance/cm/<cid>', methods=['GET', 'DELETE'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def get_ts_attendees(cid, user_dict=None):
     if request.method == 'GET':
@@ -582,7 +582,7 @@ def get_ts_attendees(cid, user_dict=None):
 
 
 @attendance_bp.route('/attendance/cm/<cid>/approve', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def approve_cm(cid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -600,7 +600,7 @@ def approve_cm(cid, user_dict=None):
 
 
 @attendance_bp.route('/attendance/ts/<sid>/approve', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def approve_ts(sid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)

conditional/blueprints/cache_management.py

@@ -21,7 +21,7 @@
 
 
 @cache_bp.route('/restart')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def restart_app(user_dict=None):
     if not ldap_is_rtp(user_dict['account']):
@@ -34,7 +34,7 @@ def restart_app(user_dict=None):
 
 
 @cache_bp.route('/clearcache')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def clear_cache(user_dict=None):
     if not ldap_is_eval_director(user_dict['account']) and not ldap_is_rtp(user_dict['account']):

conditional/blueprints/co_op.py

@@ -17,7 +17,7 @@
 
 
 @co_op_bp.route('/co_op/')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_co_op_form(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -33,7 +33,7 @@ def display_co_op_form(user_dict=None):
 
 
 @co_op_bp.route('/co_op/submit', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def submit_co_op_form(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -65,7 +65,7 @@ def submit_co_op_form(user_dict=None):
 
 
 @co_op_bp.route('/co_op/<uid>', methods=['DELETE'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def delete_co_op(uid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -91,7 +91,7 @@ def delete_co_op(uid, user_dict=None):
 
 
 @co_op_bp.route('/co_op/manage')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_co_op_management(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)

conditional/blueprints/conditional.py

@@ -15,7 +15,7 @@
 
 
 @conditionals_bp.route('/conditionals/')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_conditionals(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -39,7 +39,7 @@ def display_conditionals(user_dict=None):
 
 
 @conditionals_bp.route('/conditionals/create', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def create_conditional(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -76,7 +76,7 @@ def create_conditional(user_dict=None):
 
 
 @conditionals_bp.route('/conditionals/review', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def conditional_review(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -113,7 +113,7 @@ def conditional_review(user_dict=None):
 
 
 @conditionals_bp.route('/conditionals/delete/<cid>', methods=['DELETE'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def conditional_delete(cid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)

conditional/blueprints/dashboard.py

@@ -29,7 +29,7 @@ def is_seminar_attendance_valid(attendance):
 
 # pylint: disable=too-many-statements
 @dashboard_bp.route('/dashboard/')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_dashboard(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)

conditional/blueprints/housing.py

@@ -20,7 +20,7 @@
 
 
 @housing_bp.route('/housing')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_housing(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -62,7 +62,7 @@ def display_housing(user_dict=None):
 
 
 @housing_bp.route('/housing/in_queue', methods=['PUT'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def change_queue_state(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -88,7 +88,7 @@ def change_queue_state(user_dict=None):
 
 
 @housing_bp.route('/housing/update/<rmnumber>', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def change_room_numbers(rmnumber, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -121,7 +121,7 @@ def change_room_numbers(rmnumber, user_dict=None):
 
 
 @housing_bp.route('/housing/room/<rmnumber>', methods=['GET'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 def get_occupants(rmnumber):
 
     # Get the current list of people living on-floor.
@@ -134,7 +134,7 @@ def get_occupants(rmnumber):
 
 
 @housing_bp.route('/housing', methods=['DELETE'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def clear_all_rooms(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)

conditional/blueprints/intro_evals.py

@@ -25,7 +25,7 @@
 
 
 @intro_evals_bp.route('/intro_evals/')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_intro_evals(internal=False, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)

conditional/blueprints/intro_evals_form.py

@@ -15,7 +15,7 @@
 
 
 @intro_evals_form_bp.route('/intro_evals_form/')
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def display_intro_evals_form(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
@@ -36,7 +36,7 @@ def display_intro_evals_form(user_dict=None):
 
 
 @intro_evals_form_bp.route('/intro_evals/submit', methods=['POST'])
-@auth.oidc_auth
+@auth.oidc_auth("default")
 @get_user
 def submit_intro_evals(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)