Commit Graph

1788 Commits

Author SHA1 Message Date
itay 345f0e0cc5 Merge branch 'develop' into feature/refactor-attack-telem 2019-06-18 12:11:46 +03:00
itay 16306f86bb fix imports 2019-06-11 19:45:03 +03:00
itay 63e64cbd7e Add attack telemetries to feed and preprocessing dicts
Fix 1197 report processing
2019-06-11 17:33:55 +03:00
itay 22815b7e02 Fix test 2019-06-11 16:42:55 +03:00
itay 4d962feafe Rename test victim host telem file
Create new T1197Telem class for new telemetries
2019-06-11 16:34:54 +03:00
itay 93d6280d1a Fix CR comments 2019-06-11 16:16:36 +03:00
itay b2eef28291 Fix VictimHost's getData 2019-06-11 16:13:26 +03:00
VakarisZ 7068a77a61
Merge pull request #343 from VakarisZ/web_rce_bugfix
bug in web_rce fixed
2019-06-11 14:56:39 +03:00
VakarisZ 85ff5bd4ec bug in web_rce fixed 2019-06-11 14:49:18 +03:00
itay dba82fc818 Merge remote-tracking branch 'origin/develop' into feature/refactor-attack-telem
# Conflicts:
#	monkey/infection_monkey/monkey.py
#	monkey/infection_monkey/transport/attack_telems/base_telem.py
#	monkey/infection_monkey/transport/attack_telems/victim_host_telem.py
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/resources/attack/attack_telem.py
#	monkey/monkey_island/cc/services/attack/attack_telem.py
2019-06-11 14:45:21 +03:00
Itay Mizeretz 2738cc61e8
Merge pull request #305 from VakarisZ/attack_report_2
Attack report 2
2019-06-11 11:20:56 +03:00
VakarisZ 22ee27d519 @staticmethod annotation to abstract method added 2019-06-05 10:38:14 +03:00
VakarisZ c77d796798 PR comments fixed 2019-06-03 09:41:05 +03:00
itay fc28135e00 Changed attack telemetry to be regular telemetry.
Made telemetries OOP (not retroactively)
2019-06-02 17:44:56 +03:00
Itay Mizeretz 9021463cd2
Merge pull request #334 from VakarisZ/import_bugfix
Import made compatible with attack config
2019-06-02 12:54:56 +03:00
VakarisZ 20e38291e3 Merge remote-tracking branch 'upstream/develop' into attack_report 2019-05-30 21:08:43 +03:00
VakarisZ 016b73c982
Merge pull request #335 from VakarisZ/post_breach_hotfix
Hotfixed telemetry feed for post breach actions
2019-05-30 21:08:03 +03:00
VakarisZ 053f9686c6 Hotfixed telemetry feed for post breach actions 2019-05-30 21:04:30 +03:00
VakarisZ 0284eeebe8 Import made compatible with attack config 2019-05-30 17:02:30 +03:00
VakarisZ c731cea853 Merge remote-tracking branch 'upstream/develop' into attack_report 2019-05-30 16:32:08 +03:00
Daniel Goldberg 9f0e3c8513
Merge pull request #316 from VakarisZ/post_breach_refactor
Post breach refactored to support PBA's from list
2019-05-30 10:07:06 +03:00
VakarisZ b5b2fd7c0e PBA created after we check if it's going to run 2019-05-30 09:03:23 +03:00
VakarisZ c9a313b90f UI fix 2019-05-29 10:59:02 +03:00
VakarisZ b465c27e20 Post merge fixes 2019-05-29 09:56:57 +03:00
VakarisZ 61e04c796d Merge remote-tracking branch 'upstream/develop' into attack_report 2019-05-28 17:51:53 +03:00
VakarisZ f52127565d Merge remote-tracking branch 'upstream/develop' into post_breach_fix
# Conflicts:
#	monkey/infection_monkey/control.py
2019-05-28 17:42:28 +03:00
VakarisZ b6523b1d45 Refactored to automatically check if post breach should run or not 2019-05-28 17:37:26 +03:00
VakarisZ c783b82aac Merge remote-tracking branch 'upstream/develop' into post_breach_fix 2019-05-28 17:35:04 +03:00
Shay Nehmad 2ea375a7de
Merge pull request #331 from guardicore/hotfix/increase-monkey-timeout
Increased TTL to 5 minutes
2019-05-28 16:45:21 +03:00
Shay Nehmad 212ed68dc2 Increased TTL to 5 minutes 2019-05-28 16:44:49 +03:00
VakarisZ 54904415bd Merge branch 'attack_configuration' into attack_report
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/ui/package-lock.json
#	monkey/monkey_island/cc/ui/package.json
#	monkey/monkey_island/cc/ui/src/styles/App.css
2019-05-28 14:35:09 +03:00
VakarisZ c4e384205c PR fixes 2019-05-28 14:15:53 +03:00
Shay Nehmad 1073eb7b53
Merge pull request #313 from guardicore/feature/210-monkey-mia-timeout
[DONE] Feature/210 monkey mia timeout
2019-05-28 12:26:24 +03:00
VakarisZ 8d9432e817
Merge pull request #285 from VakarisZ/attack_configuration
Attack configuration
2019-05-28 09:09:27 +03:00
VakarisZ 691647708f Merge remote-tracking branch 'upstream/develop' into attack_configuration
# Conflicts:
#	monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
2019-05-28 08:36:48 +03:00
VakarisZ f4288f110c Race condition bugfix 2019-05-27 17:31:10 +03:00
Shay Nehmad 729c0c50b9 Deleted mongomock - not required. 2019-05-27 17:25:09 +03:00
Shay Nehmad 591b75c555 Can't override init of Documents. Created factory function instead. 2019-05-27 17:20:11 +03:00
Shay Nehmad 2e5864067b Created helper constructor for MonkeyTTL to make it more friendly to use
CR comment
2019-05-27 17:01:43 +03:00
VakarisZ 8ecfb5d777 Minor bugfixes 2019-05-27 16:52:33 +03:00
Shay Nehmad 2ecc683216 Moved monketnotfound to monkey.py
CR comment
2019-05-27 16:47:30 +03:00
Shay Nehmad bb40560fc7
Update monkey/monkey_island/cc/models/__init__.py
Fixed type

Co-Authored-By: Itay Mizeretz <30774653+itaymmguardicore@users.noreply.github.com>
2019-05-27 16:37:10 +03:00
VakarisZ 08801c8cd5 Technique dependency fixed. 2019-05-27 13:31:15 +03:00
Daniel Goldberg 089d3950cf
Merge pull request #317 from VakarisZ/import_bugfix
Configuration gets submitted on import.
2019-05-27 12:22:58 +03:00
VakarisZ 7b35005233 Minor PR fixes. 2019-05-27 11:46:54 +03:00
VakarisZ f4a47f3cb3 Request exception handling 2019-05-27 09:49:40 +03:00
VakarisZ 64701e042e Minor pr fixes 2019-05-27 09:35:09 +03:00
Shay Nehmad ffa78ac540
Merge branch 'develop' into feature/210-monkey-mia-timeout 2019-05-23 13:04:43 +03:00
Shay Nehmad 62b107884f Added TTL creation to post as well 2019-05-23 11:33:21 +03:00
Daniel Goldberg 92edee1e0a
Merge pull request #277 from Dhayalanb/develop
Added a new exploit
2019-05-22 17:29:01 +03:00