p20319658
/
monkey
forked from p34709852/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved AWS collector to only run SS on island

This commit is contained in:
VakarisZ 2020-10-01 15:11:51 +03:00
parent b1a5691fae
commit d618428ff8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
monkey/infection_monkey/system_info/collectors/aws_collector.py
View File

@ -1,10 +1,12 @@
import logging import logging
from common.cloud.aws.aws_instance import AwsInstance from common.cloud.aws.aws_instance import AwsInstance
from common.cloud.scoutsuite_consts import PROVIDERS
from common.common_consts.system_info_collectors_names import AWS_COLLECTOR from common.common_consts.system_info_collectors_names import AWS_COLLECTOR
from infection_monkey.system_info.collectors.scoutsuite_collector.scoutsuite_collector import scan_cloud_security
from infection_monkey.system_info.system_info_collector import \ from infection_monkey.system_info.system_info_collector import \
SystemInfoCollector SystemInfoCollector
from infection_monkey.system_info.collectors.scoutsuite_collector.scoutsuite_collector import CLOUD_TYPES, scan_cloud_security from infection_monkey.config import WormConfiguration
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -18,6 +20,11 @@ class AwsCollector(SystemInfoCollector):
def collect(self) -> dict: def collect(self) -> dict:
logger.info("Collecting AWS info") logger.info("Collecting AWS info")
if WormConfiguration.started_on_island:
logger.info("Attempting to scan AWS security with ScoutSuite.")
scan_cloud_security(cloud_type=PROVIDERS.AWS)
else:
logger.info("Didn't scan AWS security with ScoutSuite, because not on island.")
aws = AwsInstance() aws = AwsInstance()
info = {} info = {}
if aws.is_instance(): if aws.is_instance():
@ -26,8 +33,6 @@ class AwsCollector(SystemInfoCollector):
{ {
'instance_id': aws.get_instance_id() 'instance_id': aws.get_instance_id()
} }
# TODO add IF ON ISLAND check
scan_cloud_security(cloud_type=CLOUD_TYPES.AWS)
else: else:
logger.info("Machine is NOT an AWS instance") logger.info("Machine is NOT an AWS instance")