Commit Graph

1383 Commits

Author SHA1 Message Date
Itay Mizeretz c91aee3129 Add documentation 2018-05-23 12:27:06 +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
Oran Nadler 6019432a2b pth report is now shown also in the website 2018-05-22 03:00:06 -07: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
Oran Nadler c298544f22 Revert "try"
This reverts commit 2724e671f7.
2018-05-15 16:52:08 +03:00
Oran Nadler 2724e671f7 try 2018-05-15 16:42:51 +03:00
Oran Nadler f6ebf0b51c fix bug not running the edge generation functions due to caching 2018-05-15 16:29:02 +03:00
Oran Nadler 0fe5a20a6b fix 2018-05-15 15:37:23 +03:00
Oran Nadler cad048119d split pth to be able to run standalone and in website 2018-05-15 15:26:46 +03:00
Oran Nadler cec7ef6071 rename 2018-05-15 15:23:16 +03:00
Oran Nadler 88cb74ce12 hide junk 2018-05-15 14:28:51 +03:00
Oran Nadler 29e85a868b make attackers more visibile in table 2018-05-15 14:20:09 +03:00
Oran Nadler 3cff5edffe deepcopy cahced object before returing it 2018-05-15 13:49:23 +03:00
Oran Nadler d0ce419ae0 add GetAttackersBySid 2018-05-15 13:07:19 +03:00
Oran Nadler bad90d35c1 FATAL bugfix in cache, better find sid by username 2018-05-15 12:55:50 +03:00
Oran Nadler b54eb89330 Add 'Two machines should not share any local admin.' report 2018-05-15 11:10:32 +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
Oran Nadler e672e26f71 handle the PartCoponent issue in the report 2018-05-08 17:25:46 +03:00
Oran Nadler 7af6e6473c Handle the Win32_GroupUser missing PartCompenent issue 2018-05-08 17:05:33 +03:00
Oran Nadler 588387a263 typo 2018-05-08 16:12:51 +03:00
Oran Nadler 404da6e6d6 typo 2018-05-08 15:48:53 +03:00
Oran Nadler 0ca804d4e3 add comment 2018-05-08 15:44:05 +03:00
Oran Nadler 4c1d0bfff5 add ldap wmi queries 2018-05-08 15:40:38 +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
Itay Mizeretz b83ca0536f Merge branch 'develop' into feature/detect-cross-segment-traffic
# Conflicts:
#	infection_monkey/network/network_scanner.py
#	monkey_island/cc/services/report.py
2018-04-30 20:38:13 +03:00
Oran Nadler 72fa6bbd68 no need to eval SidType 2018-04-30 18:42:30 +03:00