Commit Graph

902 Commits

Author SHA1 Message Date
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
Daniel Goldberg c7ed02b98e Bugfix, run Shellshock attack as dropper rather than monkey 2018-05-31 15:38:54 +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
Daniel Goldberg 3be4f07c75
Remove Monkey testing code, dead code as it is. (#137)
Remove the current UT code, it's not useful as it is.
2018-05-27 17:20:10 +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
Itay Mizeretz 8a56144a09 Various required fixes 2018-05-23 20:29:32 +03:00
Itay Mizeretz d30f2cf8dc Update scripts 2018-05-23 20:26:33 +03:00
Itay Mizeretz a594bd11c2 Update gitignore, another relative file fix 2018-05-23 16:09:35 +03:00
Itay Mizeretz 0c6f9cb7c2 Move everything under monkey 2018-05-23 16:05:41 +03:00
Itay Mizeretz f3742c67d0 make monkey_island work with common folder 2018-05-23 15:56:08 +03:00
Daniel Goldberg ee835d51b0 Remove Monkey testing code, dead code as it is. 2018-05-23 15:22:27 +03:00
Vakaris e8b388482b quick fix 2018-05-22 19:06:12 +03:00
Vakaris a6d2483f7b Tested with windows and fixed all notes 2018-05-22 18:54:10 +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 79db44d4ea Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	infection_monkey/example.conf
2018-05-17 19:28:59 +03:00
maor.rayzin 60730db45d Fixed the example configuration file, it had a json syntax error. 2018-05-17 19:28:04 +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 dd507261ff
Merge pull request #136 from guardicore/master
Update develop with dockerfile and travis config
2018-05-17 19:14:37 +03:00
Daniel Goldberg bb1851dcc9
Merge pull request #124 from theonlydoo/master
quickwin dockerization
2018-05-17 17:46:43 +03:00
maor.rayzin 53ec1f77ac changed tabs to 4 spaces 2018-05-17 17:41:30 +03:00
Daniel Goldberg 8dbe6ca24c
Merge pull request #135 from guardicore/bugfix/example.conf_syntax_error
Json file was missing two commas
2018-05-17 17:39:54 +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
maor.rayzin 0be721cf01 Json file was missing two commas 2018-05-17 14:11:07 +03:00
Vakaris cdb4d459bb SSH key-stealing implemented 2018-05-16 15:19:59 +03:00
Daniel Goldberg 4d7cff9fdb
Merge pull request #132 from cclauss/patch-2
ftp.py: Undefined name local_ip --> self.local_ip
2018-05-08 19:06:44 +03:00
Daniel Goldberg e19e609fae
Merge pull request #131 from cclauss/patch-1
Travis CI for automated testing of all pull requests
2018-05-08 18:36:29 +03:00
cclauss 023c7cb093
ftp.py: Undefined name local_ip --> self.local_ip
__local_ip__ is an __undefined name__ in this context (could raise NameError at runtime) so this PR recommends the use of __self.local_ip__ instead.  

flake8 testing of https://github.com/guardicore/monkey on Python 3.6.3

$ __flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics__
```
./infection_monkey/transport/ftp.py:86:29: F821 undefined name 'local_ip'
        self.servsock.bind((local_ip,0))
                            ^
```
2018-05-08 12:23:30 +02:00
Daniel Goldberg 2bc87794b7
Merge pull request #130 from cclauss/long-was-removed-in-Python3
long was removed in Python 3
2018-05-08 13:06:36 +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 9cd839abf6
Travis CI for automated testing of all pull requests
Travis Continuous Integration is free for all open source projects like this one.  This config file would have Travis CI run [flake8](http://flake8.pycqa.org) tests to find Python syntax errors and undefined names in all pull requests _before_ they are reviewed.  To turn Travis CI on, visit https://travis-ci.com/guardicore
2018-05-07 17:19:28 +02:00
cclauss 0bb0cfbd5d long was removed in Python 3 2018-05-07 16:48:49 +02:00
cclauss bc76ea977b New style exceptions, has_key(), and types 2018-05-07 16:24:11 +02:00
Daniel Goldberg b2b67d3034 Update issue templates 2018-05-05 18:36:42 +03:00
Daniel Goldberg b6e39280be Spacing in __str__ method of VictimHost 2018-05-05 16:23:58 +03:00
Daniel Goldberg 3423290a37
Update where we want PRs to go to 2018-05-04 18:44:21 +03:00
Daniel Goldberg e80e004fae
Merge pull request #123 from goswami-rahul/patch-1
update __repr__ method in VictimHost class
2018-05-04 18:42:48 +03:00
theonlydoo 58d7f6de50 quickwin dockerization 2018-05-04 17:23:10 +02:00
Rahul Goswami 7503a77ff7
update __repr__ method in VictimHost class
- __repr__ method should return the standard constructor string (pep8)
2018-05-03 00:50:02 +05:30
Daniel Goldberg 0937ebb520
Remove year in the license 2018-05-01 15:12:30 +03:00
Daniel Goldberg a6d0a18313
Merge pull request #118 from VakarisZ/102_issue_fix
Bugfix(102) V under report generated after new monkey ran
2018-04-30 11:52:00 +03: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 6dc1f6f661
Merge pull request #117 from guardicore/develop
Merge develop into master
2018-04-17 14:39:07 +03:00