diff --git a/app/options.py b/app/options.py index c4ba5370..3c23a62f 100644 --- a/app/options.py +++ b/app/options.py @@ -624,6 +624,7 @@ if form.getvalue('get_ldap_email'): port = sql.get_setting('ldap_port') user = sql.get_setting('ldap_user') password = sql.get_setting('ldap_password') + ldap_base = sql.get_setting('ldap_base') l = ldap.initialize("ldap://"+server+':'+port) try: @@ -632,10 +633,9 @@ if form.getvalue('get_ldap_email'): bind = l.simple_bind_s(user, password) - base = "dc=kar-tel, dc=local" criteria = "(&(objectClass=user)(sAMAccountName="+username+"))" 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)] try: diff --git a/app/servers.py b/app/servers.py index 47911008..bb993e92 100644 --- a/app/servers.py +++ b/app/servers.py @@ -19,6 +19,7 @@ try: user = sql.get_user_name_by_uuid(user_id.value) servers = sql.get_dick_permit() token = sql.get_token(user_id.value) + ldap_enable = sql.get_setting('ldap_enable') except: pass @@ -33,5 +34,6 @@ output_from_parsed_template = template.render(title = "Servers manage", group = sql.get_user_group_by_uuid(user_id.value), sshs = sql.select_ssh(), telegrams = sql.get_user_telegram_by_uuid(user_id.value), - token = token) + token = token, + ldap_enable = ldap_enable) print(output_from_parsed_template) \ No newline at end of file