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

fix: 修复 ldap 用户登录时邮箱存在 500 的问题

pull/9870/head
Bai 2023-03-02 16:19:20 +08:00 committed by Jiangjie.Bai
parent 1901ef7252
commit 891c478d13
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/authentication/views/login.py
View File

@ -232,12 +232,19 @@ class UserLoginView(mixins.AuthMixin, UserLoginContextMixin, FormView):
return super().form_invalid(form) return super().form_invalid(form)
except (IntegrityError,) as e: except (IntegrityError,) as e:
# (1062, "Duplicate entry 'youtester001@example.com' for key 'users_user.email'") # (1062, "Duplicate entry 'youtester001@example.com' for key 'users_user.email'")
error = str(e)
if len(e.args) < 2:
form.add_error(None, error)
return super().form_invalid(form)
msg_list = e.args[1].split("'") msg_list = e.args[1].split("'")
if len(msg_list) < 4:
form.add_error(None, error)
return super().form_invalid(form)
email, field = msg_list[1], msg_list[3] email, field = msg_list[1], msg_list[3]
if field == 'users_user.email': if field == 'users_user.email':
error = _('User email already exists ({})').format(email) error = _('User email already exists ({})').format(email)
else:
error = str(e)
form.add_error(None, error) form.add_error(None, error)
return super().form_invalid(form) return super().form_invalid(form)
self.clear_rsa_key() self.clear_rsa_key()