github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-26 23:07:24 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改 ConnectionToken Serializer

Browse Source
This commit is contained in:
Bai 2022-12-02 18:09:07 +08:00
parent 52e8082470
commit a70f85e346
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/acls/models/command_acl.py
View File

@ -125,6 +125,8 @@ class CommandFilterACL(OrgModelMixin, BaseACL):
@classmethod @classmethod
def get_command_groups(cls, user_id=None, user_group_id=None, account=None, asset_id=None, org_id=None): def get_command_groups(cls, user_id=None, user_group_id=None, account=None, asset_id=None, org_id=None):
# Todo: Do
return CommandGroup.objects.all()
from assets.models import Account, Asset from assets.models import Account, Asset
user_groups = [] user_groups = []

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

@ -121,26 +121,31 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
@lazyproperty @lazyproperty
def account(self): def account(self):
from assets.models import Account
if not self.asset: if not self.asset:
return None return None
account = self.asset.accounts.filter(name=self.account_name).first() account = self.asset.accounts.filter(name=self.account_name).first()
if self.account_name == '@INPUT' or not account: if self.account_name == '@INPUT' or not account:
return { data = {
'name': self.account_name, 'name': self.account_name,
'username': self.input_username, 'username': self.input_username,
'secret_type': 'password', 'secret_type': 'password',
'secret': self.input_secret, 'secret': self.input_secret,
'su_from': None 'su_from': None,
'org_id': self.asset.org_id
} }
Account(**data)
else: else:
return { data = {
'name': account.name, 'name': account.name,
'username': account.username, 'username': account.username,
'secret_type': account.secret_type, 'secret_type': account.secret_type,
'secret': account.secret or self.input_secret, 'secret': account.secret or self.input_secret,
'su_from': account.su_from, 'su_from': account.su_from,
'org_id': account.org_id
} }
return Account(**data)
@lazyproperty @lazyproperty
def domain(self): def domain(self):

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

@ -120,8 +120,8 @@ class ConnectionTokenGatewaySerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Asset model = Asset
fields = [ fields = [
'id', 'address', 'port', 'username', 'id', 'address', 'port',
'password', 'private_key' # 'username', 'password', 'private_key'
] ]
@ -131,8 +131,7 @@ class ConnectionTokenACLCmdGroupSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = CommandGroup model = CommandGroup
fields = [ fields = [
'id', 'type', 'content', 'ignore_case', 'pattern', 'id', 'type', 'content', 'ignore_case', 'pattern'
'action', 'date_created',
] ]