perf: 继续替换 spec

pull/9380/head
ibuler 2023-01-31 18:06:44 +08:00
parent 41154d3793
commit ef51e74b8e
5 changed files with 13 additions and 13 deletions

View File

@ -50,7 +50,7 @@ class BaseAccount(JMSOrgBaseModel):
return bool(self.username) return bool(self.username)
@property @property
def specific(self): def spec_info(self):
data = {} data = {}
if self.secret_type != SecretType.SSH_KEY: if self.secret_type != SecretType.SSH_KEY:
return data return data

View File

@ -68,14 +68,14 @@ class BaseAccountSerializer(AuthValidateMixin, BulkOrgResourceModelSerializer):
fields_mini = ['id', 'name', 'username'] fields_mini = ['id', 'name', 'username']
fields_small = fields_mini + [ fields_small = fields_mini + [
'secret_type', 'secret', 'has_secret', 'passphrase', 'secret_type', 'secret', 'has_secret', 'passphrase',
'privileged', 'is_active', 'specific', 'privileged', 'is_active', 'spec_info',
] ]
fields_other = ['created_by', 'date_created', 'date_updated', 'comment'] fields_other = ['created_by', 'date_created', 'date_updated', 'comment']
fields = fields_small + fields_other fields = fields_small + fields_other
read_only_fields = [ read_only_fields = [
'has_secret', 'specific', 'has_secret', 'spec_info',
'date_verified', 'created_by', 'date_created', 'date_verified', 'created_by', 'date_created',
] ]
extra_kwargs = { extra_kwargs = {
'specific': {'label': _('Specific')}, 'spec_info': {'label': _('Spec info')},
} }

View File

@ -105,7 +105,7 @@ class JMSInventory:
'id': str(asset.id), 'name': asset.name, 'address': asset.address, 'id': str(asset.id), 'name': asset.name, 'address': asset.address,
'type': asset.type, 'category': asset.category, 'type': asset.type, 'category': asset.category,
'protocol': asset.protocol, 'port': asset.port, 'protocol': asset.protocol, 'port': asset.port,
'specific': asset.spec, 'spec_info': asset.spec_info,
'protocols': [{'name': p.name, 'port': p.port} for p in protocols], 'protocols': [{'name': p.name, 'port': p.port} for p in protocols],
}, },
'jms_account': { 'jms_account': {

View File

@ -4,13 +4,13 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from accounts.models import Account
from assets.const import Category, AllTypes from assets.const import Category, AllTypes
from assets.models import Node, Asset, Platform from assets.models import Node, Asset, Platform
from accounts.models import Account
from assets.serializers.asset.common import AssetProtocolsSerializer from assets.serializers.asset.common import AssetProtocolsSerializer
from common.serializers.fields import ObjectRelatedField, LabeledChoiceField from common.serializers.fields import ObjectRelatedField, LabeledChoiceField
from perms.serializers.permission import ActionChoicesField
from orgs.mixins.serializers import OrgResourceModelSerializerMixin from orgs.mixins.serializers import OrgResourceModelSerializerMixin
from perms.serializers.permission import ActionChoicesField
__all__ = [ __all__ = [
'NodePermedSerializer', 'AssetPermedSerializer', 'NodePermedSerializer', 'AssetPermedSerializer',
@ -32,7 +32,7 @@ class AssetPermedSerializer(OrgResourceModelSerializerMixin):
"id", "name", "address", 'domain', 'platform', "id", "name", "address", 'domain', 'platform',
"comment", "org_id", "is_active", "comment", "org_id", "is_active",
] ]
fields = only_fields + ['protocols', 'category', 'type', 'specific'] + ['org_name'] fields = only_fields + ['protocols', 'category', 'type', 'spec_info'] + ['org_name']
read_only_fields = fields read_only_fields = fields

View File

@ -87,7 +87,7 @@ class WebAPP(object):
self.account = account self.account = account
self.platform = platform self.platform = platform
self.extra_data = self.asset.specific self.extra_data = self.asset.spec_info
self._steps = list() self._steps = list()
autofill_type = self.asset.spec_info.autofill autofill_type = self.asset.spec_info.autofill
if autofill_type == "basic": if autofill_type == "basic":
@ -105,24 +105,24 @@ class WebAPP(object):
def _default_custom_steps(self) -> list: def _default_custom_steps(self) -> list:
account = self.account account = self.account
specific_property = self.asset.specific spec_info = self.asset.spec_info
default_steps = [ default_steps = [
Step({ Step({
"step": 1, "step": 1,
"value": account.username, "value": account.username,
"target": specific_property.username_selector, "target": spec_info.username_selector,
"command": "type" "command": "type"
}), }),
Step({ Step({
"step": 2, "step": 2,
"value": account.secret, "value": account.secret,
"target": specific_property.password_selector, "target": spec_info.password_selector,
"command": "type" "command": "type"
}), }),
Step({ Step({
"step": 3, "step": 3,
"value": "", "value": "",
"target": specific_property.submit_selector, "target": spec_info.submit_selector,
"command": "click" "command": "click"
}) })
] ]