diff --git a/apps/acls/models/login_asset_acl.py b/apps/acls/models/login_asset_acl.py index 3425ac8de..37bea242a 100644 --- a/apps/acls/models/login_asset_acl.py +++ b/apps/acls/models/login_asset_acl.py @@ -64,7 +64,7 @@ class LoginAssetACL(BaseACL, OrgModelMixin): Q(assets__hostname_group__contains=asset.name) | Q(assets__hostname_group__contains='*') ) - ids = [q.id for q in queryset if contains_ip(asset.ip, q.assets.get('ip_group', []))] + ids = [q.id for q in queryset if contains_ip(asset.address, q.assets.get('ip_group', []))] queryset = cls.objects.filter(id__in=ids) return queryset diff --git a/apps/assets/api/account/account.py b/apps/assets/api/account/account.py index 4aef92de0..94b29995f 100644 --- a/apps/assets/api/account/account.py +++ b/apps/assets/api/account/account.py @@ -26,7 +26,7 @@ class AccountViewSet(OrgBulkModelViewSet): } rbac_perms = { 'verify': 'assets.test_account', - 'partial_update': 'assets.change_assetaccountsecret', + 'partial_update': 'assets.change_accountsecret', } @action(methods=['post'], detail=True, url_path='verify') diff --git a/apps/assets/filters.py b/apps/assets/filters.py index 2af062718..de2550ceb 100644 --- a/apps/assets/filters.py +++ b/apps/assets/filters.py @@ -142,7 +142,7 @@ class IpInFilterBackend(filters.BaseFilterBackend): if not ips: return queryset ip_list = [i.strip() for i in ips.split(',')] - queryset = queryset.filter(ip__in=ip_list) + queryset = queryset.filter(address__in=ip_list) return queryset def get_schema_fields(self, view): diff --git a/apps/authentication/serializers/connection_token.py b/apps/authentication/serializers/connection_token.py index 8f36ddc2b..e809ed78c 100644 --- a/apps/authentication/serializers/connection_token.py +++ b/apps/authentication/serializers/connection_token.py @@ -113,7 +113,7 @@ class ConnectionTokenAssetSerializer(serializers.ModelSerializer): """ Asset """ class Meta: model = Asset - fields = ['id', 'name', 'ip', 'protocols', 'org_id'] + fields = ['id', 'name', 'address', 'protocols', 'org_id'] class ConnectionTokenAccountSerializer(serializers.ModelSerializer):