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

Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

pull/7289/head
ibuler 2021-11-24 20:41:41 +08:00
parent 9dd93ea3b8 5ace5a752e
commit 2ee26971c9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/authentication/middleware.py
View File

@ -7,8 +7,11 @@ class MFAMiddleware:
def __call__(self, request): def __call__(self, request):
response = self.get_response(request) response = self.get_response(request)
if request.path.find('/auth/login/otp/') > -1:
return response white_urls = ['login/mfa', 'mfa/select', 'jsi18n/', '/static/']
for url in white_urls:
if request.path.find(url) > -1:
return response
if request.session.get('auth_mfa_required'): if request.session.get('auth_mfa_required'):
return redirect('authentication:login-mfa') return redirect('authentication:login-mfa')
return response return response

2
apps/authentication/mixins.py
View File

@ -417,12 +417,10 @@ class AuthACLMixin:
self.request.session["auth_confirm"] = "1" self.request.session["auth_confirm"] = "1"
return return
elif ticket.state_reject: elif ticket.state_reject:
self.clean_mfa_mark()
raise errors.LoginConfirmOtherError( raise errors.LoginConfirmOtherError(
ticket.id, ticket.get_state_display() ticket.id, ticket.get_state_display()
) )
elif ticket.state_close: elif ticket.state_close:
self.clean_mfa_mark()
raise errors.LoginConfirmOtherError( raise errors.LoginConfirmOtherError(
ticket.id, ticket.get_state_display() ticket.id, ticket.get_state_display()
) )

1
apps/authentication/signals_handlers.py
View File

@ -7,7 +7,6 @@ from django.dispatch import receiver
from django_cas_ng.signals import cas_user_authenticated from django_cas_ng.signals import cas_user_authenticated
from jms_oidc_rp.signals import openid_user_login_failed, openid_user_login_success from jms_oidc_rp.signals import openid_user_login_failed, openid_user_login_success
from .signals import post_auth_success, post_auth_failed from .signals import post_auth_success, post_auth_failed

4
apps/perms/filters.py
View File

@ -143,7 +143,7 @@ class AssetPermissionFilter(PermissionBaseFilter):
if not _nodes: if not _nodes:
return queryset.none() return queryset.none()
node = _nodes.get() node = _nodes.first()
if not is_query_all: if not is_query_all:
queryset = queryset.filter(nodes=node) queryset = queryset.filter(nodes=node)
@ -170,7 +170,7 @@ class AssetPermissionFilter(PermissionBaseFilter):
return queryset return queryset
if not assets: if not assets:
return queryset.none() return queryset.none()
asset = assets.get() asset = assets.first()
if not is_query_all: if not is_query_all:
queryset = queryset.filter(assets=asset) queryset = queryset.filter(assets=asset)