github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 修复ldap认证bug

pull/1007/head
ibuler 2018-02-01 12:33:05 +08:00
parent 02cd3b1a18
commit 21a7202587
4 changed files with 247 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/forms.py
View File

@ -127,7 +127,7 @@ class AssetBulkUpdateForm(forms.ModelForm):
attrs={'class': 'select2', 'data-placeholder': _('Select asset groups')} attrs={'class': 'select2', 'data-placeholder': _('Select asset groups')}
), ),
'labels': forms.SelectMultiple( 'labels': forms.SelectMultiple(
attrs={'class': 'select2', 'data-placeholder': _('Select lables')} attrs={'class': 'select2', 'data-placeholder': _('Select labels')}
), ),
} }

7
apps/common/forms.py
View File

@ -117,7 +117,8 @@ class LDAPSettingForm(BaseForm):
label=_("User OU"), initial='ou=tech,dc=jumpserver,dc=org' label=_("User OU"), initial='ou=tech,dc=jumpserver,dc=org'
) )
AUTH_LDAP_SEARCH_FILTER = forms.CharField( AUTH_LDAP_SEARCH_FILTER = forms.CharField(
label=_("User search filter"), initial='(cn=%(user)s)' label=_("User search filter"), initial='(cn=%(user)s)',
help_text=_("User search filter must contain ([cn,uid,sAMAccountName,...]=%(user)s)")
) )
AUTH_LDAP_USER_ATTR_MAP = DictField( AUTH_LDAP_USER_ATTR_MAP = DictField(
label=_("User attr map"), label=_("User attr map"),
@ -125,13 +126,15 @@ class LDAPSettingForm(BaseForm):
"username": "cn", "username": "cn",
"name": "sn", "name": "sn",
"email": "mail" "email": "mail"
}) }),
help_text=_("User attr map present how to map LDAP user attr to jumpserver, username,name,email is jumpserver attr")
) )
# AUTH_LDAP_GROUP_SEARCH_OU = CONFIG.AUTH_LDAP_GROUP_SEARCH_OU # AUTH_LDAP_GROUP_SEARCH_OU = CONFIG.AUTH_LDAP_GROUP_SEARCH_OU
# AUTH_LDAP_GROUP_SEARCH_FILTER = CONFIG.AUTH_LDAP_GROUP_SEARCH_FILTER # AUTH_LDAP_GROUP_SEARCH_FILTER = CONFIG.AUTH_LDAP_GROUP_SEARCH_FILTER
AUTH_LDAP_START_TLS = forms.BooleanField( AUTH_LDAP_START_TLS = forms.BooleanField(
label=_("Use SSL"), initial=False, required=False label=_("Use SSL"), initial=False, required=False
) )
AUTH_LDAP = forms.BooleanField(label=_("Enable LDAP auth"), initial=False)
class TerminalSettingForm(BaseForm): class TerminalSettingForm(BaseForm):

BIN
apps/i18n/zh/LC_MESSAGES/django.mo
View File

Binary file not shown.

490
apps/i18n/zh/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff