Merge branch 'develop' into dependabot/pip/cryptography-39.0.1

Dockerfile

@@ -19,4 +19,6 @@ RUN pip install -r requirements.txt
 
 COPY . /opt/profiles
 
+RUN git config --system --add safe.directory '*' # This is also some OKD shit.
+
 ENTRYPOINT ["ddtrace-run", "gunicorn", "profiles:app",  "--bind=0.0.0.0:8080", "--access-logfile=-", "--timeout=600"]

profiles/__init__.py

@@ -90,7 +90,7 @@ def results():
 @before_request
 def search(searched=None, info=None):
     # return jsonify(ldap_search_members(searched))
-    searched = request.args.get("q")
+    searched = request.args.get("q").strip()
     members = ldap_search_members(searched)
     if len(members) == 1:
         return redirect("/user/" + members[0].uid, 302)

profiles/ldap.py

@@ -116,7 +116,7 @@ def ldap_get_eboard():
             ) + _ldap_get_group_members("eboard-financial") + _ldap_get_group_members("eboard-history"
             ) + _ldap_get_group_members("eboard-imps") + _ldap_get_group_members("eboard-opcomm"
             ) + _ldap_get_group_members("eboard-research") + _ldap_get_group_members("eboard-social"
-            ) + _ldap_get_group_members("eboard-secretary")
+            ) + _ldap_get_group_members("eboard-pr") + _ldap_get_group_members("eboard-secretary")
 
     return members
 

profiles/templates/listing.html

@@ -10,7 +10,7 @@ <h1 class="title card-text" style="padding: 10px 0 20px;">{{ title }}</h1>
 	{% endif %}
 	<div class="row">
 		{% for m in members %}
-			<div class="col-12 col-sm-6 col-lg-4 col-xl-3">
+			<div class="col-12 col-sm-6 col-lg-4 col-xl-4">
 				<a href="/user/{{ m['uid'] }}" class="profile-link">
 					<div class="card card-custom-wide mb-3">
 						<div class="card-custom-wide-img">

profiles/templates/profile.html

@@ -71,6 +71,10 @@ <h6 class="card-subtitle mb-2 text-muted">
 							<span class="badge badge-pill badge-info">Webmaster</span>
 							{% endif %}
 
+							{% if "mediapcadmin" in member_info.group_list %}
+							<span class="badge badge-pill badge-info">Media PC Admin</span>
+							{% endif %}
+
 							{% if "3da" in member_info.group_list %}
 							<span class="badge badge-pill badge-pink">3D Printer Admin</span>
 							{% endif %}
@@ -87,6 +91,10 @@ <h6 class="card-subtitle mb-2 text-muted">
 							<span class="badge badge-pill badge-purple">Wiki Maintainer</span>
 							{% endif %}
 
+							{% if "devcade" in member_info.group_list %}
+							<span class="badge badge-pill badge-info">Devcade Admin</span>
+							{% endif %}
+
 							{% if "drink" in member_info.group_list %}
 							<span class="badge badge-pill badge-primary">Drink Admin</span>
 							{% endif %}

requirements.in

@@ -11,8 +11,8 @@ PyMySQL==1.0.2
 pyGravatar==0.0.6
 git+https://github.com/maxcountryman/flask-uploads@master
 pylint~=2.13.9
-Pillow==8.4.0
+Pillow==9.4.0
 requests~=2.27.1
 sentry-sdk[flask]~=1.5.12
-markupsafe==2.0.1
-Werkzeug==0.16.0
+markupsafe==2.1.2
+Werkzeug==1.0.1

requirements.txt

@@ -81,11 +81,11 @@ jinja2==2.11.3
     # via flask
 lazy-object-proxy==1.7.1
     # via astroid
-mako==1.2.0
+mako==1.2.2
     # via
     #   alembic
     #   oic
-markupsafe==2.0.1
+markupsafe==2.1.2
     # via
     #   -r requirements.in
     #   jinja2
@@ -98,13 +98,13 @@ packaging==21.3
     # via ddtrace
 pep517==0.12.0
     # via pip-tools
-pillow==8.4.0
+pillow==9.4.0
     # via -r requirements.in
 pip-tools==6.6.2
     # via -r requirements.in
 platformdirs==2.5.2
     # via pylint
-protobuf==3.20.1
+protobuf==3.20.2
     # via
     #   ddsketch
     #   ddtrace
@@ -156,16 +156,18 @@ srvlookup==2.0.0
 tenacity==8.0.1
     # via ddtrace
 tomli==2.0.1
-    # via pep517
+    # via
+    #   pep517
+    #   pylint
 urllib3==1.26.9
     # via
     #   requests
     #   sentry-sdk
-werkzeug==0.16.0
+werkzeug==1.0.1
     # via
     #   -r requirements.in
     #   flask
-wheel==0.37.1
+wheel==0.38.1
     # via pip-tools
 wrapt==1.14.1
     # via astroid