Commit Graph

392 Commits

Author SHA1 Message Date
Daniel Goldberg ecdd2e8762
Merge branch 'develop' into SSH_key_stealing 2018-06-05 16:59:28 +03:00
Daniel Goldberg d77704b3e2
Merge pull request #139 from guardicore/feature/Adding_logs_to_monkey_island
Feature/adding logs to monkey island
2018-06-05 14:06:23 +03:00
Vakaris 0503f90168 Notes fixed 2018-06-04 12:07:10 +03:00
maor.rayzin f37fabaf75 I've added logs to cover these situations and modules:
Configuration reset
    Configuration Insert
    Configuration Update
    Report steps
    Monkey downloads
    Env startup logs

Also I've changed the logging init position so it covers every functions from main, some functions and vars are being called and init from import level, in order to log those situations I had to init the log system right on the beginning of the module.
2018-05-31 19:27:26 +03:00
maor.rayzin ad0d9f4567 Added more log lines 2018-05-31 18:35:33 +03:00
Daniel Goldberg 9fa92d0c88 Fix typo in warning 2018-05-31 15:39:36 +03:00
maor.rayzin 509558fbb2 Changed the log formatting a bit, added file and function name and line
numbers to the log string.
2018-05-31 13:18:33 +03:00
maor.rayzin 05c4bb7ac7 Integrated an option to download the monkey island log files from the Log page in the web app. 2018-05-31 10:44:47 +03:00
maor.rayzin 6aeaf0f857 Integrated an option to download the monkey island log files from the Log page in the web app. 2018-05-30 18:30:56 +03:00
Vakaris 30a3bbf9a0 Exploitation of machines using ssh keys added. Also, added shh keys exploitation to report 2018-05-29 01:02:49 +03:00
Vakaris f45cebfd5e Does not store encrypted or already present ssh keys, shows all users from whom SSH private key were stolen under "stolen credentials" in report 2018-05-25 01:34:24 +03:00
Vakaris 5f194b70f2 Unecessary import fixed 2018-05-24 17:11:45 +03:00
Vakaris 4197ab12a3 SSH keys are now encrypted and added to database 2018-05-24 16:59:22 +03:00
cclauss 0411811fe5 from six import string_types, text_type, xrange (#128)
* from six import string_types, text_type, xrange
2018-05-22 11:13:18 +03:00
maor.rayzin 13fa4fa6a4 Added a logging system to the monkey_island module.
Added a main function in main.py
Inserted a few logs to test the log system
2018-05-17 19:24:50 +03:00
Daniel Goldberg 7656f448a5
Add python-dev as dependency
Because we also build packages manually during the install that depend on python-dev
2018-05-17 15:11:38 +03:00
Daniel Goldberg 1af9ffc0d4
Merge pull request #129 from cclauss/new-style-exceptions
New style exceptions, has_key(), and types
2018-05-08 13:05:08 +03:00
cclauss bc76ea977b New style exceptions, has_key(), and types 2018-05-07 16:24:11 +02:00
Vakaris 5027c9b15b Tick under report, while map is still running fixed. Now tick only apears after map generation is finished. 2018-04-29 20:14:17 +03: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