p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Rename Aws to proper AWS

This commit is contained in:
Daniel Goldberg 2018-11-27 14:10:46 +02:00
parent eddc4ca36a
commit b3afeee3c0
6 changed files with 3508 additions and 3428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monkey/common/cloud/aws.py
View File

@ -3,7 +3,7 @@ import urllib2
__author__ = 'itay.mizeretz' __author__ = 'itay.mizeretz'
class Aws: class AWS:
def __init__(self): def __init__(self):
try: try:
self.instance_id = urllib2.urlopen('http://169.254.169.254/latest/meta-data/instance-id').read() self.instance_id = urllib2.urlopen('http://169.254.169.254/latest/meta-data/instance-id').read()

1
monkey/infection_monkey/system_info/__init__.py
View File

@ -5,7 +5,6 @@ import sys
import psutil import psutil
from enum import IntEnum from enum import IntEnum
from common.cloud.aws import Aws
from infection_monkey.network.info import get_host_subnets from infection_monkey.network.info import get_host_subnets
from infection_monkey.system_info.aws_collector import AwsCollector from infection_monkey.system_info.aws_collector import AwsCollector
from infection_monkey.system_info.azure_cred_collector import AzureCollector from infection_monkey.system_info.azure_cred_collector import AzureCollector

4
monkey/infection_monkey/system_info/aws_collector.py
View File

@ -1,6 +1,6 @@
import logging import logging
from common.cloud.aws import Aws from common.cloud.aws import AWS
__author__ = 'itay.mizeretz' __author__ = 'itay.mizeretz'
@ -15,7 +15,7 @@ class AwsCollector(object):
@staticmethod @staticmethod
def get_aws_info(): def get_aws_info():
LOG.info("Collecting AWS info") LOG.info("Collecting AWS info")
aws = Aws() aws = AWS()
info = {} info = {}
if aws.is_aws_instance(): if aws.is_aws_instance():
LOG.info("Machine is an AWS instance") LOG.info("Machine is an AWS instance")

4
monkey/monkey_island/cc/environment/aws.py
View File

@ -1,6 +1,6 @@
import cc.auth import cc.auth
from cc.environment import Environment from cc.environment import Environment
from common.cloud.aws import Aws from common.cloud.aws import AWS
__author__ = 'itay.mizeretz' __author__ = 'itay.mizeretz'
@ -12,7 +12,7 @@ class AwsEnvironment(Environment):
@staticmethod @staticmethod
def _get_instance_id(): def _get_instance_id():
return Aws.get_instance_id() return AWS.get_instance_id()
def is_auth_enabled(self): def is_auth_enabled(self):
return True return True

6923
monkey/monkey_island/cc/ui/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
monkey/monkey_island/cc/ui/package.json
View File

@ -86,7 +86,7 @@
"react-graph-vis": "^1.0.2", "react-graph-vis": "^1.0.2",
"react-json-tree": "^0.11.0", "react-json-tree": "^0.11.0",
"react-jsonschema-form": "^1.0.5", "react-jsonschema-form": "^1.0.5",
"react-redux": "^5.0.7", "react-redux": "^5.1.1",
"react-router-dom": "^4.3.1", "react-router-dom": "^4.3.1",
"react-table": "^6.8.6", "react-table": "^6.8.6",
"react-toggle": "^4.0.1", "react-toggle": "^4.0.1",