Commit Graph

889 Commits

Author SHA1 Message Date
Itay Mizeretz e30e9c8b83 Upgrade after finding server 2018-02-28 16:23:54 +02:00
Itay Mizeretz 355a75feef seperate the wakeup and server lookup processes 2018-02-28 16:21:44 +02:00
Itay Mizeretz 8509eef48e Add basic logic to windows upgrade 2018-02-28 14:10:01 +02:00
itaymmguardicore 1317ea5b95
Merge pull request #98 from guardicore/feature/update-monkey-icon
Update icons
2018-02-27 19:59:03 +02:00
Itay Mizeretz 03c32025aa Update icons 2018-02-27 19:39:32 +02:00
Itay Mizeretz 7f7a20847d Remove utils from chaos_monkey 2018-02-27 19:34:00 +02:00
Itay Mizeretz a20cb16b48 Merge branch 'develop' into feature/send-raw-log
# Conflicts:
#	infection_monkey/main.py
#	monkey_island/cc/app.py
#	monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
2018-02-27 19:32:28 +02:00
Itay Mizeretz d8946feb69 Fix CR 2018-02-27 19:13:28 +02:00
Itay Mizeretz 1d07e5f98f Move range to common code folder 2018-02-26 18:39:49 +02:00
Itay Mizeretz e57ce1099f Remove unecessary parameters and members.
Create better abstraction
2018-02-26 17:53:16 +02:00
Itay Mizeretz 816be5191b Add is_in_range as abstract method 2018-02-26 17:35:32 +02:00
Itay Mizeretz 4730480db9 Remove ClassCRange and RelativeRange 2018-02-26 17:35:00 +02:00
Itay Mizeretz 0de15736ac rename and move range_fixed 2018-02-26 16:34:23 +02:00
Itay Mizeretz be54878ad9 Merge branch 'develop' into feature/support-subnet-in-config 2018-02-26 16:12:24 +02:00
Itay Mizeretz 898644df7b Remove range classes in config
network now scans several range classes according to config
2018-02-26 16:11:52 +02:00
itaymmguardicore d8210bf731
Merge branch 'develop' into feature/secure-island-db 2018-02-26 13:44:14 +02:00
Itay Mizeretz b7f147921e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	monkey_island/cc/main.py
#	monkey_island/cc/ui/src/components/Main.js
2018-02-25 19:15:09 +02:00
itaymmguardicore e8b99490d1
Merge pull request #96 from guardicore/feature/secure-island
Feature/secure island
2018-02-25 18:29:06 +02:00
Itay Mizeretz ddc93a67fa Fix CR 2018-02-25 18:23:52 +02:00
Itay Mizeretz 38cf36e165 append options to existsing ones 2018-02-25 17:06:40 +02:00
Itay Mizeretz 6f827e5aa9 Add json-loader to package.json 2018-02-25 14:16:57 +02:00
Itay Mizeretz 4364156416 Add server config file and use in frontend+backend 2018-02-22 20:33:40 +02:00
Itay Mizeretz 9bb7148f50 Secure all endpoints 2018-02-22 16:21:03 +02:00
Itay Mizeretz 9e169980e3 Don't query completed steps if not logged in 2018-02-22 16:18:14 +02:00
Itay Mizeretz 28ef2d8708 return 401 on invalid token 2018-02-22 15:43:51 +02:00
Itay Mizeretz c9d644f88a Add login page, and auto redirection to/from login page 2018-02-22 15:23:47 +02:00
Itay Mizeretz 52d75de864 Fix AuthService 2018-02-22 15:22:35 +02:00
itaymmguardicore f095639ad2
Merge pull request #88 from guardicore/bugfix/rename_Cnc_island
Remove C&C from all textual and code mentions
2018-02-22 12:37:00 +02:00
Daniel Goldberg f675bed851 CR fixes 2018-02-22 10:59:04 +02:00
Itay Mizeretz a69f7d93a3 Merge remote-tracking branch 'origin/develop' into bugfix/rename_Cnc_island 2018-02-22 10:57:08 +02:00
Itay Mizeretz bbfb801603 Backmerge branch 'develop' into bugfix/rename_Cnc_island
# Conflicts:
#	README.md
2018-02-22 10:50:08 +02:00
Itay Mizeretz df95cc73c5 Make all components with server interaction AuthComponents 2018-02-22 10:36:10 +02:00
Itay Mizeretz e02d282c03 Add AuthService 2018-02-22 10:35:31 +02:00
Itay Mizeretz 4bb569dd89 Add JWT authentication to backend 2018-02-22 10:33:37 +02:00
Daniel Goldberg 43df5b9dae
Merge pull request #89 from guardicore/bugfix/rename-chaos-monkey
Bugfix/rename chaos monkey
2018-02-22 10:10:46 +02:00
Itay Mizeretz d3ce956224 Change description of config value 2018-02-20 16:21:23 +02:00
Itay Mizeretz 7ee0ceda75 Support ranges in fixed_ip_list 2018-02-20 16:15:40 +02:00
Itay Mizeretz e11a75eb48 Exceptions are logged and sent to island 2018-02-19 18:32:43 +02:00
Itay Mizeretz ee1a321416 Send log to island is configurable 2018-02-19 18:32:05 +02:00
Itay Mizeretz aa02d8945d Replace base64 with string escaping 2018-02-19 17:22:48 +02:00
Daniel Goldberg 92b02650df
Update PULL_REQUEST_TEMPLATE.md
Added request to add sample result
2018-02-19 14:19:25 +02:00
Itay Mizeretz de4e4b9ea1 rename chaos_monkey folder to infection_monkey 2018-02-19 11:35:34 +02:00
Daniel Goldberg 3ea4609975 Remove C&C from all textual and code mentions 2018-02-15 15:36:19 +02:00
Daniel Goldberg c827ddea71
Include a report image in the README 2018-02-15 15:09:54 +02:00
Daniel Goldberg 1390524d8d update images 2018-02-15 15:01:36 +02:00
Itay Mizeretz 33345e8460 Rename chaos_monkey to infection_monkey 2018-02-14 19:03:29 +02:00
Itay Mizeretz 70766e7358 Save some space 2018-02-14 16:58:58 +02:00
Itay Mizeretz 86a0e47d15 Add log downloading from map 2018-02-14 15:51:22 +02:00
Itay Mizeretz dbe7a6a378 Add log sending logic to monkey
Add log processing logic to monkey island backend
2018-02-14 15:50:53 +02:00
itaymmguardicore 0e9206728f
Merge pull request #84 from guardicore/feature/async_scan
Feature/async scan
2018-02-13 17:39:00 +02:00