Merge pull request #4058 from jumpserver/dev

Dev
5 years ago · 19926e67e1
parent 1ef1bea703 af15622319
commit 19926e67e1
2 changed files with 2 additions and 1 deletions
--- a/apps/jumpserver/settings/auth.py
+++ b/apps/jumpserver/settings/auth.py
@ -18,6 +18,7 @@ AUTH_LDAP_SEARCH_OU = DYNAMIC.AUTH_LDAP_SEARCH_OU
 AUTH_LDAP_SEARCH_FILTER = DYNAMIC.AUTH_LDAP_SEARCH_FILTER
 AUTH_LDAP_START_TLS = DYNAMIC.AUTH_LDAP_START_TLS
 AUTH_LDAP_USER_ATTR_MAP = DYNAMIC.AUTH_LDAP_USER_ATTR_MAP
+AUTH_LDAP_USER_QUERY_FIELD = 'username'
 AUTH_LDAP_GLOBAL_OPTIONS = {
    ldap.OPT_X_TLS_REQUIRE_CERT: ldap.OPT_X_TLS_NEVER,
    ldap.OPT_REFERRALS: CONFIG.AUTH_LDAP_OPTIONS_OPT_REFERRALS
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@ -96,4 +96,4 @@ ipython
 huaweicloud-sdk-python==1.0.21
 django-redis==4.11.0
 python-redis-lock==3.5.0
-jumpserver-django-oidc-rp==0.3.7.4
+jumpserver-django-oidc-rp==0.3.7.5