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

fix: 修复登陆复合acl时 未添加规则bug

pull/7066/head
feng626 2021-10-23 16:12:24 +08:00 committed by 老广
parent 1f50a2fe33
commit 0b67c7a953
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/acls/migrations/0002_auto_20210926_1047.py
View File

@ -7,6 +7,8 @@ from acls.models import LoginACL
LOGIN_CONFIRM_ZH = '登录复核' LOGIN_CONFIRM_ZH = '登录复核'
LOGIN_CONFIRM_EN = 'Login confirm' LOGIN_CONFIRM_EN = 'Login confirm'
DEFAULT_TIME_PERIODS = [{'id': i, 'value': '00:00~00:00'} for i in range(7)]
def has_zh(name: str) -> bool: def has_zh(name: str) -> bool:
for i in name: for i in name:
@ -31,7 +33,8 @@ def migrate_login_confirm(apps, schema_editor):
'user': user, 'user': user,
'name': f'{user.name}-{login_confirm} ({date_created})', 'name': f'{user.name}-{login_confirm} ({date_created})',
'created_by': instance.created_by, 'created_by': instance.created_by,
'action': LoginACL.ActionChoices.confirm 'action': LoginACL.ActionChoices.confirm,
'rules': {'ip_group': ['*'], 'time_period': DEFAULT_TIME_PERIODS}
} }
instance = login_acl_model.objects.create(**data) instance = login_acl_model.objects.create(**data)
instance.reviewers.set(reviewers) instance.reviewers.set(reviewers)
@ -39,11 +42,10 @@ def migrate_login_confirm(apps, schema_editor):
def migrate_ip_group(apps, schema_editor): def migrate_ip_group(apps, schema_editor):
login_acl_model = apps.get_model("acls", "LoginACL") login_acl_model = apps.get_model("acls", "LoginACL")
default_time_periods = [{'id': i, 'value': '00:00~00:00'} for i in range(7)]
updates = list() updates = list()
with transaction.atomic(): with transaction.atomic():
for instance in login_acl_model.objects.exclude(action=LoginACL.ActionChoices.confirm): for instance in login_acl_model.objects.exclude(action=LoginACL.ActionChoices.confirm):
instance.rules = {'ip_group': instance.ip_group, 'time_period': default_time_periods} instance.rules = {'ip_group': instance.ip_group, 'time_period': DEFAULT_TIME_PERIODS}
updates.append(instance) updates.append(instance)
login_acl_model.objects.bulk_update(updates, ['rules', ]) login_acl_model.objects.bulk_update(updates, ['rules', ])