2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Updated functions.cleanup

Browse source
This commit is contained in:
2Shirt 2019-06-11 20:30:38 -06:00
parent 4c3be6eac6
commit 3611ff920a
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.bin/Scripts/functions/cleanup.py
View file

@ -71,6 +71,7 @@ def cleanup_cbs(dest_folder):
def cleanup_d7ii(): def cleanup_d7ii():
# pylint: disable=too-many-branches
"""Sort d7II logs and remove temp items.""" """Sort d7II logs and remove temp items."""
d7_path = r'{}\d7II'.format(global_vars['ClientDir']) d7_path = r'{}\d7II'.format(global_vars['ClientDir'])
d7_reports = r'{} Reports'.format(d7_path) d7_reports = r'{} Reports'.format(d7_path)
@ -79,9 +80,9 @@ def cleanup_d7ii():
# Logs & Reports # Logs & Reports
if os.path.exists(d7_reports): if os.path.exists(d7_reports):
for entry in os.scandir(d7_reports): for entry in os.scandir(d7_reports):
r = re.match(r'(\d+)-(\d+)-(\d+)', entry.name) _r = re.match(r'(\d+)-(\d+)-(\d+)', entry.name)
d7_date = '{}-{:02d}-{:02d}'.format( d7_date = '{}-{:02d}-{:02d}'.format(
r.group(1), int(r.group(2)), int(r.group(3))) _r.group(1), int(_r.group(2)), int(_r.group(3)))
d7_mlogs = r'{}\Malware Logs'.format(entry.path) d7_mlogs = r'{}\Malware Logs'.format(entry.path)
log_dest = r'{SYSTEMDRIVE}\{prefix}\Logs\{date}'.format( log_dest = r'{SYSTEMDRIVE}\{prefix}\Logs\{date}'.format(
prefix=KIT_NAME_SHORT, prefix=KIT_NAME_SHORT,
@ -141,11 +142,7 @@ def cleanup_d7ii():
pass pass
# Restore default UAC settings # Restore default UAC settings
if global_vars['OS']['Version'] == '10': restore_default_uac()
write_registry_settings(UAC_DEFAULTS_WIN10, all_users=True)
else:
# Haven't checked Win8 settings, only applying minimum set
write_registry_settings(UAC_DEFAULTS_WIN7, all_users=True)
def cleanup_desktop(): def cleanup_desktop():
"""Move known backup files and reports into the ClientDir.""" """Move known backup files and reports into the ClientDir."""
@ -230,7 +227,7 @@ def delete_registry_key(hive, key, recurse=False):
# Delete all subkeys first # Delete all subkeys first
with winreg.OpenKeyEx(hive, key, 0, access) as k: with winreg.OpenKeyEx(hive, key, 0, access) as k:
key_info = winreg.QueryInfoKey(k) key_info = winreg.QueryInfoKey(k)
for x in range(key_info[0]): for _i in range(key_info[0]): # pylint: disable=unused-variable
subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0)) subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0))
delete_registry_key(hive, subkey) delete_registry_key(hive, subkey)