Commit Graph

431 Commits

Author SHA1 Message Date
Daniel Goldberg 20c7fef0e8 Fix possible bug when handling passwords with unicode characters 2018-04-17 12:32:46 +03:00
Daniel Goldberg c82fd3400a
Merge pull request #104 from guardicore/bugfix/upgrade-windows-32-to-64
Bugfix/upgrade windows 32 to 64
2018-04-17 10:26:30 +03:00
Itay Mizeretz be5d17ab42 Merge branch 'develop' into bugfix/upgrade-windows-32-to-64
# Conflicts:
#	infection_monkey/monkey.py
2018-04-11 19:21:52 +03:00
Itay Mizeretz 148684d78f Fixed most CR 2018-04-11 19:07:03 +03:00
Itay Mizeretz dcbcc34af0 Merge branch 'develop' into feature/support-subnet-in-config
# Conflicts:
#	monkey_island/cc/services/report.py
2018-04-11 11:33:16 +03:00
Daniel Goldberg bcd26eb5fa Fix spacing 2018-03-29 11:01:07 +03:00
Daniel Goldberg 1048e12fbd Shorter and maybe final wording 2018-03-29 11:01:07 +03:00
Daniel Goldberg b06d92331d Fix horrid encryption bug where monkeys would not receive new credentials.
Note the change in config.py is not optimal but should be fixed as part of another PR
2018-03-29 11:01:07 +03:00
Daniel Goldberg 9b44fc8b98 Adds configuration option to turn Azure collection on and off
Merge mimikatz and Azure into system info collection settings.
2018-03-29 11:01:06 +03:00
Daniel Goldberg 9d7b345d1d Split up Azure credential working to make it easier for the server to understand.
Fixed bugs in Azure report server side and fixed a hardcoded constant in get_issues_overview
2018-03-29 11:01:06 +03:00
Daniel Goldberg 93fee0d2c5 Add Azure password stealing to the report. 2018-03-29 11:01:06 +03:00
Itay Mizeretz 08e7f8cd3a quick bugfix for auth 2018-03-11 19:03:40 +02:00
Itay Mizeretz 6caec5ccf2 quick bugfix to not try and drop system collections 2018-03-10 18:24:58 +02:00
itaymmguardicore 1a3ca06ce8
Merge pull request #86 from guardicore/feature/secure-island-db
Feature/secure island db
2018-03-08 20:03:40 +02:00
Itay Mizeretz 444828ad02 Remove isparta-instrumenter-loader
Force up-to-date moment dep
2018-03-08 19:12:51 +02:00
Itay Mizeretz cf86294eb4 fix CR 2018-03-08 15:37:45 +02:00
Itay Mizeretz 795885b322 Fix CR 2018-03-08 14:17:27 +02:00
Daniel Goldberg 8f5643b0b5
Merge pull request #87 from guardicore/feature/send-raw-log
Feature/send raw log
2018-03-06 18:10:22 +02:00
Itay Mizeretz ee23703bfa Monkey now uses different names for 32,64bit on windows.
No need to use dropper or rename moneky
2018-03-04 17:05:43 +02:00
Itay Mizeretz abd738acbc Change config value name
Add logs
2018-02-28 19:01:42 +02:00
Itay Mizeretz 260607b685 Use dedicated api to determine server is running 2018-02-28 18:26:31 +02:00
Itay Mizeretz 8509eef48e Add basic logic to windows upgrade 2018-02-28 14:10:01 +02:00
Itay Mizeretz 03c32025aa Update icons 2018-02-27 19:39:32 +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 3efc638d1f Add segmentation issues section 2018-02-27 15:54:45 +02:00
Itay Mizeretz 08995796ef Make both segmentation issues and island segmentation issues present the same warning 2018-02-27 15:54:19 +02:00
Itay Mizeretz 57ae31406a Implement backend 2018-02-27 14:17:50 +02:00
Itay Mizeretz aae2a3a8de rename existing cross_segment_issue to island_cross_segment_issue 2018-02-27 14:05:23 +02:00
Itay Mizeretz cacb60b132 Add parent path for python paths (for common code) 2018-02-27 14:03:50 +02:00
Itay Mizeretz d6240ff502 move inaccessible_subnet_groups to seperate category 2018-02-26 17:32:02 +02:00
Itay Mizeretz 5f93f33128 Merge branch 'feature/support-subnet-in-config' into feature/detect-cross-segment-traffic
# Conflicts:
#	infection_monkey/config.py
2018-02-26 16:36:40 +02:00
Itay Mizeretz 0de15736ac rename and move range_fixed 2018-02-26 16:34:23 +02:00
Itay Mizeretz c6881e6147 Merge branch 'feature/support-subnet-in-config' into feature/detect-cross-segment-traffic 2018-02-26 16:13:02 +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
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
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
Itay Mizeretz 7111f5b0e2 Add inaccessible_subnet_groups config value 2018-02-21 12:55:36 +02:00
Itay Mizeretz d3ce956224 Change description of config value 2018-02-20 16:21:23 +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 3ea4609975 Remove C&C from all textual and code mentions 2018-02-15 15:36:19 +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
Itay Mizeretz 06a2e4f18d encrypt credentials in config+telemetry 2018-02-13 16:34:37 +02:00
Itay Mizeretz 29e85100d2 Add global encryptor 2018-02-13 16:29:24 +02:00
Itay Mizeretz 0ed2f74824 Add encryptor 2018-02-13 12:05:01 +02:00
Daniel Goldberg 8b5e6c30e6 add missing run.sh file 2018-02-11 09:11:32 +02:00
Itay Mizeretz 74deebb280 Fix bug in telemetry 2018-01-19 13:00:38 +02:00
Itay Mizeretz a76cf7e3f8 Always sort telemetry feed 2018-01-19 11:19:49 +02:00
Itay Mizeretz a5eaea8796 Hotfix: live telemetry feed sorted by timestamp 2018-01-19 10:58:24 +02:00
Itay Mizeretz 0a62abe450 Change report title font + resize sub-titles 2018-01-18 21:44:12 +02:00
Itay Mizeretz 56035df461 Most theme updates 2018-01-18 18:33:02 +02:00
Itay Mizeretz e1803a7ff9 Fixed CR 2018-01-16 17:23:17 +02:00
itaymmguardicore 7e77e2d33b
Merge branch 'develop' into feature/report-backend 2018-01-16 16:24:44 +02:00
Itay Mizeretz 4ef0a53026 Content fixes 2018-01-16 10:50:05 +02:00
Itay Mizeretz 1935d2d6a1 Fix temporary hack 2018-01-09 19:25:18 +02:00
Itay Mizeretz 50c674a2af Add telemetry console frontend 2018-01-09 19:19:16 +02:00
Itay Mizeretz 1ab1dbedb1 Add TelemetryFeed entrypoint + all logic 2018-01-09 19:16:18 +02:00
Itay Mizeretz fb5f1f8302 Monkey icon moved to top left 2018-01-02 19:09:41 +02:00
Daniel Goldberg 094e432898
Merge pull request #77 from guardicore/feature/virtualenv
Feature/virtualenv
2018-01-02 18:14:57 +02:00
Itay Mizeretz cfa70e109a Start browser when running island on windows 2018-01-02 18:09:51 +02:00
Itay Mizeretz fd64c9dbf6 Make sure we're using python2 2018-01-02 17:53:28 +02:00
Itay Mizeretz 3e6a2136d9 Don't create already created dir
Remove monkey_island dir on removal
2018-01-02 16:13:20 +02:00
Itay Mizeretz bee1bc6f8f Fix python path 2018-01-02 15:58:47 +02:00
Itay Mizeretz a2da9614a6 Make deb use virtualenv 2018-01-02 15:27:32 +02:00
Itay Mizeretz 59203e29a4 Split main function to smaller functions 2018-01-02 12:55:27 +02:00
Itay Mizeretz d76386e8d3 More content fixing 2018-01-02 12:40:31 +02:00
Itay Mizeretz d16f3fee9b Replace monkey logo with new one 2018-01-02 12:37:20 +02:00
Itay Mizeretz 109a9a5cbb Improve printed badge style 2018-01-02 12:34:59 +02:00
Itay Mizeretz 5649fa7043 Content improvements 2017-12-24 18:34:18 +02:00
Itay Mizeretz 6150c6fcc0 Fix bug where machine was popped out 2017-12-24 18:28:01 +02:00
Itay Mizeretz bb27444c35 use quotation marks on linux as well 2017-12-24 14:43:29 +02:00
Itay Mizeretz 6ee26297ef Add contact us at end of report 2017-12-24 12:11:22 +02:00
Itay Mizeretz 15b4a8778b Add V after generating report 2017-12-24 11:23:57 +02:00
Itay Mizeretz 002394f887 Add shortcut batches 2017-12-20 18:15:27 +02:00
Itay Mizeretz e2a622d117 Remove unecessary paragraph 2017-12-19 20:35:06 +02:00
Itay Mizeretz 0c286a3419 Remove statement if there were no infections 2017-12-19 19:02:10 +02:00
Itay Mizeretz c4f9f774af Fix bug running from path with spaces 2017-12-19 18:43:20 +02:00
Itay Mizeretz 1f571503ad Fix bug in create_certificate.bat 2017-12-19 18:02:43 +02:00
Itay Mizeretz 6ddb117723 Minor content fix 2017-12-19 17:58:21 +02:00
Itay Mizeretz b0547c4f7a Add legend to report map 2017-12-19 17:58:07 +02:00