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-25 17:44:51 +08:00
parent 3874b8ed67 85a017b2c4
commit 434793bc41
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/authentication/middleware.py
View File

@ -21,8 +21,8 @@ class MFAMiddleware:
# 这个是 mfa 登录页需要的请求, 也得放出来, 用户其实已经在 CAS/OIDC 中完成登录了 # 这个是 mfa 登录页需要的请求, 也得放出来, 用户其实已经在 CAS/OIDC 中完成登录了
white_urls = [ white_urls = [
'login/mfa', 'mfa/select', 'jsi18n/', '/static/', '/profile/otp', 'login/mfa', 'mfa/select', 'jsi18n/', '/static/',
'/logout/', '/login/' '/profile/otp', '/logout/',
] ]
for url in white_urls: for url in white_urls:
if request.path.find(url) > -1: if request.path.find(url) > -1:

10
apps/perms/filters.py
View File

@ -170,13 +170,13 @@ class AssetPermissionFilter(PermissionBaseFilter):
return queryset return queryset
if not assets: if not assets:
return queryset.none() return queryset.none()
asset = assets.first() assetids = list(assets.values_list('id', flat=True))
if not is_query_all: if not is_query_all:
queryset = queryset.filter(assets=asset) queryset = queryset.filter(assets__in=assetids)
return queryset return queryset
inherit_all_nodekeys = set() inherit_all_nodekeys = set()
inherit_nodekeys = asset.nodes.values_list('key', flat=True) inherit_nodekeys = set(assets.values_list('nodes__key', flat=True))
for key in inherit_nodekeys: for key in inherit_nodekeys:
ancestor_keys = Node.get_node_ancestor_keys(key, with_self=True) ancestor_keys = Node.get_node_ancestor_keys(key, with_self=True)
@ -185,8 +185,8 @@ class AssetPermissionFilter(PermissionBaseFilter):
inherit_all_nodeids = Node.objects.filter(key__in=inherit_all_nodekeys).values_list('id', flat=True) inherit_all_nodeids = Node.objects.filter(key__in=inherit_all_nodekeys).values_list('id', flat=True)
inherit_all_nodeids = list(inherit_all_nodeids) inherit_all_nodeids = list(inherit_all_nodeids)
qs1 = queryset.filter(assets=asset).distinct() qs1 = queryset.filter(assets__in=assetids).distinct()
qs2 = queryset.filter(nodes__id__in=inherit_all_nodeids).distinct() qs2 = queryset.filter(nodes__in=inherit_all_nodeids).distinct()
qs = UnionQuerySet(qs1, qs2) qs = UnionQuerySet(qs1, qs2)
return qs return qs