p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle UnicodeDecodeError when getting installed packages on Windows systems

This commit is contained in:
Shreya 2021-03-15 18:11:26 +05:30
parent 2a44cf8ebd
commit 90d9d5933a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
monkey/infection_monkey/system_info/windows_info_collector.py
View File

@ -47,8 +47,19 @@ class WindowsInfoCollector(InfoCollector):
def get_installed_packages(self): def get_installed_packages(self):
LOG.info('getting installed packages') LOG.info('getting installed packages')
self.info["installed_packages"] = os.popen("dism /online /get-packages").read()
self.info["installed_features"] = os.popen("dism /online /get-features").read() packages = subprocess.Popen("dism /online /get-packages", shell=True, stdout=subprocess.PIPE).stdout.read()
try:
self.info["installed_packages"] = packages.decode('utf-8')
except UnicodeDecodeError:
self.info["installed_packages"] = packages.decode('raw-unicode-escape')
features = subprocess.Popen("dism /online /get-features", shell=True, stdout=subprocess.PIPE).stdout.read()
try:
self.info["installed_features"] = features.decode('utf-8')
except UnicodeDecodeError:
self.info["installed_features"] = features.decode('raw-unicode-escape')
LOG.debug('Got installed packages') LOG.debug('Got installed packages')
def get_wmi_info(self): def get_wmi_info(self):