p59342861
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,616 Commits 30 Branches 0 Tags 47 MiB
Commit Graph

1616 Commits

Author SHA1 Message Date
Shay Nehmad 2c15c07039 Merge branch 'feature/210-monkey-mia-timeout' into improvement/232-dont-show-linux-in-cred-map 2019-05-07 17:38:48 +03:00
Shay Nehmad 963305db6e Added usage documentation to the unit tests 2019-05-07 17:36:22 +03:00
Shay Nehmad 5ec82647e4 Increased expiry time to fit production scenarios 2019-05-07 17:32:03 +03:00
Shay Nehmad 26bbf07d75 Deleted unused file (early implementation idea) 2019-05-07 17:31:38 +03:00
Shay Nehmad 29b7bb1adf Added documentation 2019-05-07 17:31:15 +03:00
Shay Nehmad bf3b2df253 Added section markers to monkey model 2019-05-07 17:21:05 +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
Shay Nehmad 81e49b45ce Small fix 
Overshadows local
 2019-05-07 15:59:16 +03:00
Shay Nehmad dc8f9294cd Added documentation about mongo connection setup 2019-05-07 15:58:44 +03:00
Shay Nehmad 00a4ffd028 The bug was found, TTL now works! 
should have been utcnow(). see  https://stackoverflow.com/questions/55994379/mongodb-ttl-index-doesnt-delete-expired-documents

Feature was tested locally and works!
 2019-05-07 15:58:05 +03:00
Shay Nehmad 0e4dbfb078 Replacing existing code with the new model API 
Only for is_dead calls
 2019-05-07 15:57:11 +03:00
Shay Nehmad 3c6cda03af Added get_single_monkey_by_id API to the monkey model 
Useful in many cases in the code.
Also added unittest for this method which passed.
 2019-05-07 15:56:27 +03:00
Shay Nehmad 295525dfed Extracted models to files, created TestingEnv, and added unit testing for Monkey.is_dead 
The init of models checks the env and sets up the DB connection.
 2019-05-07 13:54: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
Shay Nehmad 0602a3bc83 Renamed collection from TTL to MonkeyTTL 2019-05-07 11:51:17 +03:00
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
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
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
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
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
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
Daniel Goldberg e256ad3ee5
Merge pull request #307 from VakarisZ/mssql_docs 
MonkeyZoo: MsSQL docs improved
 2019-04-21 10:15:20 +03: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
VakarisZ ef3caa866d MsSQL docs improved 2019-04-17 16:14:05 +03:00
Shay Nehmad 6000990dbb Dont use update aws auth params at all 2019-04-16 22:11:22 +03:00
Shay Nehmad 9c38d8e72a Moved region update to beginning of auth function 
So it'll work without auth params as well
 2019-04-16 21:55:36 +03:00