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

Merge pull request #2820 from jumpserver/dev_perms 

[Update] 修改资产授权序列类返回资产protocols的协议格式/, 同时添加protocol和port字段
pull/2824/head
BaiJiangJie 2019-06-20 15:52:13 +08:00 committed by GitHub
parent 895dfe475c 152c59365f
commit 7e16ce41e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/assets/backends/vault.py
View File

@ -1,19 +1,11 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from ..base import BaseBackend from .base import BaseBackend
class VaultBackend(BaseBackend): class VaultBackend(BaseBackend):
@classmethod
def get(cls, username, asset):
pass
@classmethod @classmethod
def filter(cls, username=None, asset=None, latest=True): def filter(cls, username=None, asset=None, latest=True):
pass pass
@classmethod
def create(cls, **kwargs):
pass

15
apps/assets/serializers/asset.py
View File

@ -27,8 +27,6 @@ class ProtocolsRelatedField(serializers.RelatedField):
return str(value) return str(value)
def to_internal_value(self, data): def to_internal_value(self, data):
print(data)
print(type(data))
if isinstance(data, dict): if isinstance(data, dict):
return data return data
if '/' not in data: if '/' not in data:
@ -152,7 +150,9 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
""" """
被授权资产的数据结构 被授权资产的数据结构
""" """
protocols = ProtocolSerializer(many=True) protocols = ProtocolsRelatedField(
many=True, queryset=Protocol.objects.all(), label=_("Protocols")
)
system_users_granted = AssetSystemUserSerializer(many=True, read_only=True) system_users_granted = AssetSystemUserSerializer(many=True, read_only=True)
system_users_join = serializers.SerializerMethodField() system_users_join = serializers.SerializerMethodField()
# nodes = NodeTMPSerializer(many=True, read_only=True) # nodes = NodeTMPSerializer(many=True, read_only=True)
@ -160,9 +160,9 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Asset model = Asset
fields = ( fields = (
"id", "hostname", "ip", "protocols", "system_users_granted", "id", "hostname", "ip", "protocol", "port", "protocols",
"is_active", "system_users_join", "os", 'domain', "system_users_granted", "is_active", "system_users_join", "os",
"platform", "comment", "org_id", "org_name", 'domain', "platform", "comment", "org_id", "org_name",
) )
@staticmethod @staticmethod
@ -187,8 +187,7 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
class AssetSimpleSerializer(serializers.ModelSerializer): class AssetSimpleSerializer(serializers.ModelSerializer):
protocols = ProtocolSerializer(many=True)
class Meta: class Meta:
model = Asset model = Asset
fields = ['id', 'hostname', 'ip', 'protocols', 'connectivity', 'port'] fields = ['id', 'hostname', 'ip', 'connectivity', 'port']