Commit Graph

2523 Commits

Author SHA1 Message Date
VakarisZ c0f661d337 More python3 fixes 2019-10-18 18:14:42 +03:00
VakarisZ f60cdd116b Replaced six package usages with py3 2019-10-18 09:10:14 +03:00
VakarisZ c56dea39a9 Removed six from requirements 2019-10-17 19:39:27 +03:00
VakarisZ 047191070c Small CR fixes 2019-10-17 19:33:30 +03:00
VakarisZ e36bb9721d Sambacry fixes 2019-10-16 18:27:14 +03:00
VakarisZ 547cfe2f92 Various python3 bugfixes 2019-10-16 18:26:41 +03:00
VakarisZ 3ef4780d16 Error handling in system info gatherer fixed 2019-10-15 18:22:35 +03:00
VakarisZ 559e12c1fb A bunch of error messages converted to python3 syntax 2019-10-15 18:18:46 +03:00
VakarisZ 90f885f522 Merge remote-tracking branch 'upstream/develop' into 393/python-3 2019-10-15 12:11:48 +03:00
VakarisZ a4ebfb0c3d Fixed ring bugs 2019-10-15 12:09:49 +03:00
VakarisZ 8923e80dc6 Fixed ring bugs 2019-10-15 11:12:49 +03:00
VakarisZ c474a23339 Removed traceback logging of expected error in AWS instance 2019-10-15 11:10:05 +03:00
VakarisZ d702fc3b19
Merge pull request #466 from VakarisZ/telem_brief_fix
Fixed bug in telemetry feed
2019-10-15 11:01:19 +03:00
VakarisZ 341dc478bf
Merge pull request #459 from VakarisZ/monkeyzoo_update
Monkeyzoo update and config_schema improvements
2019-10-14 16:39:17 +03:00
VakarisZ 341d905f1e Merge remote-tracking branch 'upstream/develop' into 393/python-3
# Conflicts:
#	monkey/common/cloud/aws_instance.py
2019-10-14 15:47:50 +03:00
VakarisZ 504436931d Fixed bug in telemetry feed 2019-10-14 14:27:36 +03:00
Shay Nehmad f4b2874698
Merge pull request #464 from guardicore/463/hotfix/exception-on-aws-network-error
463/hotfix/exception on aws network error
2019-10-13 12:34:47 +03:00
Shay Nehmad 177f902838 Added error suppression where required and documented where it isn't. 2019-10-13 11:10:42 +03:00
Shay Nehmad 177e1ea990 Now suppressing exceptions in cloud info collection as well 2019-10-13 10:55:55 +03:00
Shay Nehmad 74dbb053a6 Contain network exceptions if initialized AwsInstance has network issues 2019-10-13 10:48:50 +03:00
Shay Nehmad 53361e3812 Contain exception if exporter init fails on the island 2019-10-13 10:48:23 +03:00
Shay Nehmad 68d9cae8e0
Merge pull request #462 from guardicore/460/hotfix/exception-processing-systeminfo-telem
460/hotfix/exception processing systeminfo telem to develop as well
2019-10-11 21:22:08 +03:00
Shay Nehmad b6b58b3c50
Merge pull request #461 from guardicore/460/hotfix/exception-processing-systeminfo-telem
460/hotfix/exception processing systeminfo telem
2019-10-11 21:21:07 +03:00
Shay Nehmad ef04c341f5 Added "safe_process_telemetry" so if one stage of processing fails (in the future), it won't fail the other stages. 2019-10-11 21:10:31 +03:00
Shay Nehmad 5bc061a658 Fixed cause for exception - bad JSON field access.
Guid instead of id.
2019-10-11 21:09:34 +03:00
VakarisZ 1ce17a3bc8 Added MSSQL exploiter to defaults and hadoop port to default scan ports 2019-10-11 17:21:17 +03:00
VakarisZ b78b7980ed Fixed terraform scripts and configuration files 2019-10-11 17:08:15 +03:00
VakarisZ cefaacabab Some py3 bugs fixed 2019-10-11 10:22:39 +03:00
VakarisZ fcd43b9fa0 Fixed double parentheses in print method invocations 2019-10-10 16:41:47 +03:00
VakarisZ 8ede629b13 Merge remote-tracking branch 'upstream/develop' into 393/python-3
# Conflicts:
#	monkey/common/cloud/aws_instance.py
2019-10-10 11:40:51 +03:00
Shay Nehmad 6c5c6e59bd
Merge pull request #455 from guardicore/release/1.7
Release/1.7.0 - Zero Trust, ATT&CK, and others
2019-10-07 16:00:45 +03:00
Shay Nehmad 68e2a83aac
Release/1.7.0 -> develop (#457) - added some logs and blackbox improvments.
Release/1.7.0 -> develop
2019-10-07 15:59:46 +03:00
Shay Nehmad 3b7b0f0998 Removed SHA-512 from exec hashes 2019-10-07 14:12:06 +03:00
Shay Nehmad e0f4d1ed83 Added module + filename + line number to logs output in Blackbox 2019-10-07 13:49:13 +03:00
Shay Nehmad ff3c455cb0 Added more logs to testing output and changed printing to logging to attach testing output to test 2019-10-07 12:20:19 +03:00
Shay Nehmad 3336956737 Added SHA-256 to monkey exec logs 2019-10-07 11:04:24 +03:00
Shay Nehmad 3174a97d3e Merge branch 'develop' into release/1.7 2019-10-07 10:39:47 +03:00
Shay Nehmad f45428186d Marked tunneling test as xfail until we figure out why it doesn't work 2019-10-07 10:39:40 +03:00
Shay Nehmad 59e3deb09e Added logs that write the test config 2019-10-07 10:39:11 +03:00
Shay Nehmad 34f73bd0a2
Merge pull request #419 from VakarisZ/telem_brief_improvement
Added ability to disable telemetry briefs for certain telemetries.
2019-10-07 10:34:35 +03:00
Shay Nehmad 1ddc9fb3ef Fixed conflict (newline) 2019-10-06 20:16:44 +03:00
Shay Nehmad 2dec2e6a70 Improved log parser logs 2019-10-06 19:59:40 +03:00
Shay Nehmad 3a8a1f446b Added logs to monkey island startup with hashes of executeables, for ease of deployment + debugging
Should ease the "wait which monkey am I running" issue a bit
2019-10-06 19:55:59 +03:00
Shay Nehmad cde256e4b9 Log parser shows error and warning amount 2019-10-06 15:20:01 +03:00
Shay Nehmad f7dacf0952 Lowered severity of AWS messages. 2019-10-06 15:16:35 +03:00
VakarisZ 3bf5f402f3
Merge pull request #456 from VakarisZ/build_windows_fix
Reverted accidental changes to build_windows.bat
2019-10-06 15:11:45 +03:00
VakarisZ 76a9e46a87 Removed accidental changes to file 2019-10-06 15:09:46 +03:00
Shay Nehmad 8e9102eb2b Formatting 2019-10-06 15:05:59 +03:00
Shay Nehmad 2afa38d8cf Update monkey version 2019-10-06 15:05:41 +03:00
Shay Nehmad dde2e1a7e4 Added some documentation and improved logging in Blackbox 2019-10-06 15:05:34 +03:00