github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-20 09:39:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10183 from O-Jiangweidong/pr@dev@perf_connect_gateway_no_gateway

Browse Source 
perf: 当连接资产为网关时，connection_token不返回网域网关信息
This commit is contained in:
老广 2023-04-12 13:07:29 +08:00 committed by GitHub
commit b0365838fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/authentication/models/connection_token.py
View File

@ -10,6 +10,7 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework.exceptions import PermissionDenied from rest_framework.exceptions import PermissionDenied
from assets.const import Protocol from assets.const import Protocol
from assets.const.host import GATEWAY_NAME
from common.db.fields import EncryptTextField from common.db.fields import EncryptTextField
from common.exceptions import JMSException from common.exceptions import JMSException
from common.utils import lazyproperty, pretty_string, bulk_get from common.utils import lazyproperty, pretty_string, bulk_get
@ -231,12 +232,14 @@ class ConnectionToken(JMSOrgBaseModel):
def domain(self): def domain(self):
if not self.asset.platform.domain_enabled: if not self.asset.platform.domain_enabled:
return return
domain = self.asset.domain if self.asset else None if self.asset.platform.name == GATEWAY_NAME:
return
domain = self.asset.domain if self.asset.domain else None
return domain return domain
@lazyproperty @lazyproperty
def gateway(self): def gateway(self):
if not self.asset: if not self.asset or not self.domain:
return return
return self.asset.gateway return self.asset.gateway