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

Merge pull request #11870 from jumpserver/pr@dev@perf_acl_ip 

perf: 增加针对 ip 的获取
pull/11875/head
Eric_Lee 2023-10-17 16:25:24 +08:00 committed by GitHub
parent e88e4438ba b5ef239c6c
commit 578c2af57c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/api/connection_token.py
View File

@ -18,7 +18,7 @@ from accounts.const import AliasAccount
from acls.notifications import AssetLoginReminderMsg from acls.notifications import AssetLoginReminderMsg
from common.api import JMSModelViewSet from common.api import JMSModelViewSet
from common.exceptions import JMSException from common.exceptions import JMSException
from common.utils import random_string, get_logger, get_request_ip from common.utils import random_string, get_logger, get_request_ip_or_data
from common.utils.django import get_request_os from common.utils.django import get_request_os
from common.utils.http import is_true, is_false from common.utils.http import is_true, is_false
from orgs.mixins.api import RootOrgViewMixin from orgs.mixins.api import RootOrgViewMixin
@ -400,7 +400,7 @@ class ConnectionTokenViewSet(ExtraActionApiMixin, RootOrgViewMixin, JMSModelView
def _validate_acl(self, user, asset, account): def _validate_acl(self, user, asset, account):
from acls.models import LoginAssetACL from acls.models import LoginAssetACL
acls = LoginAssetACL.filter_queryset(user=user, asset=asset, account=account) acls = LoginAssetACL.filter_queryset(user=user, asset=asset, account=account)
ip = get_request_ip(self.request) ip = get_request_ip_or_data(self.request)
acl = LoginAssetACL.get_match_rule_acls(user, ip, acls) acl = LoginAssetACL.get_match_rule_acls(user, ip, acls)
if not acl: if not acl:
return return