Move to new CSH LDAP ORM

app.py

@@ -1,16 +1,4 @@
-import os
 from conditional import app
-from conditional.util.ldap import ldap_init
-
-app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
-
-ldap_init(app.config['LDAP_RO'],
-          app.config['LDAP_URL'],
-          app.config['LDAP_BIND_DN'],
-          app.config['LDAP_BIND_PW'],
-          app.config['LDAP_USER_OU'],
-          app.config['LDAP_GROUP_OU'],
-          app.config['LDAP_COMMITTEE_OU'])
 
 if __name__ == "__main__":
     app.run(host=app.config['IP'], port=app.config['PORT'])

conditional/__init__.py

@@ -1,17 +1,26 @@
+import os
 from flask import Flask
 from flask import redirect
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
+from csh_ldap import CSHLDAP
 import structlog
 
 app = Flask(__name__)
 
+config = os.path.join(os.getcwd(), "config.py")
+
+app.config.from_pyfile(config)
 app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)
 logger = structlog.get_logger()
 
+ldap = CSHLDAP(app.config['LDAP_BIND_DN'],
+               app.config['LDAP_BIND_PW'],
+               ro=app.config['LDAP_RO'])
+
 # pylint: disable=C0413
 
 from conditional.blueprints.dashboard import dashboard_bp
@@ -38,8 +47,6 @@
 app.register_blueprint(slideshow_bp)
 app.register_blueprint(cache_bp)
 
-logger.info('conditional started')
-
 
 @app.route('/<path:path>')
 def static_proxy(path):
@@ -56,3 +63,5 @@ def default_route():
 def zoo():
     from conditional.models.migrate import free_the_zoo
     free_the_zoo(app.config['ZOO_DATABASE_URI'])
+
+logger.info('conditional started')

conditional/blueprints/attendance.py

@@ -6,9 +6,10 @@
 from flask import Blueprint, jsonify, redirect, request
 
 from conditional.util.ldap import ldap_get_current_students
-from conditional.util.ldap import ldap_is_eboard
-from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_get_active_members
+from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_is_eboard
+from conditional.util.ldap import ldap_get_member
 
 from conditional.models.models import CurrentCoops
 from conditional.models.models import CommitteeMeeting
@@ -31,10 +32,6 @@
 attendance_bp = Blueprint('attendance_bp', __name__)
 
 
-def get_name(m):
-    return m['cn'][0].decode('utf-8')
-
-
 @attendance_bp.route('/attendance/ts_members')
 def get_all_members():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
@@ -51,14 +48,11 @@ def get_all_members():
         } for f in FreshmanAccount.query.filter(
             FreshmanAccount.eval_date > datetime.now())]
 
-    for m in members:
-        uid = m['uid'][0].decode('utf-8')
-        name = "{name} ({uid})".format(name=get_name(m), uid=uid)
-
+    for account in members:
         named_members.append(
             {
-                'display': name,
-                'value': uid,
+                'display': account.displayName,
+                'value': account.uid,
                 'freshman': False
             })
 
@@ -71,37 +65,34 @@ def get_non_alumni_non_coop(internal=False):
                      request_id=str(uuid.uuid4()))
     log.info('api', action='retrieve house meeting attendance list')
 
-    # Only Members Who Have Paid Dues Are Required to
-    # go to house meetings
-    non_alumni_members = ldap_get_active_members()
+    # Get all active members as a base house meeting attendance.
+    active_members = ldap_get_active_members()
     coop_members = [u.uid for u in CurrentCoops.query.all()]
 
-    named_members = [
+    eligible_members = [
         {
             'display': f.name,
             'value': f.id,
             'freshman': True
         } for f in FreshmanAccount.query.filter(
             FreshmanAccount.eval_date > datetime.now())]
 
-    for m in non_alumni_members:
-        uid = m['uid'][0].decode('utf-8')
-
-        if uid in coop_members:
-            continue
-        name = "{name} ({uid})".format(name=get_name(m), uid=uid)
+    for account in active_members:
+        if account.uid in coop_members:
+            # Members who are on co-op don't need to go to house meeting.
+            pass
 
-        named_members.append(
+        eligible_members.append(
             {
-                'display': name,
-                'value': uid,
+                'display': account.displayName,
+                'value': account.uid,
                 'freshman': False
             })
 
     if internal:
-        return named_members
+        return eligible_members
     else:
-        return jsonify({'members': named_members}), 200
+        return jsonify({'members': eligible_members}), 200
 
 
 @attendance_bp.route('/attendance/cm_members')
@@ -110,27 +101,25 @@ def get_non_alumni():
                      request_id=str(uuid.uuid4()))
     log.info('api', action='retrieve committee meeting attendance list')
 
-    non_alumni_members = ldap_get_current_students()
+    current_students = ldap_get_current_students()
 
-    named_members = [
+    eligible_members = [
         {
             'display': f.name,
             'value': f.id,
             'freshman': True
         } for f in FreshmanAccount.query.filter(
             FreshmanAccount.eval_date > datetime.now())]
-    for m in non_alumni_members:
-        uid = m['uid'][0].decode('utf-8')
-        name = "{name} ({uid})".format(name=get_name(m), uid=uid)
 
-        named_members.append(
+    for account in current_students:
+        eligible_members.append(
             {
-                'display': name,
-                'value': uid,
+                'display': account.displayName,
+                'value': account.uid,
                 'freshman': False
             })
 
-    return jsonify({'members': named_members}), 200
+    return jsonify({'members': eligible_members}), 200
 
 
 @attendance_bp.route('/attendance_cm')
@@ -140,7 +129,8 @@ def display_attendance_cm():
     log.info('frontend', action='display committee meeting attendance page')
 
     user_name = request.headers.get('x-webauth-user')
-    if not ldap_is_eboard(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eboard(account):
         return redirect("/dashboard")
 
     return render_template(request,
@@ -156,7 +146,8 @@ def display_attendance_ts():
     log.info('frontend', action='display technical seminar attendance page')
 
     user_name = request.headers.get('x-webauth-user')
-    if not ldap_is_eboard(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eboard(account):
         return redirect("/dashboard")
 
     return render_template(request,
@@ -172,7 +163,8 @@ def display_attendance_hm():
     log.info('frontend', action='display house meeting attendance page')
 
     user_name = request.headers.get('x-webauth-user')
-    if not ldap_is_eval_director(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eval_director(account):
         return redirect("/dashboard")
 
     return render_template(request,
@@ -189,8 +181,8 @@ def submit_committee_attendance():
     log.info('api', action='submit committee meeting attendance')
 
     user_name = request.headers.get('x-webauth-user')
-
-    if not ldap_is_eboard(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eboard(account):
         return "must be eboard", 403
 
     post_data = request.get_json()
@@ -232,7 +224,8 @@ def submit_seminar_attendance():
 
     user_name = request.headers.get('x-webauth-user')
 
-    if not ldap_is_eboard(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eboard(account):
         return "must be eboard", 403
 
     post_data = request.get_json()
@@ -275,7 +268,8 @@ def submit_house_attendance():
 
     user_name = request.headers.get('x-webauth-user')
 
-    if not ldap_is_eval_director(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eval_director(account):
         return "must be evals", 403
 
     post_data = request.get_json()
@@ -321,7 +315,8 @@ def submit_house_attendance():
 def alter_house_attendance(uid, hid):
     user_name = request.headers.get('x-webauth-user')
 
-    if not ldap_is_eval_director(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eval_director(account):
         return "must be evals", 403
 
     if not uid.isdigit():
@@ -351,7 +346,8 @@ def alter_house_excuse(uid, hid):
 
     user_name = request.headers.get('x-webauth-user')
 
-    if not ldap_is_eval_director(user_name):
+    account = ldap_get_member(user_name)
+    if not ldap_is_eval_director(account):
         return "must be eval director", 403
 
     post_data = request.get_json()

conditional/blueprints/cache_management.py

@@ -4,19 +4,25 @@
 
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_is_rtp
-from conditional.util.ldap import ldap_get_housing_points
+
+from conditional.util.ldap import _ldap_is_member_of_directorship
+from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_get_active_members
 from conditional.util.ldap import ldap_get_intro_members
-from conditional.util.ldap import ldap_get_non_alumni_members
 from conditional.util.ldap import ldap_get_onfloor_members
 from conditional.util.ldap import ldap_get_current_students
-from conditional.util.ldap import ldap_get_name
+
+from conditional.util.member import get_voting_members
+from conditional.util.member import get_members_info
+from conditional.util.member import get_onfloor_members
+
 
 from flask import Blueprint, request, redirect
 
 logger = structlog.get_logger()
 cache_bp = Blueprint('cache_bp', __name__)
 
+
 @cache_bp.route('/restart')
 def restart_app():
     user_name = request.headers.get('x-webauth-user')
@@ -33,44 +39,31 @@ def restart_app():
 def clear_cache():
     user_name = request.headers.get('x-webauth-user')
 
-    if not ldap_is_eval_director(user_name) or ldap_is_rtp(user_name):
+    if not ldap_is_eval_director(user_name) or not ldap_is_rtp(user_name):
         return redirect("/dashboard")
 
     logger.info('api', action='purge system cache')
 
-    ldap_get_housing_points.cache_clear()
+    _ldap_is_member_of_directorship.cache_clear()
+    ldap_get_member.cache_clear()
     ldap_get_active_members.cache_clear()
     ldap_get_intro_members.cache_clear()
-    ldap_get_non_alumni_members.cache_clear()
     ldap_get_onfloor_members.cache_clear()
     ldap_get_current_students.cache_clear()
-    ldap_get_name.cache_clear()
-    return "cache cleared", 200
 
-
-def clear_housing_points_cache():
-    ldap_get_housing_points.cache_clear()
+    get_voting_members.cache_clear()
+    get_members_info.cache_clear()
+    get_onfloor_members.cache_clear()
+    return "cache cleared", 200
 
 
-def clear_active_members_cache():
+def clear_members_cache():
+    ldap_get_member.cache_clear()
     ldap_get_active_members.cache_clear()
-
-
-def clear_intro_members_cache():
+    ldap_get_current_students.cache_clear()
     ldap_get_intro_members.cache_clear()
-
-
-def clear_non_alumni_cache():
-    ldap_get_non_alumni_members.cache_clear()
-
-
-def clear_onfloor_members_cache():
     ldap_get_onfloor_members.cache_clear()
 
 
-def clear_current_students_cache():
-    ldap_get_current_students.cache_clear()
-
-
-def clear_user_cache(username):
-    ldap_get_name(username).cache_clear()
+def clear_committee_cache():
+    _ldap_is_member_of_directorship.clear_cache()

conditional/blueprints/conditional.py

@@ -6,7 +6,7 @@
 
 from flask import Blueprint, request, jsonify, redirect
 
-from conditional.util.ldap import ldap_get_name
+from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.flask import render_template
 
@@ -30,7 +30,7 @@ def display_conditionals():
 
     conditionals = [
         {
-            'name': ldap_get_name(c.uid),
+            'name': ldap_get_member(c.uid).cn,
             'date_created': c.date_created,
             'date_due': c.date_due,
             'description': c.description,