Removing unusable ldap functions

Author: devinmatte

packet/ldap.py

@@ -1,11 +1,5 @@
-import hashlib
-
 from functools import lru_cache
 
-import urllib.request
-
-from flask import redirect
-
 import ldap
 
 from packet import _ldap
@@ -167,256 +161,8 @@ def ldap_is_rd(account):
     return _ldap_is_member_of_directorship(account, 'research')
 
 
-# Setters
-
-def ldap_set_housingpoints(account, housing_points):
-    account.housingPoints = housing_points
-    ldap_get_current_students.cache_clear()
-    ldap_get_member.cache_clear()
-
-
-def ldap_set_roomnumber(account, room_number):
-    if room_number == "":
-        room_number = None
-    account.roomNumber = room_number
-    ldap_get_current_students.cache_clear()
-    ldap_get_member.cache_clear()
-
-
-def ldap_set_active(account):
-    _ldap_add_member_to_group(account, 'active')
-    ldap_get_active_members.cache_clear()
-    ldap_get_member.cache_clear()
-
-
-def ldap_set_inactive(account):
-    _ldap_remove_member_from_group(account, 'active')
-    ldap_get_active_members.cache_clear()
-    ldap_get_member.cache_clear()
-
-
-def ldap_set_current_student(account):
-    _ldap_add_member_to_group(account, 'current_student')
-    ldap_get_current_students.cache_clear()
-    ldap_get_member.cache_clear()
-
-
-def ldap_set_non_current_student(account):
-    _ldap_remove_member_from_group(account, 'current_student')
-    ldap_get_current_students.cache_clear()
-    ldap_get_member.cache_clear()
-
-def ldap_multi_update(uid, attribute, value):
-    dn = "uid={},cn=users,cn=accounts,dc=csh,dc=rit,dc=edu".format(
-        uid
-    )
-
-    try:
-        current = _ldap.get_member(uid, uid=True).get(attribute)
-    except KeyError:
-        current = []
-
-    remove = list(set(current) - set(value))
-    add = list(set(value) - set(current))
-
-    conn = _ldap.get_con()
-    mod_list = []
-
-    for entry in remove:
-        mod = (ldap.MOD_DELETE, attribute, entry.encode('utf-8'))
-        mod_list.append(mod)
-
-    for entry in add:
-        if entry:
-            mod = (ldap.MOD_ADD, attribute, entry.encode('utf-8'))
-            mod_list.append(mod)
-
-    conn.modify_s(dn, mod_list)
-
-
-# pylint: disable=too-many-branches
-def ldap_update_profile(form_input, uid):
-    account = _ldap.get_member(uid, uid=True)
-    empty = ["None", ""]
-    for key, value in form_input.items():
-        if value in empty:
-            form_input[key] = None
-
-    if not form_input["name"] == account.cn:
-        account.cn = form_input["name"]
-
-    if not form_input["birthday"] == account.birthday:
-        account.birthday = form_input["birthday"]
-
-    try:
-        if not form_input["phone"] == account.get("mobile"):
-            ldap_multi_update(uid, "mobile", form_input["phone"])
-    except KeyError:
-        ldap_multi_update(uid, "mobile", form_input["phone"])
-
-
-    if not form_input["plex"] == account.plex:
-        account.plex = form_input["plex"]
-
-    if "major" in form_input.keys():
-        if not form_input["major"] == account.major:
-            account.major = form_input["major"]
-
-    if "minor" in form_input.keys():
-        if not form_input["minor"] == account.minor:
-            account.minor = form_input["minor"]
-
-    if "ritYear" in form_input.keys():
-        if not form_input["ritYear"] == account.ritYear:
-            account.ritYear = form_input["ritYear"]
-
-    if not form_input["website"] == account.homepageURL:
-        account.homepageURL = form_input["website"]
-
-    if not form_input["github"] == account.github:
-        account.github = form_input["github"]
-
-    if not form_input["twitter"] == account.twitterName:
-        account.twitterName = form_input["twitter"]
-
-    if not form_input["blog"] == account.blogURL:
-        account.blogURL = form_input["blog"]
-
-    if not form_input["resume"] == account.resumeURL:
-        account.resumeURL = form_input["resume"]
-
-    if not form_input["google"] == account.googleScreenName:
-        account.googleScreenName = form_input["google"]
-
-    try:
-        if not form_input["mail"] == account.mail:
-            ldap_multi_update(uid, "mail", form_input["mail"])
-    except KeyError:
-        ldap_multi_update(uid, "mail", form_input["mail"])
-
-    try:
-        if not form_input["nickname"] == account.nickname:
-            ldap_multi_update(uid, "nickname", form_input["nickname"])
-    except KeyError:
-        ldap_multi_update(uid, "nickname", form_input["nickname"])
-
-    if not form_input["shell"] == account.shell:
-        account.loginShell = form_input["shell"]
-
-
 def ldap_get_roomnumber(account):
     try:
         return account.roomNumber
     except AttributeError:
         return ""
-
-
-@lru_cache(maxsize=1024)
-def ldap_search_members(query):
-    con = _ldap.get_con()
-    filt = str("(|(description=*{0}*)"
-                    "(displayName=*{0}*)"
-                    "(mail=*{0}*)"
-                    "(nickName=*{0}*)"
-                    "(plex=*{0}*)"
-                    "(sn=*{0}*)"
-                    "(uid=*{0}*)"
-                    "(mobile=*{0}*)"
-                    "(twitterName=*{0}*)"
-                    "(github=*{0}*))").format(query)
-
-    res = con.search_s(
-        "dc=csh,dc=rit,dc=edu",
-        ldap.SCOPE_SUBTREE,
-        filt,
-        ['uid'])
-
-    ret = []
-
-    for uid in res:
-        try:
-            mem = (str(uid[1]).split('\'')[3])
-            ret.append(ldap_get_member(mem))
-        except IndexError:
-            continue
-
-    return ret
-
-
-@lru_cache(maxsize=1024)
-def ldap_get_year(year):
-    con = _ldap.get_con()
-    filt = str("(&(memberSince>={}0801010101-0400)(memberSince<={}0801010101-0400))").format(year, str(int(year) + 1))
-
-    res = con.search_s(
-        "dc=csh,dc=rit,dc=edu",
-        ldap.SCOPE_SUBTREE,
-        filt,
-        ['uid'])
-
-    ret = []
-
-    for uid in res:
-        try:
-            mem = (str(uid[1]).split('\'')[3])
-            ret.append(ldap_get_member(mem))
-        except IndexError:
-            continue
-
-    return ret
-
-
-@lru_cache(maxsize=1024)
-def get_image(uid):
-    try:
-        account = ldap_get_member(uid)
-        image = account.jpegPhoto
-        github = account.github
-        twitter = account.twitterName
-    except KeyError:
-        return redirect(get_gravatar(), code=302)
-
-    # Return stored Image
-    if image:
-        return image
-
-    # Get Gravatar
-    url = get_gravatar(uid)
-    try:
-        gravatar = urllib.request.urlopen(url)
-        if gravatar.getcode() == 200:
-            return redirect(url, code=302)
-    except urllib.error.HTTPError:
-        pass
-
-    # Get GitHub Photo
-    if github:
-        url = "https://github.com/" + github + ".png?size=250"
-        try:
-            urllib.request.urlopen(url)
-            return redirect(url, code=302)
-        except urllib.error.HTTPError:
-            pass
-
-    # Get Twitter Photo
-    if twitter:
-        url = "https://twitter.com/" + twitter + "/profile_image?size=original"
-        try:
-            urllib.request.urlopen(url)
-            return redirect(url, code=302)
-        except urllib.error.HTTPError:
-            pass
-
-    # Fall back to default
-    return redirect(get_gravatar(), code=302)
-
-
-@lru_cache(maxsize=1024)
-def get_gravatar(uid=None):
-    if uid:
-        addr = uid + "@csh.rit.edu"
-        url = "https://gravatar.com/avatar/" + hashlib.md5(addr.encode('utf8')).hexdigest() +".jpg?d=404&s=250"
-    else:
-        addr = "[email protected]"
-        url = "https://gravatar.com/avatar/" + hashlib.md5(addr.encode('utf8')).hexdigest() + ".jpg?d=mm&s=250"
-    return url

packet/static/js/toggles.js

@@ -1,15 +1,11 @@
 # Credit to Liam Middlebrook and Ram Zallan
 # https://github.com/liam-middlebrook/gallery
-import subprocess
-import base64
 import datetime
-
+import subprocess
 from functools import wraps
-from flask import session
 
 import requests
-
-import ldap
+from flask import session
 
 from packet import _ldap
 from packet.ldap import (ldap_get_member,
@@ -88,25 +84,3 @@ def parse_account_year(date):
             year = year - 1
         return year
     return None
-
-
-def process_image(photo, uid):
-    if base64.b64decode(photo):
-        key = 'jpegPhoto'
-        account = ldap_get_member(uid)
-        bin_icon = base64.b64decode(photo)
-        con = _ldap.get_con()
-        exists = account.jpegPhoto
-
-        if not exists:
-            ldap_mod = ldap.MOD_ADD
-        else:
-            ldap_mod = ldap.MOD_REPLACE
-
-        mod = (ldap_mod, key, bin_icon)
-        mod_attrs = [mod]
-        con.modify_s(account.get_dn(), mod_attrs)
-
-        return True
-    else:
-        return False