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

Merge remote-tracking branch 'origin/v3' into v3

pull/9008/head
Aaron3S 2022-10-31 19:29:50 +08:00
parent 5fa852c61d 5bd40fcd22
commit 41ee6a64bd
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class LoginAssetACL(BaseACL, OrgModelMixin):
Q(assets__hostname_group__contains=asset.name) | Q(assets__hostname_group__contains=asset.name) |
Q(assets__hostname_group__contains='*') 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) queryset = cls.objects.filter(id__in=ids)
return queryset return queryset

2
apps/assets/api/account/account.py
View File

@ -26,7 +26,7 @@ class AccountViewSet(OrgBulkModelViewSet):
} }
rbac_perms = { rbac_perms = {
'verify': 'assets.test_account', 'verify': 'assets.test_account',
'partial_update': 'assets.change_assetaccountsecret', 'partial_update': 'assets.change_accountsecret',
} }
@action(methods=['post'], detail=True, url_path='verify') @action(methods=['post'], detail=True, url_path='verify')

5
apps/assets/automations/gather_accounts/filter.py
View File

@ -39,8 +39,11 @@ class GatherAccountsFilter:
@staticmethod @staticmethod
def windows_filter(info): def windows_filter(info):
# TODO info = info[4:-2]
result = {} result = {}
for i in info:
for username in i.split():
result[username] = {}
return result return result
def run(self, method_id_meta_mapper, info): def run(self, method_id_meta_mapper, info):

2
apps/assets/filters.py
View File

@ -142,7 +142,7 @@ class IpInFilterBackend(filters.BaseFilterBackend):
if not ips: if not ips:
return queryset return queryset
ip_list = [i.strip() for i in ips.split(',')] 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 return queryset
def get_schema_fields(self, view): def get_schema_fields(self, view):

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

@ -113,7 +113,7 @@ class ConnectionTokenAssetSerializer(serializers.ModelSerializer):
""" Asset """ """ Asset """
class Meta: class Meta:
model = Asset model = Asset
fields = ['id', 'name', 'ip', 'protocols', 'org_id'] fields = ['id', 'name', 'address', 'protocols', 'org_id']
class ConnectionTokenAccountSerializer(serializers.ModelSerializer): class ConnectionTokenAccountSerializer(serializers.ModelSerializer):