Commit Graph

1756 Commits

Author SHA1 Message Date
Shay Nehmad 1018906602 Added models using mongoengine and started using them in the code, and added TTL field
TTL doesn't get expired for some reason, trying to solve in https://stackoverflow.com/questions/55994379/mongodb-ttl-index-doesnt-delete-expired-documents
2019-05-05 20:50:11 +03:00
Shay Nehmad fd2e0887ff Refactor Environment to enable access to mongo url 2019-05-05 20:48:05 +03:00
Shay Nehmad 03420aae50 Update const of timeout 2019-05-05 20:47:36 +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 99bc61f9d9 Added a decorator in which the "timer start" for the timeout can be implemented 2019-04-25 14:45:37 +03:00
Shay Nehmad 1a5ebf8dbd chmod +x install_mongo 2019-04-24 15:16:28 +03:00
Shay Nehmad 790c8fd079 Added PyCharm ignore inspection to PyInstaller import and updated gitignore 2019-04-24 14:16:38 +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
itay 49d55a4b8e remove monkey version from server_config.json 2019-04-23 14:45:30 +03:00
itay 362b87f72a Use hardcoded version 2019-04-23 14:44:09 +03:00
Shay Nehmad 1965180487 Added init of AwsService to beginning of server lifetime 2019-04-23 13:30:39 +03:00
Shay Nehmad 7f0418f91b Updated exporter initialization
Exporter now detects if the server is running on AWS automatically.
2019-04-23 13:24:06 +03:00
itay 06f9153976 fix fetch call 2019-04-23 12:28:38 +03:00
Shay Nehmad 63c00d656f Fixed grammer error in telemetry 2019-04-23 12:22:26 +03:00
Shay Nehmad aa15b67fca Added some debug logs 2019-04-23 12:19:34 +03:00
Shay Nehmad e0ec62b057 Sending finding to AWS security hub without creds 2019-04-23 12:02:13 +03:00
itay 8523075494 Remove authentication from version info resource
Add new line at end of server_config.json
2019-04-23 11:54:51 +03:00
itay 3288bf4e6c don't require verify for internet check 2019-04-23 11:49:03 +03:00
Shay Nehmad 17aa9f57ca Updated alertboxes 2019-04-23 10:38:58 +03:00
itaymmguardicore 3e7a979f96
Merge pull request #311 from guardicore/bugfix/update-bootstrap
update bootstrap to 3.4.1
2019-04-22 19:05:18 +03:00
itay 1d9518d18c update bootstrap to 3.4.1 2019-04-22 19:03:09 +03:00
itay 91b459f286 internet check now uses https instead of icmp 2019-04-22 18:22:51 +03:00
itay d486471fb2 Add version component to UI 2019-04-22 18:09:21 +03:00
itay fe1d9b8f72 Add version update service+resource
Add routing to update resource
Split app initializing to functions
2019-04-22 18:08:58 +03:00
itay 614f464f24 Add deployment and version for environment 2019-04-22 18:07:20 +03:00
Daniel Goldberg e256ad3ee5
Merge pull request #307 from VakarisZ/mssql_docs
MonkeyZoo: MsSQL docs improved
2019-04-21 10:15:20 +03:00
VakarisZ 7c3ba14100 Small pr refactoring 2019-04-20 11:45:20 +03:00
itaymmguardicore d36df7a0a3
Update monkey/monkey_island/cc/services/attack/attack_config.py
dict typo

Co-Authored-By: VakarisZ <36815064+VakarisZ@users.noreply.github.com>
2019-04-19 16:52:47 +03:00
Dhayalan 3603d210ff Update ReportPage.js 2019-04-18 21:07:17 +02:00
Dhayalan 9e5292dc8e Update vsftpd.py
implemented 3 functions socket_connect, socket_send,socket_send_recv to handle the exception as advised.
2019-04-18 20:48:24 +02:00
Shay Nehmad dac7276188 Added warning sign to warning box 2019-04-18 17:54:41 +03:00
Shay Nehmad 2566249303 Made the doc info in an alert box 2019-04-18 17:44:51 +03:00
VakarisZ 6d99a892d6
Merge pull request #308 from VakarisZ/ssh_exception_revert
Reverted ssh exception handling changes.
2019-04-18 09:04:36 +03:00
VakarisZ ae1ccfaf9a Reverted ssh exception handling. 2019-04-18 09:01:27 +03:00