From 1ce40ec87ef71463f07425766a65688c61f2039b Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Thu, 25 Aug 2016 22:59:25 +0200
Subject: [PATCH] Removed dependencies on mysql and ldap libraries
---
server.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/server.py b/server.py
index bb33564..c7538a5 100755
--- a/server.py
+++ b/server.py
@@ -1,9 +1,7 @@
#!/bin/python
from flask import Flask, render_template, g, request, url_for, redirect, session
-import mysql.connector
import sqlite3
import os
-import ldap3
import re
app = Flask(__name__)
@@ -43,6 +41,7 @@ def dict_factory(cursor, row):
def query(operation, *params):
if config['DB_ENGINE'] == 'mysql':
+ import mysql.connector
if 'db' not in g or not g.db.is_connected():
g.db = mysql.connector.connect(user=config['MYSQL_USER'], password=config['MYSQL_PASSWD'], host=config['MYSQL_HOST'], database=config['MYSQL_DB'])
cur = g.db.cursor(dictionary=True)
@@ -78,6 +77,7 @@ def ldapauth(user, password):
notldap = {'videoag':('videoag', ['users','videoag']), 'gustav':('passwort', ['users'])}
user = LDAP_USERRE.sub(r'', user.lower())
if 'LDAP_HOST' in config:
+ import ldap3
try:
conn = ldap3.Connection(config['LDAP_HOST'], 'uid=%s,ou=users,dc=fsmpi,dc=rwth-aachen,dc=de'%user, password, auto_bind=True)
if conn.search("ou=groups,dc=fsmpi,dc=rwth-aachen,dc=de", "(&(cn=*)(memberUid=%s))"%user, attributes=['cn']):
@@ -95,6 +95,7 @@ def ldapget(user):
'gustav': {'uid': 'gustav', 'givenName': 'Gustav', 'sn': 'Geier'}}
user = LDAP_USERRE.sub(r'', user.lower())
if 'LDAP_HOST' in config:
+ import ldap3
conn = ldap3.Connection('ldaps://rumo.fsmpi.rwth-aachen.de', auto_bind=True)
conn.search("ou=users,dc=fsmpi,dc=rwth-aachen,dc=de", "(uid=%s)"%user,
attributes=ldap3.ALL_ATTRIBUTES)
--
GitLab