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

929 Commits

Author SHA1 Message Date
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
Daniel Goldberg 3f0569a29e EG bugfixes 
- Use dropper instead of monkey
 - Run disconnected shell
 - Check for dropper log instead of monkey log
 2018-04-17 14:34:26 +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 558fa749ca Bugfix in dropper.py, handle gracefully failure in cleanup 2018-04-17 14:20:21 +03:00
Daniel Goldberg cc4ad05be8 Bugfix in dropper.py, return value in all fail paths 2018-04-17 14:16:46 +03:00
Daniel Goldberg 20c7fef0e8 Fix possible bug when handling passwords with unicode characters 2018-04-17 12:32:46 +03:00
Daniel Goldberg ca65be8946 Additional edge case in parsing Azure configuration files 2018-04-17 11:33:14 +03:00
Daniel Goldberg 3fe6d2456b Bugfix when upgrading the monkey without admin permissions. 
Can happen during development or future exploit flows
 2018-04-17 11:27:35 +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
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 3e859d84fb Rename check for 64-bit to make explict it's a windows only check 2018-04-12 17:57:21 +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 1407ab3969 Fix last CR comments 2018-04-11 21:09:06 +03:00
Itay Mizeretz 86d802882a Fix race-condition bug on upgrade 2018-04-11 20:59:23 +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
Itay Mizeretz fcb5b8f85d Fix CR 2018-04-11 11:28:59 +03:00
Daniel Goldberg 10ffb71614
Fixed issue tracker link 2018-04-08 19:46:54 +03:00
Daniel Goldberg 9d2f3bfde2
Merge pull request #116 from guardicore/develop 
Develop
 2018-04-02 18:31:08 +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