Remove ldap dependency

Author: mxmeinhold

.github/workflows/lint.yml

@@ -15,8 +15,6 @@ jobs:
         python-version: [3.8]
 
     steps:
-      - name: Install ldap dependencies
-        run: sudo apt-get update && sudo apt-get install libldap2-dev libsasl2-dev
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2

requirements.txt

@@ -8,7 +8,6 @@ cffi==1.14.0
 chardet==3.0.4
 click==7.1.2
 cryptography==2.9.2
-csh-ldap==2.2.0
 dnspython==1.16.0
 Flask==1.1.2
 Flask-Migrate==2.1.1
@@ -39,13 +38,11 @@ pyOpenSSL==19.1.0
 python-dateutil==2.8.1
 python-docx==0.8.6
 python-editor==1.0.4
-python-ldap==3.0.0
 python-resize-image==1.1.11
 requests==2.23.0
 sentry-sdk==0.14.3
 six==1.14.0
 SQLAlchemy==1.3.17
-srvlookup==2.0.0
 toml==0.10.1
 urllib3==1.25.9
 Werkzeug==1.0.1

selections/__init__.py

@@ -2,7 +2,6 @@
 import os
 from collections import defaultdict
 
-import csh_ldap
 from flask import Flask
 from flask_migrate import Migrate
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
@@ -23,10 +22,6 @@
 auth = OIDCAuthentication(app, issuer=app.config['OIDC_ISSUER'],
                           client_registration_info=app.config['OIDC_CLIENT_CONFIG'])
 
-# Create a connection to CSH LDAP
-_ldap = csh_ldap.CSHLDAP(
-    app.config['LDAP_BIND_DN'], app.config['LDAP_BIND_PASS'])
-
 # Sentry
 sentry_sdk.init(
     dsn=app.config['SENTRY_DSN'],
@@ -44,15 +39,15 @@
 from selections.blueprints.application import *
 from selections.blueprints.teams import *
 
-from selections.utils import before_request, get_member_info
+from selections.utils import before_request
 
 
 @app.route('/')
 @auth.oidc_auth
 @before_request
 def main(info=None):
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
     member = Members.query.filter_by(username=info['uid']).first()
 
     all_applications = Applicant.query.all()

selections/blueprints/application.py

@@ -15,8 +15,8 @@
 def get_application(app_id, info=None):
     applicant_info = Applicant.query.filter_by(id=app_id).first()
     member = Members.query.filter_by(username=info['uid']).first()
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
     if not member and not (is_rtp or is_evals):
         return redirect(url_for('main'))
 
@@ -115,8 +115,8 @@ def import_application():
 @auth.oidc_auth
 @before_request
 def delete_application(app_id, info=None):
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
     if is_evals or is_rtp:
         scores = Submission.query.filter_by(application=app_id).all()
         applicant_info = Applicant.query.filter_by(id=app_id).first()
@@ -136,8 +136,8 @@ def delete_application(app_id, info=None):
 @auth.oidc_auth
 @before_request
 def get_application_creation(info=None):
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
     if is_evals or is_rtp:
         return render_template('create.html', info=info)
     else:

selections/blueprints/teams.py

@@ -9,8 +9,8 @@
 @auth.oidc_auth
 @before_request
 def get_teams(info=None):
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
 
     if not is_evals and not is_rtp:
         flash('Not Evals or an RTP')
@@ -37,8 +37,8 @@ def get_teams(info=None):
 @auth.oidc_auth
 @before_request
 def create_team(info=None):
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
 
     if not is_evals and not is_rtp:
         flash('Not Evals or an RTP')
@@ -72,8 +72,8 @@ def create_team(info=None):
 @auth.oidc_auth
 @before_request
 def add_to_team(team_id, info=None):
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
 
     if not is_evals and not is_rtp:
         flash('Not Evals or an RTP')
@@ -105,8 +105,8 @@ def add_to_team(team_id, info=None):
 @auth.oidc_auth
 @before_request
 def remove_from_team(username, info=None):
-    is_evals = 'eboard-evaluations' in info['member_info']['group_list']
-    is_rtp = 'rtp' in info['member_info']['group_list']
+    is_evals = 'eboard-evaluations' in info['group_list']
+    is_rtp = 'rtp' in info['group_list']
 
     if not is_evals and not is_rtp:
         return 'Not Evals or an RTP'