Commit Graph

774 Commits

Author SHA1 Message Date
itaymmguardicore 768d1448a2
Merge pull request #94 from guardicore/feature/support-subnet-in-config
Feature/support subnet in config
2018-04-12 18:17:10 +03:00
Daniel Goldberg a77044dbf0 Add quick documentation for get_range and __iter__ in base class 2018-04-12 15:58:58 +03:00
Daniel Goldberg 84a678ba5a Bugfix in creating IpRange object + clearer error message 2018-04-12 15:53:31 +03:00
Daniel Goldberg 7eb2a5c98b Remove class C limitation when getting local subnet 2018-04-12 14:57:22 +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
Itay Mizeretz fcb5b8f85d Fix CR 2018-04-11 11:28:59 +03:00
Daniel Goldberg 2365f4db42 Fix edge case when returning invalid input in EG exploiter 2018-04-02 18:28:44 +03:00
Daniel Goldberg 7f89cc753d Add missing pip dependency 2018-04-02 18:05:52 +03:00
Daniel Goldberg f1bbb255cd Fix edge case in ElasticGroovy 2018-04-02 17:19:45 +03:00
Daniel Goldberg 99b22cfa56 Fail gracefully in case of no open ports on Windows 2018-04-02 16:49:18 +03:00
Daniel Goldberg f37c3aaa2c
Merge pull request #114 from guardicore/master
Rebase develop onto master
2018-04-02 16:44:11 +03:00
Daniel Goldberg 2d9481f142
Merge pull request #111 from guardicore/bugfixes
Bugfixes
2018-04-02 16:43:09 +03:00
Daniel Goldberg 9d59e9164c
Merge pull request #113 from guardicore/master
Rebase develop onto master
2018-04-02 14:39:48 +03:00
Daniel Goldberg 5a8b7e98c2
Merge pull request #112 from guardicore/nadler/unicode
fix unicode bug
2018-04-02 14:18:56 +03:00
Oran Nadler ac8f218586 fix unicode bug 2018-04-02 01:47:15 -07:00
Daniel Goldberg d754d39e75 Fix spurious successful connection attempts in check_tcp_ports 2018-04-01 15:17:13 +03:00
Daniel Goldberg 3aa1b9e5a9 Bugfix in _cast_by_example, see issue #109 2018-03-29 15:39:47 +03:00
Daniel Goldberg 7412b47348
Merge pull request #110 from guardicore/feature/extract_azure
Feature/extract azure
Onto master for specific release
2018-03-29 11:03:24 +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 095510e8e2 Add filtering of invalid results, otherwise it'll propagate 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
Daniel Goldberg 21abdb5cef Add tag to system info if on Azure and harvested creds. 2018-03-29 11:01:05 +03:00
Daniel Goldberg e3bd29ef6f Add credential harvesting by default to both OS colelctors 2018-03-29 11:01:05 +03:00
Daniel Goldberg cb39be6f58 Initial commit of standalone Azure password harvester 2018-03-29 11:01:05 +03:00
Ace Pace 225c7fae6f Delete current monkey business code from repository untill we go back to developing it. 2018-03-22 09:47:30 +02:00
Daniel Goldberg 8f0251e822
Updated readme links 2018-03-13 11:08:23 +02:00
Itay Mizeretz 08e7f8cd3a quick bugfix for auth 2018-03-11 19:03:40 +02:00
Daniel Goldberg 0fb4feb78c
Merge pull request #107 from guardicore/develop
Finish the current small sprint.
New additions
* New icons
* Encrypted creds in the DB
* Option to pull logs from the monkey
* Rename C&C to Monkey Island 
* Get rid of chaos monkey (at last!)
* Async scanning of victims
2018-03-10 18:44:21 +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
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