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

Merge remote-tracking branch 'upstream/develop' into feature/configuration_improvements

This commit is contained in:
VakarisZ 2020-07-24 11:22:09 +03:00
parent 09734df93d add176f7c6
commit d049b88c99
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monkey/common/utils/wmi_utils.py
View File

@ -1,4 +1,7 @@
import wmi import sys
if sys.platform.startswith("win"):
import wmi
from .mongo_utils import MongoUtils from .mongo_utils import MongoUtils

6
monkey/infection_monkey/requirements.txt
View File

@ -13,8 +13,4 @@ pyftpdlib==1.5.6
pymssql<3.0 pymssql<3.0
pypykatz==0.3.12 pypykatz==0.3.12
requests>=2.24 requests>=2.24
# Locking WMI since version 1.5 introduced breaking change on Linux agent compilation. wmi==1.5.1 ; sys_platform == 'win32'
# See breaking change here: https://github.com/tjguk/wmi/commit/dcf8e3eca79bb8c0101ffb83e25c066b0ba9e16d
# Causes pip to error with:
# Could not find a version that satisfies the requirement pywin32 (from wmi->-r /src/infection_monkey/requirements.txt (line 12)) (from versions: none)
wmi==1.4.9 ; sys_platform == 'win32'