Commit Graph

1809 Commits

Author SHA1 Message Date
Shay Nehmad 212ed68dc2 Increased TTL to 5 minutes 2019-05-28 16:44:49 +03:00
VakarisZ 54904415bd Merge branch 'attack_configuration' into attack_report
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/ui/package-lock.json
#	monkey/monkey_island/cc/ui/package.json
#	monkey/monkey_island/cc/ui/src/styles/App.css
2019-05-28 14:35:09 +03:00
VakarisZ c4e384205c PR fixes 2019-05-28 14:15:53 +03:00
Shay Nehmad 1073eb7b53
Merge pull request #313 from guardicore/feature/210-monkey-mia-timeout
[DONE] Feature/210 monkey mia timeout
2019-05-28 12:26:24 +03:00
VakarisZ 8d9432e817
Merge pull request #285 from VakarisZ/attack_configuration
Attack configuration
2019-05-28 09:09:27 +03:00
VakarisZ 691647708f Merge remote-tracking branch 'upstream/develop' into attack_configuration
# Conflicts:
#	monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
2019-05-28 08:36:48 +03:00
VakarisZ f4288f110c Race condition bugfix 2019-05-27 17:31:10 +03:00
Shay Nehmad 729c0c50b9 Deleted mongomock - not required. 2019-05-27 17:25:09 +03:00
Shay Nehmad 591b75c555 Can't override init of Documents. Created factory function instead. 2019-05-27 17:20:11 +03:00
Shay Nehmad 2e5864067b Created helper constructor for MonkeyTTL to make it more friendly to use
CR comment
2019-05-27 17:01:43 +03:00
VakarisZ 8ecfb5d777 Minor bugfixes 2019-05-27 16:52:33 +03:00
Shay Nehmad 2ecc683216 Moved monketnotfound to monkey.py
CR comment
2019-05-27 16:47:30 +03:00
Shay Nehmad bb40560fc7
Update monkey/monkey_island/cc/models/__init__.py
Fixed type

Co-Authored-By: Itay Mizeretz <30774653+itaymmguardicore@users.noreply.github.com>
2019-05-27 16:37:10 +03:00
VakarisZ 08801c8cd5 Technique dependency fixed. 2019-05-27 13:31:15 +03:00
Daniel Goldberg 089d3950cf
Merge pull request #317 from VakarisZ/import_bugfix
Configuration gets submitted on import.
2019-05-27 12:22:58 +03:00
VakarisZ 7b35005233 Minor PR fixes. 2019-05-27 11:46:54 +03:00
VakarisZ f4a47f3cb3 Request exception handling 2019-05-27 09:49:40 +03:00
VakarisZ 64701e042e Minor pr fixes 2019-05-27 09:35:09 +03:00
Shay Nehmad ffa78ac540
Merge branch 'develop' into feature/210-monkey-mia-timeout 2019-05-23 13:04:43 +03:00
Shay Nehmad 62b107884f Added TTL creation to post as well 2019-05-23 11:33:21 +03:00
Daniel Goldberg 92edee1e0a
Merge pull request #277 from Dhayalanb/develop
Added a new exploit
2019-05-22 17:29:01 +03:00
Dhayalan af5cc9031a Update vsftpd.py 2019-05-22 16:25:43 +02:00
VakarisZ fe236ebc05 Minor readability changes in config service 2019-05-22 17:09:09 +03:00
Dhayalan 38d8146c98 Update vsftpd.py
Added information about the exploit at the top, and made slight change to the format of the string USERNAME & PASSWORD
2019-05-22 16:06:42 +02:00
Dhayalan 595a089e60 Update vsftpd.py
Removed the unneccesary lines
2019-05-22 11:40:28 +02:00
Daniel Goldberg a0bb4e2c54
Merge pull request #322 from VakarisZ/mssql_fix
Mssql fix + networking fix
2019-05-22 11:50:46 +03:00
VakarisZ 7560887dd1 Minor readability changes in config service 2019-05-22 11:41:22 +03:00
VakarisZ f9c4b3e180 Minor readability changes in config service 2019-05-22 10:31:57 +03:00
VakarisZ 6c97b44b69 Merge remote-tracking branch 'upstream/develop' into attack_configuration
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/server_config.json
#	monkey/monkey_island/cc/ui/package-lock.json
#	monkey/monkey_island/cc/ui/package.json
#	monkey/monkey_island/cc/ui/src/styles/App.css
#	monkey/monkey_island/requirements.txt
2019-05-22 09:15:10 +03:00
VakarisZ 07db38a130 Reverted requirements 2019-05-22 09:00:02 +03:00
Dhayalan feb4fea19e Update vsftpd.py
Importing DOWNLOAD_TIMEOUT from the model
2019-05-22 00:55:33 +02:00
Dhayalan 8d55229ce7 Updated vsftpd.py 2019-05-22 00:47:26 +02:00
Daniel Goldberg 353ad6529d Fix invalid print statement.
Print as function in 2.7 should be explicitly imported.
2019-05-20 20:25:39 +03:00
Daniel Goldberg 8b61f41cc0 Merge remote-tracking branch 'origin/develop' into develop 2019-05-20 12:09:48 +03:00
Daniel Goldberg 01fdc7d028
Merge pull request #321 from VakarisZ/http_server_bugfix
HTTP server bugfix
2019-05-20 11:34:11 +03:00
VakarisZ 002447e749 Allows to implement helper classes in pba files 2019-05-16 12:57:15 +03:00
VakarisZ fa836cc638 Mssql exploiter finished. 2019-05-16 10:10:26 +03:00
VakarisZ 290abdc26d Mssql almost done, improved networking. 2019-05-14 17:24:24 +03:00
VakarisZ 965616c6f7 Connection closed when needed 2019-05-14 13:15:44 +03:00
VakarisZ 30a55d562a Configuration submitted on import 2019-05-14 11:44:30 +03:00
VakarisZ 4a8bd01a62 Minor changes after CR 2019-05-14 10:41:38 +03:00
VakarisZ 0c7f30b834 Monkey gets uploaded 2019-05-14 10:16:18 +03:00
VakarisZ d2b5e314c1 Payload creation 2019-05-13 14:08:30 +03:00
Daniel Goldberg 660def0d8d Merge branch 'develop' of https://github.com/guardicore/monkey into develop 2019-05-12 20:08:49 +03:00
itay 863c3458c8 fixed version update server url 2019-05-12 14:47:38 +03:00
itay 994feaa47e update monkey version to 1.6.3 2019-05-12 11:54:17 +03:00
itay 98a9684f47 Update island's readme for mongodb script instructions 2019-05-12 11:29:55 +03:00
itaymmguardicore dd04e2a389
Merge pull request #310 from guardicore/bugfix/internet-check-http
internet check now uses https instead of icmp
2019-05-12 11:24:02 +03:00
itaymmguardicore ca096d9bad
Merge pull request #309 from guardicore/feature/check-for-updates
Feature/check for updates
2019-05-12 11:23:23 +03:00
itay 7059f6a1a4 Merge branch 'develop' into feature/check-for-updates
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/requirements.txt
2019-05-12 11:23:01 +03:00