github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-01 23:47:40 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 调整openid backend顺序；openid 用户创建/更新添加日志输出

Browse Source
This commit is contained in:
Bai
2020-04-29 00:43:54 +08:00
parent c0089a98f4
commit 9eee79f7d4
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jumpserver/conf.py
View File

@@ -427,8 +427,8 @@ class DynamicConfig:
if self.static_config.get('AUTH_CAS'): if self.static_config.get('AUTH_CAS'):
backends.insert(0, 'authentication.backends.cas.CASBackend') backends.insert(0, 'authentication.backends.cas.CASBackend')
if self.static_config.get('AUTH_OPENID'): if self.static_config.get('AUTH_OPENID'):
backends.insert(0, 'jms_oidc_rp.backends.OIDCAuthCodeBackend')
backends.insert(0, 'jms_oidc_rp.backends.OIDCAuthPasswordBackend') backends.insert(0, 'jms_oidc_rp.backends.OIDCAuthPasswordBackend')
backends.insert(0, 'jms_oidc_rp.backends.OIDCAuthCodeBackend')
if self.static_config.get('AUTH_RADIUS'): if self.static_config.get('AUTH_RADIUS'):
backends.insert(0, 'authentication.backends.radius.RadiusBackend') backends.insert(0, 'authentication.backends.radius.RadiusBackend')
return backends return backends

9
apps/users/signals_handler.py
View File

@@ -56,9 +56,18 @@ def on_ldap_create_user(sender, user, ldap_user, **kwargs):
@receiver(openid_create_or_update_user) @receiver(openid_create_or_update_user)
def on_openid_create_or_update_user(sender, request, user, created, name, username, email, **kwargs): def on_openid_create_or_update_user(sender, request, user, created, name, username, email, **kwargs):
if created: if created:
logger.debug(
"Receive OpenID user created signal: {}, "
"Set user source is: {}".format(user, User.SOURCE_OPENID)
)
user.source = User.SOURCE_OPENID user.source = User.SOURCE_OPENID
user.save() user.save()
elif not created and settings.AUTH_OPENID_ALWAYS_UPDATE_USER: elif not created and settings.AUTH_OPENID_ALWAYS_UPDATE_USER:
logger.debug(
"Receive OpenID user updated signal: {}, "
"Update user info: {}"
"".format(user, "name: {}|username: {}|email: {}".format(name, username, email))
)
user.name = name user.name = name
user.username = username user.username = username
user.email = email user.email = email