diff --git a/apps/accounts/models/base.py b/apps/accounts/models/base.py index ffae7051b..37b97f21a 100644 --- a/apps/accounts/models/base.py +++ b/apps/accounts/models/base.py @@ -50,7 +50,7 @@ class BaseAccount(JMSOrgBaseModel): return bool(self.username) @property - def specific(self): + def spec_info(self): data = {} if self.secret_type != SecretType.SSH_KEY: return data diff --git a/apps/accounts/serializers/account/base.py b/apps/accounts/serializers/account/base.py index d92c4cc9c..fb5b51d6f 100644 --- a/apps/accounts/serializers/account/base.py +++ b/apps/accounts/serializers/account/base.py @@ -68,14 +68,14 @@ class BaseAccountSerializer(AuthValidateMixin, BulkOrgResourceModelSerializer): fields_mini = ['id', 'name', 'username'] fields_small = fields_mini + [ '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 = fields_small + fields_other read_only_fields = [ - 'has_secret', 'specific', + 'has_secret', 'spec_info', 'date_verified', 'created_by', 'date_created', ] extra_kwargs = { - 'specific': {'label': _('Specific')}, + 'spec_info': {'label': _('Spec info')}, } diff --git a/apps/ops/ansible/inventory.py b/apps/ops/ansible/inventory.py index 243f1b319..0a3ce43af 100644 --- a/apps/ops/ansible/inventory.py +++ b/apps/ops/ansible/inventory.py @@ -105,7 +105,7 @@ class JMSInventory: 'id': str(asset.id), 'name': asset.name, 'address': asset.address, 'type': asset.type, 'category': asset.category, '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], }, 'jms_account': { diff --git a/apps/perms/serializers/user_permission.py b/apps/perms/serializers/user_permission.py index 8e22623fc..27fde71d1 100644 --- a/apps/perms/serializers/user_permission.py +++ b/apps/perms/serializers/user_permission.py @@ -4,13 +4,13 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework import serializers +from accounts.models import Account from assets.const import Category, AllTypes from assets.models import Node, Asset, Platform -from accounts.models import Account from assets.serializers.asset.common import AssetProtocolsSerializer from common.serializers.fields import ObjectRelatedField, LabeledChoiceField -from perms.serializers.permission import ActionChoicesField from orgs.mixins.serializers import OrgResourceModelSerializerMixin +from perms.serializers.permission import ActionChoicesField __all__ = [ 'NodePermedSerializer', 'AssetPermedSerializer', @@ -32,7 +32,7 @@ class AssetPermedSerializer(OrgResourceModelSerializerMixin): "id", "name", "address", 'domain', 'platform', "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 diff --git a/apps/terminal/applets/chrome/app.py b/apps/terminal/applets/chrome/app.py index 7d9b12c36..491f1e09d 100644 --- a/apps/terminal/applets/chrome/app.py +++ b/apps/terminal/applets/chrome/app.py @@ -87,7 +87,7 @@ class WebAPP(object): self.account = account self.platform = platform - self.extra_data = self.asset.specific + self.extra_data = self.asset.spec_info self._steps = list() autofill_type = self.asset.spec_info.autofill if autofill_type == "basic": @@ -105,24 +105,24 @@ class WebAPP(object): def _default_custom_steps(self) -> list: account = self.account - specific_property = self.asset.specific + spec_info = self.asset.spec_info default_steps = [ Step({ "step": 1, "value": account.username, - "target": specific_property.username_selector, + "target": spec_info.username_selector, "command": "type" }), Step({ "step": 2, "value": account.secret, - "target": specific_property.password_selector, + "target": spec_info.password_selector, "command": "type" }), Step({ "step": 3, "value": "", - "target": specific_property.submit_selector, + "target": spec_info.submit_selector, "command": "click" }) ]