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

1597 Commits

Author SHA1 Message Date
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 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 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
Shay Nehmad 6216ac0e9e Trying to update the region and then to call remote run 
Without auth first
 2019-04-16 21:13:36 +03:00
Shay Nehmad 4741151f22 Try to remote run even if not auth 
Since auth == keys, but now it works with roles as well
 2019-04-16 20:57:51 +03:00
Shay Nehmad a38b5cf360 Added client error as error and formatted error message in site as alert-warning 2019-04-16 20:18:37 +03:00
Shay Nehmad e4e2948941 Loading now stops if not on AWS 2019-04-16 19:20:24 +03:00
Shay Nehmad 5018afb48b Trying to fix an edge where where the role is not set and there's and error while collecting machines. 2019-04-16 18:19:08 +03:00
Shay Nehmad f776765a27 Merge branch 'master' into hotfix/281-aws-roles-hotfix-for-amazon 
Conflicts:
    monkey/monkey_island/requirements.txt - Merged by just taking a
    union of both
 2019-04-16 17:03:32 +03:00
Shay Nehmad 576af97a82
Merge pull request #304 from guardicore/pr/278 
pr/278
 2019-04-16 16:58:08 +03:00
Shay Nehmad 93b0c34f07 Fixed comparison to be !== and not != 
also, fixed the same issue for machine-related issues and added documentation.
 2019-04-16 16:36:43 +03:00
Shay Nehmad b714ef7a36 BACK_MERGE: Merge branch 'develop' into pr/278 2019-04-16 16:09:25 +03:00
itaymmguardicore 3bc24288f6
Merge pull request #301 from guardicore/hotfix/deb-mongodb-req 
Hotfix/deb mongodb req
 2019-04-16 16:04:10 +03:00
itay 051239ee09 remove ubuntu 14.04 support on mongo script 2019-04-16 15:36:45 +03:00
Shay Nehmad a6a10d3a1a Added author to files 2019-04-16 15:26:47 +03:00
Shay Nehmad ce633af3d1 changed print to log 
and added some doc about exception raised
 2019-04-16 15:26:47 +03:00
Shay Nehmad 5bfff88325 CR fixes: Added botocore to requirements.txt and locked react-spinners version to the current latest. 2019-04-16 15:26:46 +03:00
Shay Nehmad 8b3bc7fc2c Fixed link and removed TODO 2019-04-16 15:26:46 +03:00
Shay Nehmad d87be71fef Added link to documentation 
RTFM
 2019-04-16 15:26:46 +03:00
Shay Nehmad a2e79ed127 Changed to gridloader 2019-04-16 15:26:46 +03:00
Shay Nehmad c90a391727 Centered and shrinked AWS loading component 2019-04-16 15:26:46 +03:00
Shay Nehmad 7670430665 Fixed error in JS 2019-04-16 15:26:46 +03:00