fix: Update mysql_filter to handle nested user info

pull/14741/head
wangruidong 2024-12-27 18:04:40 +08:00 committed by w940853815
parent e1f02d79c4
commit af85dba667
1 changed files with 13 additions and 12 deletions

View File

@ -33,18 +33,19 @@ class GatherAccountsFilter:
@staticmethod @staticmethod
def mysql_filter(info): def mysql_filter(info):
result = {} result = {}
for username, user_info in info.items(): for host, user_dict in info.items():
password_last_changed = parse_date(user_info.get('password_last_changed')) for username, user_info in user_dict.items():
password_lifetime = user_info.get('password_lifetime') password_last_changed = parse_date(user_info.get('password_last_changed'))
user = { password_lifetime = user_info.get('password_lifetime')
'username': username, user = {
'date_password_change': password_last_changed, 'username': username,
'date_password_expired': password_last_changed + timezone.timedelta( 'date_password_change': password_last_changed,
days=password_lifetime) if password_last_changed and password_lifetime else None, 'date_password_expired': password_last_changed + timezone.timedelta(
'date_last_login': None, days=password_lifetime) if password_last_changed and password_lifetime else None,
'groups': '', 'date_last_login': None,
} 'groups': '',
result[username] = user }
result[username] = user
return result return result
@staticmethod @staticmethod