external/proxstar
1
0
Fork 0
mirror of https://github.com/ComputerScienceHouse/proxstar.git synced 2025-03-09 15:40:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #67 from ComputerScienceHouse/revert-63-ldap_cache

Browse source 
Revert "Simple ldap cache"
This commit is contained in:
Devin Matte 2020-12-22 00:16:47 -05:00 • committed by GitHub
commit cc73b300ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
proxstar/__init__.py
View file

@ -44,7 +44,6 @@ from proxstar.vnc import (
) )
from proxstar.auth import get_auth from proxstar.auth import get_auth
from proxstar.util import gen_password from proxstar.util import gen_password
from proxstar.ldapdb import connect_ldap
from proxstar.starrs import check_hostname, renew_ip from proxstar.starrs import check_hostname, renew_ip
from proxstar.proxmox import connect_proxmox, get_isos, get_pools, get_ignored_pools from proxstar.proxmox import connect_proxmox, get_isos, get_pools, get_ignored_pools
@ -83,7 +82,6 @@ engine = create_engine(app.config['SQLALCHEMY_DATABASE_URI'])
Base.metadata.bind = engine Base.metadata.bind = engine
DBSession = sessionmaker(bind=engine) DBSession = sessionmaker(bind=engine)
db = DBSession() db = DBSession()
ldap_conn = connect_ldap()
starrs = psycopg2.connect( starrs = psycopg2.connect(
"dbname='{}' user='{}' host='{}' password='{}'".format( "dbname='{}' user='{}' host='{}' password='{}'".format(

25
proxstar/ldapdb.py
View file

@ -1,8 +1,7 @@
from functools import lru_cache
from csh_ldap import CSHLDAP from csh_ldap import CSHLDAP
from flask import current_app as app from flask import current_app as app
from proxstar import logging, ldap_conn from proxstar import logging
def connect_ldap(): def connect_ldap():
@ -14,28 +13,28 @@ def connect_ldap():
return ldap return ldap
@lru_cache(maxsize=32)
def is_rtp(user): def is_rtp(user):
rtp_group = ldap_conn.get_group('rtp') ldap = connect_ldap()
return rtp_group.check_member(ldap_conn.get_member(user, uid=True)) rtp_group = ldap.get_group('rtp')
return rtp_group.check_member(ldap.get_member(user, uid=True))
@lru_cache(maxsize=32)
def is_active(user): def is_active(user):
active_group = ldap_conn.get_group('active') ldap = connect_ldap()
return active_group.check_member(ldap_conn.get_member(user, uid=True)) active_group = ldap.get_group('active')
return active_group.check_member(ldap.get_member(user, uid=True))
@lru_cache(maxsize=32)
def is_current_student(user): def is_current_student(user):
current_student_group = ldap_conn.get_group('current_student') ldap = connect_ldap()
return current_student_group.check_member(ldap_conn.get_member(user, uid=True)) current_student_group = ldap.get_group('current_student')
return current_student_group.check_member(ldap.get_member(user, uid=True))
@lru_cache(maxsize=32)
def is_user(user): def is_user(user):
ldap = connect_ldap()
try: try:
ldap_conn.get_member(user, uid=True) ldap.get_member(user, uid=True)
return True return True
except: except:
return False return False