github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v3.3 

Bugs
pull/98/head
Aidaho12 2018-11-08 22:05:14 +06:00
parent 92b4929497
commit a31691cb29
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/options.py
View File

@ -624,6 +624,7 @@ if form.getvalue('get_ldap_email'):
port = sql.get_setting('ldap_port') port = sql.get_setting('ldap_port')
user = sql.get_setting('ldap_user') user = sql.get_setting('ldap_user')
password = sql.get_setting('ldap_password') password = sql.get_setting('ldap_password')
ldap_base = sql.get_setting('ldap_base')
l = ldap.initialize("ldap://"+server+':'+port) l = ldap.initialize("ldap://"+server+':'+port)
try: try:
@ -632,10 +633,9 @@ if form.getvalue('get_ldap_email'):
bind = l.simple_bind_s(user, password) bind = l.simple_bind_s(user, password)
base = "dc=kar-tel, dc=local"
criteria = "(&(objectClass=user)(sAMAccountName="+username+"))" criteria = "(&(objectClass=user)(sAMAccountName="+username+"))"
attributes = ['mail'] attributes = ['mail']
result = l.search_s(base, ldap.SCOPE_SUBTREE, criteria, attributes) result = l.search_s(ldap_base, ldap.SCOPE_SUBTREE, criteria, attributes)
results = [entry for dn, entry in result if isinstance(entry, dict)] results = [entry for dn, entry in result if isinstance(entry, dict)]
try: try:

4
app/servers.py
View File

@ -19,6 +19,7 @@ try:
user = sql.get_user_name_by_uuid(user_id.value) user = sql.get_user_name_by_uuid(user_id.value)
servers = sql.get_dick_permit() servers = sql.get_dick_permit()
token = sql.get_token(user_id.value) token = sql.get_token(user_id.value)
ldap_enable = sql.get_setting('ldap_enable')
except: except:
pass pass
@ -33,5 +34,6 @@ output_from_parsed_template = template.render(title = "Servers manage",
group = sql.get_user_group_by_uuid(user_id.value), group = sql.get_user_group_by_uuid(user_id.value),
sshs = sql.select_ssh(), sshs = sql.select_ssh(),
telegrams = sql.get_user_telegram_by_uuid(user_id.value), telegrams = sql.get_user_telegram_by_uuid(user_id.value),
token = token) token = token,
ldap_enable = ldap_enable)
print(output_from_parsed_template) print(output_from_parsed_template)