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

fix: 系统用户的账号列表里修改密码后不能登录

v2.12
xinwen 2021-08-18 10:19:25 +08:00 committed by 老广
parent 173c450b25
commit 5e4502b2bc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/assets/tasks/push_system_user.py
View File

@ -4,7 +4,7 @@ from itertools import groupby
from celery import shared_task from celery import shared_task
from common.db.utils import get_object_if_need, get_objects from common.db.utils import get_object_if_need, get_objects
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.db.models import Empty from django.db.models import Empty, Q
from common.utils import encrypt_password, get_logger from common.utils import encrypt_password, get_logger
from assets.models import SystemUser, Asset, AuthBook from assets.models import SystemUser, Asset, AuthBook
@ -238,9 +238,12 @@ def push_system_user_util(system_user, assets, task_name, username=None):
no_special_auth = [] no_special_auth = []
special_auth_set = set() special_auth_set = set()
auth_books = AuthBook.objects.filter(username__in=usernames, asset_id__in=asset_ids) auth_books = AuthBook.objects.filter(asset_id__in=asset_ids).filter(
Q(username__in=usernames) | Q(systemuser__username__in=usernames)
).prefetch_related('systemuser')
for auth_book in auth_books: for auth_book in auth_books:
auth_book.load_auth()
special_auth_set.add((auth_book.username, auth_book.asset_id)) special_auth_set.add((auth_book.username, auth_book.asset_id))
for _username in usernames: for _username in usernames: