7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix ldap login

This commit is contained in:
lovvvve 2023-08-01 11:27:29 +00:00
parent 695e9f7546
commit 883d7776e1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmdb-api/api/models/acl.py
View File

@ -62,10 +62,10 @@ class UserQuery(BaseQuery):
ldap_conn.set_option(ldap.OPT_REFERRALS, 0) ldap_conn.set_option(ldap.OPT_REFERRALS, 0)
if '@' in username: if '@' in username:
email = username email = username
who = '{0}@{1}'.format(username.split('@')[0], current_app.config.get('LDAP_DOMAIN')) who = current_app.config.get('LDAP_USER_DN').format(username.split('@')[0])
else: else:
who = '{0}@{1}'.format(username, current_app.config.get('LDAP_DOMAIN')) who = current_app.config.get('LDAP_USER_DN').format(username)
email = who email = "{}@{}".format(who, current_app.config.get('LDAP_DOMAIN'))
username = username.split('@')[0] username = username.split('@')[0]
user = self.get_by_username(username) user = self.get_by_username(username)

1
cmdb-api/settings.example.py
View File

@ -76,6 +76,7 @@ DEFAULT_SERVICE = "http://127.0.0.1:8000"
AUTH_WITH_LDAP = False AUTH_WITH_LDAP = False
LDAP_SERVER = '' LDAP_SERVER = ''
LDAP_DOMAIN = '' LDAP_DOMAIN = ''
LDAP_USER_DN = 'cn={},ou=users,dc=xxx,dc=com'
# # pagination # # pagination
DEFAULT_PAGE_COUNT = 50 DEFAULT_PAGE_COUNT = 50