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

Merge branch 'v3' of github.com:jumpserver/jumpserver into v3

pull/9134/head
ibuler 2022-11-30 15:34:31 +08:00
parent d46f321f1a 99e126f515
commit 21b1dd076a
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/acls/migrations/0004_auto_20220831_1658.py
View File

@ -22,7 +22,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='loginassetacl', model_name='loginassetacl',
name='accounts', name='accounts',
field=models.JSONField(default=dict, verbose_name='Account'), field=models.JSONField(verbose_name='Account'),
), ),
migrations.RunPython(migrate_system_users_to_accounts), migrations.RunPython(migrate_system_users_to_accounts),
migrations.RemoveField( migrations.RemoveField(

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

@ -18,7 +18,7 @@ class LoginAssetACL(BaseACL, OrgModelMixin):
# 条件 # 条件
users = models.JSONField(verbose_name=_('User')) users = models.JSONField(verbose_name=_('User'))
accounts = models.JSONField(verbose_name=_('Account'), default=dict) accounts = models.JSONField(verbose_name=_('Account'))
assets = models.JSONField(verbose_name=_('Asset')) assets = models.JSONField(verbose_name=_('Asset'))
# 动作 # 动作
action = models.CharField( action = models.CharField(

13
apps/acls/serializers/login_asset_acl.py
View File

@ -35,23 +35,18 @@ class LoginAssetACLAssestsSerializer(serializers.Serializer):
ip_group = serializers.ListField( ip_group = serializers.ListField(
default=["*"], default=["*"],
child=serializers.CharField(max_length=1024), child=serializers.CharField(max_length=1024),
label=_("IP"), label=_("IP/Host"),
help_text=ip_group_help_text, help_text=ip_group_help_text,
) )
hostname_group = serializers.ListField( hostname_group = serializers.ListField(
default=["*"], default=["*"],
child=serializers.CharField(max_length=128), child=serializers.CharField(max_length=128),
label=_("Hostname"), label=_("Name"),
help_text=common_help_text, help_text=common_help_text,
) )
class LoginAssetACLAccountsSerializer(serializers.Serializer): class LoginAssetACLAccountsSerializer(serializers.Serializer):
protocol_group_help_text = _(
"Format for comma-delimited string, with * indicating a match all. "
"Protocol options: {}"
)
name_group = serializers.ListField( name_group = serializers.ListField(
default=["*"], default=["*"],
child=serializers.CharField(max_length=128), child=serializers.CharField(max_length=128),
@ -70,9 +65,7 @@ class LoginAssetACLSerializer(BulkOrgResourceModelSerializer):
users = LoginAssetACLUsersSerializer() users = LoginAssetACLUsersSerializer()
assets = LoginAssetACLAssestsSerializer() assets = LoginAssetACLAssestsSerializer()
accounts = LoginAssetACLAccountsSerializer() accounts = LoginAssetACLAccountsSerializer()
reviewers_amount = serializers.IntegerField( reviewers_amount = serializers.IntegerField(read_only=True, source="reviewers.count")
read_only=True, source="reviewers.count"
)
action = LabeledChoiceField( action = LabeledChoiceField(
choices=models.LoginAssetACL.ActionChoices.choices, label=_("Action") choices=models.LoginAssetACL.ActionChoices.choices, label=_("Action")
) )