p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity
1,667 Commits 31 Branches 20 Tags 48 MiB
Commit Graph

1667 Commits

Author SHA1 Message Date
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
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 965616c6f7 Connection closed when needed 2019-05-14 13:15:44 +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
Daniel Goldberg a6ef02ecf9 Don't chmod windows files 2019-05-11 18:33:32 +03:00
Daniel Goldberg e835eb15a8 Typo in log message 2019-05-11 16:31:20 +03:00
Daniel Goldberg aea4c36a03 Fix broken log output in web RCE module 2019-05-11 16:24:15 +03:00
Daniel Goldberg d1148a18f3 Remove warning on binding only to localhost 2019-05-11 16:03:14 +03:00
Daniel Goldberg 1aab83c79e Merge branch 'develop' of https://github.com/guardicore/monkey into develop 2019-05-11 14:56:20 +03:00
Daniel Goldberg a0e389df02
Merge pull request #315 from guardicore/change-aws-error-to-warning 
Update aws_instance.py
 2019-05-10 17:13:44 +03:00
Daniel Goldberg ab890e7baa
Struts2 ignores certificate errors, updated schema (#318) 
Struts2 ignores certificate errors, updated schema
 2019-05-10 17:11:45 +03:00
Daniel Goldberg fb07f2b6ea
Merge pull request #319 from VakarisZ/deployment_fix 
MongoDB installation script added to deployment
 2019-05-10 17:11:19 +03:00
VakarisZ b86ab2a940 MongoDB installation script added 2019-05-09 16:56:01 +03:00
VakarisZ 861750be5b Struts2 ignores certificate errors, updated schema 2019-05-09 12:23:44 +03:00
Shay Nehmad cfbf14fd67 Update aws_instance.py 2019-05-08 13:50:23 +03:00
Daniel Goldberg 75f26f921e
Merge pull request #314 from guardicore/improvment/fix-gitignore 
minor fixes, added vim swp files to gitignore
 2019-05-07 16:16:01 +03:00
VakarisZ fd551a49b1 Matrix reset bugfix 2019-05-07 14:49:17 +03:00
Shay Nehmad 467e43aa1a Added PyCharm ignore inspection to PyInstaller import and updated gitignore 2019-05-07 12:05:22 +03:00
Shay Nehmad 243a0ba961 chmod +x install_mongo 2019-05-07 12:04:12 +03:00
VakarisZ 4c0f73cb91 UI code style improved, reset_db fixed 2019-05-07 11:04:35 +03:00
VakarisZ 860b4eb813 Requirements fix 2019-05-06 15:28:46 +03:00
VakarisZ ae074c6914 Merge remote-tracking branch 'upstream/develop' into attack_configuration 2019-05-06 15:25:51 +03:00
VakarisZ c3aa316c07 Added 'should_exploit' configuration field, minor fixes 2019-05-03 10:43:46 +03:00
VakarisZ cdd3270730 Attack configuration page moved into island configuration 2019-05-02 17:11:30 +03:00
itay b560f4c58f move bson to beginning of requirements 
add requests to requirements
 2019-04-30 15:22:30 +03:00
VakarisZ c055820a0d Merge branch 'attack_configuration' of https://github.com/VakarisZ/monkey into attack_configuration 2019-04-29 09:55:15 +03:00
Daniel Goldberg 916478ee63 Fix variable quoting 2019-04-28 19:57:12 +03:00
Shay Nehmad 52a1149b0f
Merge pull request #312 from guardicore/master 
Back-merge Master into Develop
 2019-04-24 10:46:26 +03:00
Shay Nehmad 08a7b1f91f
Merge branch 'develop' into master 2019-04-24 10:46:11 +03:00
Shay Nehmad 9613a57e10
Merge pull request #303 from guardicore/hotfix/281-aws-roles-hotfix-for-amazon 
Hotfix/281 aws roles hotfix for amazon.
Approved by me and @acepace  👍
 2019-04-24 10:43:22 +03:00
Shay Nehmad 2fae4905fe Added some documentation 2019-04-24 10:41:52 +03:00
Shay Nehmad 1f75b72a97 Improved c'tor of AwsInstance 2019-04-23 20:23:48 +03:00
Shay Nehmad 6b2eb126b5 Deleted ENCRYPTED_CONFIG_STRINGS 2019-04-23 19:44:47 +03:00
Shay Nehmad 9e49721bec Deleted any and all remainders of AWS access key/secret key from the project 2019-04-23 19:42:07 +03:00
Shay Nehmad 2a58e9ddc0 Improved the error messages of AWS remote run 
So the users will have a better chance of understanding the situation and deal with it
 2019-04-23 19:04:39 +03:00
itay a52ce6640e Merge branch 'develop' into feature/check-for-updates 2019-04-23 18:45:22 +03:00
Shay Nehmad e1cd7254fd Removed aws auth params from code 
Since we're not using it anymore
 2019-04-23 18:45:03 +03:00
itay db4d5c79bc Merge branch 'master' into develop 
# Conflicts:
#	monkey/monkey_island/cc/app.py
#	monkey/monkey_island/cc/resources/root.py
#	monkey/monkey_island/requirements.txt
 2019-04-23 18:44:48 +03:00
Shay Nehmad e18bbb397c Added debug line to exporter manager 2019-04-23 18:24:47 +03:00
Shay Nehmad 7b6ff8b9c0 Getting the AWS account ID programmatically 
And configuration can override it
 2019-04-23 18:09:06 +03:00