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

feat: 支持自定义认证 backend；统一其他认证方式的信号触发逻辑；

pull/8803/head
Jiangjie.Bai 2022-08-24 18:04:22 +08:00
parent 9123839b48
commit 89051b2c67
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/authentication/backends/custom.py
View File

@ -29,7 +29,7 @@ class CustomAuthBackend(JMSModelBackend):
@staticmethod @staticmethod
def get_or_create_user_from_userinfo(userinfo: dict): def get_or_create_user_from_userinfo(userinfo: dict):
username = userinfo['username'] username = userinfo['username']
attrs = ['name', 'username', 'email'] attrs = ['name', 'username', 'email', 'is_active']
defaults = {attr: userinfo[attr] for attr in attrs} defaults = {attr: userinfo[attr] for attr in attrs}
user, created = get_user_model().objects.get_or_create( user, created = get_user_model().objects.get_or_create(
username=username, defaults=defaults username=username, defaults=defaults
@ -39,7 +39,7 @@ class CustomAuthBackend(JMSModelBackend):
def authenticate(self, request, username=None, password=None, **kwargs): def authenticate(self, request, username=None, password=None, **kwargs):
try: try:
authenticate = self.load_authenticate_method() authenticate = self.load_authenticate_method()
userinfo: dict = authenticate(username=username, password=password) userinfo: dict = authenticate(username=username, password=password, **kwargs)
user, created = self.get_or_create_user_from_userinfo(userinfo) user, created = self.get_or_create_user_from_userinfo(userinfo)
except Exception as e: except Exception as e:
logger.error('Custom authenticate error: {}'.format(e)) logger.error('Custom authenticate error: {}'.format(e))