p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
807 Commits 30 Branches 0 Tags 47 MiB
Commit Graph

374 Commits

Author SHA1 Message Date
cclauss bc76ea977b New style exceptions, has_key(), and types 2018-05-07 16:24:11 +02:00
Daniel Goldberg 4e5334f177 Fix possible bug when handling passwords with unicode characters #2 2018-04-17 14:23:00 +03:00
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 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
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 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