From 3861943518e6366088180c5fd2ade544a573d57c Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 26 May 2020 14:23:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E7=89=88=E6=9C=AC=E5=8F=B7=20jumpserver-django-oidc-r?= =?UTF-8?q?p=3D=3D0.3.7.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 59e86f1ac..bd65081c3 100644 --- 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 From 985063335019a1b5c13243832162c49b23436351 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 1 Jun 2020 12:06:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0LDAP=20USER=5F?= =?UTF-8?q?QUERY=5FFIELD=E5=AD=97=E6=AE=B5=E5=80=BC=E4=B8=BAusername?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE=E5=BA=93=E5=9B=A0?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E6=95=8F=E6=84=9F=E5=AF=BC=E8=87=B4LDAP?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=A4=E8=AF=81=E9=A6=96=E6=AC=A1=E6=88=90?= =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E5=86=8D=E6=AC=A1=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E5=A6=82=E6=9E=9C=E4=B8=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=AD=A4=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=88=99=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BD=BF=E7=94=A8=E5=B0=8F=E5=86=99=EF=BC=8C=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=8F=AF=E8=83=BD=E4=BC=9A=E4=BD=BF=E7=94=A8=E5=A4=A7?= =?UTF-8?q?=E5=86=99=EF=BC=8C=E6=9C=80=E7=BB=88=E5=AF=BC=E8=87=B4username?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=80=8C=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/settings/auth.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py index b7633ace7..f96498e0e 100644 --- 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