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

fix: 账号收集通知 同步资产时 计算新增账号错误 (#12101) 

Co-authored-by: feng <1304903146@qq.com>
pull/12102/head
fit2bot 2023-11-14 14:50:33 +08:00 committed by GitHub
parent fcce03f7bd
commit 4e5a44bd98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/accounts/automations/gather_accounts/manager.py
View File

@ -17,6 +17,7 @@ class GatherAccountsManager(AccountBasePlaybookManager):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.host_asset_mapper = {} self.host_asset_mapper = {}
self.gathered_accounts = []
self.asset_username_mapper = defaultdict(set) self.asset_username_mapper = defaultdict(set)
self.is_sync_account = self.execution.snapshot.get('is_sync_account') self.is_sync_account = self.execution.snapshot.get('is_sync_account')
@ -48,17 +49,13 @@ class GatherAccountsManager(AccountBasePlaybookManager):
def update_or_create_accounts(self, asset, result): def update_or_create_accounts(self, asset, result):
data = self.generate_data(asset, result) data = self.generate_data(asset, result)
with tmp_to_org(asset.org_id): with tmp_to_org(asset.org_id):
gathered_accounts = []
GatheredAccount.objects.filter(asset=asset, present=True).update(present=False) GatheredAccount.objects.filter(asset=asset, present=True).update(present=False)
for d in data: for d in data:
username = d['username'] username = d['username']
gathered_account, __ = GatheredAccount.objects.update_or_create( gathered_account, __ = GatheredAccount.objects.update_or_create(
defaults=d, asset=asset, username=username, defaults=d, asset=asset, username=username,
) )
gathered_accounts.append(gathered_account) self.gathered_accounts.append(gathered_account)
if not self.is_sync_account:
return
GatheredAccount.sync_accounts(gathered_accounts)
def on_host_success(self, host, result): def on_host_success(self, host, result):
info = result.get('debug', {}).get('res', {}).get('info', {}) info = result.get('debug', {}).get('res', {}).get('info', {})
@ -72,6 +69,9 @@ class GatherAccountsManager(AccountBasePlaybookManager):
def run(self, *args, **kwargs): def run(self, *args, **kwargs):
super().run(*args, **kwargs) super().run(*args, **kwargs)
self.send_email_if_need() self.send_email_if_need()
if not self.is_sync_account:
return
GatheredAccount.sync_accounts(self.gathered_accounts)
def send_email_if_need(self): def send_email_if_need(self):
recipients = self.execution.recipients recipients = self.execution.recipients
@ -102,6 +102,9 @@ class GatherAccountsManager(AccountBasePlaybookManager):
remove_usernames = system_usernames - usernames remove_usernames = system_usernames - usernames
k = f'{asset_id_map[asset_id]}[{asset_id}]' k = f'{asset_id_map[asset_id]}[{asset_id}]'
if not add_usernames and not remove_usernames:
continue
change_info[k] = { change_info[k] = {
'add_usernames': ', '.join(add_usernames), 'add_usernames': ', '.join(add_usernames),
'remove_usernames': ', '.join(remove_usernames), 'remove_usernames': ', '.join(remove_usernames),