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

1851 Commits

Author SHA1 Message Date
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
VakarisZ 5ecf626705 Another T1210 refactoring 2019-04-19 13:44:36 +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
VakarisZ ef3caa866d MsSQL docs improved 2019-04-17 16:14:05 +03:00
VakarisZ 54c5d655dc Merge branch 'attack_configuration' into attack_report 
# Conflicts:
#	monkey/monkey_island/cc/ui/src/styles/App.css
 2019-04-17 14:11:33 +03:00
VakarisZ b17dbdc9de Legend style fix 2019-04-17 13:58:52 +03:00
VakarisZ ef90d8a788 Added legend and improved matrix UI 2019-04-17 13:52:04 +03:00
VakarisZ dcf6209e17 Merge branch 'develop' into attack_report 2019-04-17 13:10:53 +03:00
VakarisZ c32d07ae34 T1210 refactored. Instead of dedicated telems, relevant info is appended to 'scan' and 'exploit' telemetries 2019-04-17 11:57:33 +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