Commit Graph

2598 Commits

Author SHA1 Message Date
Daniel Goldberg 30f7d724b9 Merge branch '393/python-3' into feature/refactor_fingerprinting
# Conflicts:
#	monkey/infection_monkey/monkey.py
#	monkey/infection_monkey/network/ping_scanner.py
#	monkey/infection_monkey/network/tcp_scanner.py
2019-11-05 21:20:10 +02:00
Daniel Goldberg c6216325b6 Removed bad documentation 2019-11-05 21:11:55 +02:00
Daniel Goldberg b0d77e3c21 Rename fingerprinter_manager to collector 2019-11-05 21:11:55 +02:00
Daniel Goldberg 997125eadd Revert longish import 2019-11-05 21:11:52 +02:00
Daniel Goldberg fb330a45e9
Merge pull request #477 from guardicore/bugfix/circular_import
Prevent circular import with PBA
2019-11-05 20:57:39 +02:00
Shay Nehmad 372d62fb91 Fix imports in processing 2019-11-05 17:02:40 +02:00
Shay Nehmad 211a4e9d34 Update CONTRIBUTING.md 2019-11-05 13:59:42 +02:00
VakarisZ 63d0e57bb7 Added documentation on why we ignore errors when getting tcp banner 2019-11-05 13:11:15 +02:00
VakarisZ a7218e13d4 Merge remote-tracking branch 'upstream/393/python-3' into 393/python-3 2019-11-05 12:39:33 +02:00
VakarisZ fc063a5378 Fixed mysql finger printer py3 bugs 2019-11-05 12:37:51 +02:00
Shay Nehmad c69766650c Update upper limit to actual current amount of linter warnings 2019-11-05 12:22:55 +02:00
Shay Nehmad bbdc12a412 Update .travis.yml 2019-11-05 12:19:46 +02:00
Shay Nehmad d52d00e5d9 Trying to make the test work 2019-11-05 12:13:38 +02:00
Shay Nehmad ea5ae67891 Updated flake8 to fail if number of warnings is too high 2019-11-05 12:05:45 +02:00
Daniel Goldberg 48740238e2
Merge branch '393/python-3' into bugfix/circular_import 2019-11-05 10:52:31 +02:00
Shay Nehmad d5bc218996
Merge pull request #448 from VakarisZ/deployment_scripts_python3
Deployment scripts python3
2019-11-05 10:43:59 +02:00
Shay Nehmad c68ea48b0b Added unit tests guide to the readme. 2019-11-05 10:19:39 +02:00
VakarisZ 88b8d2ce5a Merge branch '393/python-3' into deployment_scripts_python3
# Conflicts:
#	monkey/monkey_island/cc/ui/package-lock.json
#	monkey/monkey_island/cc/ui/package.json
#	monkey/monkey_island/requirements.txt
2019-11-04 16:06:43 +02:00
Shay Nehmad 2773002af7
Merge pull request #470 from guardicore/393/python-3-fix-linter-warnings
[WIP] 393/python 3 fix linter warnings
2019-11-04 15:29:48 +02:00
Shay Nehmad 38c45ccc72
Merge branch 'develop' into 393/python-3 2019-11-04 15:29:27 +02:00
VakarisZ 7de03d8db0
Merge pull request #475 from VakarisZ/py3_logging_improvements
Py3 logging improvements
2019-11-04 12:29:31 +02:00
Shay Nehmad a125df6345
Merge branch '393/python-3' into 393/python-3-fix-linter-warnings 2019-11-04 11:45:33 +02:00
Shay Nehmad bcf2d964d7 Moved representations to services 2019-11-04 11:44:25 +02:00
Shay Nehmad c778ae7aa1 Changed import to `import common.data.zero_trust_consts as zero_trust_consts`
Looks better
2019-11-04 11:27:34 +02:00
Daniel Goldberg cd716eb1c8 Remove unused imports. Removed bad asserts 2019-11-03 15:07:34 -05:00
Daniel Goldberg 029c3bb24d Change property names. Add type hints 2019-11-03 15:07:26 -05:00
Daniel Goldberg 0044eb393b Formatting fail 2019-11-03 14:51:33 -05:00
Daniel Goldberg 37704e3eeb Slightly cleaner usage of importlib, making sure we import the correct module 2019-10-31 10:39:33 -04:00
Daniel Goldberg 9c40b4a022 Refactor PBA to use generic plugin 2019-10-31 10:39:33 -04:00
Daniel Goldberg 1df3e30003 Refactor plugin loading into independent module 2019-10-31 10:39:33 -04:00
Daniel Goldberg 1a874762b1 Add pyinstaller hook since we are now not importing anything.
This is currently messy as there is no plugin directory for fingerprinters
2019-10-31 10:39:33 -04:00
Daniel Goldberg 8edb55723c Introduce fingerprint manager to avoid having to explictly import classes in configuration.
Similar to PBA manager.
2019-10-31 10:39:33 -04:00
Daniel Goldberg ab591fcf4c Remove HostScanner and HostFinger to their own files 2019-10-31 10:39:33 -04:00
VakarisZ e5715f5a7e Removed unnecessary logging of config in BB and MSSQL unhandled error 2019-10-31 12:11:22 +02:00
VakarisZ 1f5acbc287 Another white screen fix 2019-10-31 10:48:02 +02:00
Daniel Goldberg 2517ab0284 Move get_interface_to_target to network, helping prevent a circular import
between pba.py and exploiter modules.
2019-10-30 20:23:19 -04:00
VakarisZ ac63797f45 Blank screen fix corrected 2019-10-30 15:11:50 +02:00
VakarisZ a6e61215f3 SSH banner read timeout exception (tunneling) bugfix 2019-10-30 14:45:30 +02:00
VakarisZ dba52fcbed BB tests bugfix of not refreshing JWT 2019-10-30 14:38:17 +02:00
VakarisZ ec5de408b2 Blank screen (JWT token expiration) bugfix 2019-10-30 12:38:14 +02:00
Shay Nehmad 811b2b28f5
Merge pull request #473 from shivank1234/406/use-js-file-saver
406/use js file saver
2019-10-30 10:23:30 +02:00
Shivank 933dc9c378 Second File-saver patch 2019-10-30 11:06:25 +05:30
VakarisZ 95c63d6cef Rollback of accidental changes 2019-10-29 16:29:51 +02:00
VakarisZ cdc30f56c7 Shellshock bugfix 2019-10-29 15:00:01 +02:00
VakarisZ c1a20116a0 Merge remote-tracking branch 'upstream/393/python-3' into 393/python-3 2019-10-29 14:05:22 +02:00
VakarisZ 64ec629306 Machine name in BB fix 2019-10-29 14:04:48 +02:00
vakaris_zilius ca7cfb51b2 BB fix for python3, updated package.json 2019-10-29 09:08:10 +00:00
Shay Nehmad 530e1a3b65 Whitespace fixes 2019-10-28 21:25:37 +02:00
Shay Nehmad 1f598579ee Linter fixes in `common` 2019-10-28 21:22:14 +02:00
Shay Nehmad dd461b974b Manual fix - auto formatter is confused again 👎 2019-10-28 21:20:29 +02:00