From b007e510142f6aa8062b8612ee7fc7250984bb18 Mon Sep 17 00:00:00 2001 From: Tyler Allen Date: Wed, 28 Jan 2026 20:38:27 -0500 Subject: [PATCH 1/2] add _director to auth dict to make things work pls pretty pls (#459) --- conditional/util/auth.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conditional/util/auth.py b/conditional/util/auth.py index 11cc826b..bf8a3d4a 100644 --- a/conditional/util/auth.py +++ b/conditional/util/auth.py @@ -22,8 +22,8 @@ def wrapped_func(*args, **kwargs): "is_active": is_active, "is_alumni": is_alumni, "is_eboard": is_eboard, - "is_financial": is_financial, - "is_eval": is_eval}, *args, **kwargs) + "is_financial_director": is_financial, + "is_eval_director": is_eval}, *args, **kwargs) return wrapped_func From 94a7dc9069bfc43cd689891ac66678303af26c72 Mon Sep 17 00:00:00 2001 From: Tyler Allen Date: Thu, 29 Jan 2026 10:11:15 -0500 Subject: [PATCH 2/2] Fixed broken directorship function, removed unused function (#460) * add _director * fixed broken directorship function * fixed unused imports * fixed unused imports again --- conditional/util/auth.py | 28 ++-------------------------- conditional/util/ldap.py | 11 +++++------ 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/conditional/util/auth.py b/conditional/util/auth.py index bf8a3d4a..bee8e261 100644 --- a/conditional/util/auth.py +++ b/conditional/util/auth.py @@ -1,32 +1,8 @@ from functools import wraps -from flask import request, session - -from conditional.util.ldap import ldap_is_active, ldap_is_alumni, \ - ldap_is_eboard, ldap_is_eval_director, \ - ldap_is_financial_director, ldap_get_member, ldap_is_current_student - - -def webauth_request(func): - @wraps(func) - def wrapped_func(*args, **kwargs): - user_name = request.headers.get('x-webauth-user') - account = ldap_get_member(user_name) - is_active = ldap_is_active(account) - is_alumni = ldap_is_alumni(account) - is_eboard = ldap_is_eboard(account) - is_financial = ldap_is_financial_director(account) - is_eval = ldap_is_eval_director(account) - - return func({"user_name": user_name, - "is_active": is_active, - "is_alumni": is_alumni, - "is_eboard": is_eboard, - "is_financial_director": is_financial, - "is_eval_director": is_eval}, *args, **kwargs) - - return wrapped_func +from flask import session +from conditional.util.ldap import ldap_get_member, ldap_is_current_student def get_user(func): @wraps(func) diff --git a/conditional/util/ldap.py b/conditional/util/ldap.py index 01cb53dc..a65401c6 100644 --- a/conditional/util/ldap.py +++ b/conditional/util/ldap.py @@ -22,9 +22,8 @@ def _ldap_remove_member_from_group(account: CSHMember, group: str): @service_cache(maxsize=256) -def _ldap_is_member_of_directorship(account: CSHMember, directorship: str): - return account.in_group(f'eboard-{directorship}', dn=True) -# TODO: try in_group(ldap.get_group(f'eboard-{directorship}')) and profile +def _ldap_is_member_of_directorship(member: CSHMember, directorship: str): + return _ldap_is_member_of_group(member, f'eboard-{directorship}') @service_cache(maxsize=1024) def ldap_get_member(username: str) -> CSHMember: @@ -81,7 +80,7 @@ def ldap_is_eboard(account) -> bool: @service_cache(maxsize=128) def ldap_is_rtp(account) -> bool: - return _ldap_is_member_of_group(account, 'rtp') + return _ldap_is_member_of_group(account, 'active_rtp') @service_cache(maxsize=128) @@ -96,12 +95,12 @@ def ldap_is_onfloor(account) -> bool: @service_cache(maxsize=128) def ldap_is_financial_director(account) -> bool: - return _ldap_is_member_of_directorship(account, 'Financial') + return _ldap_is_member_of_directorship(account, 'financial') @service_cache(maxsize=128) def ldap_is_eval_director(account) -> bool: - return _ldap_is_member_of_directorship(account, 'Evaluations') + return _ldap_is_member_of_directorship(account, 'evaluations') @service_cache(maxsize=256)