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

Whitespace fixes

This commit is contained in:
Shay Nehmad 2019-10-28 21:25:37 +02:00
parent 1f598579ee
commit 530e1a3b65
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monkey/common/cloud/aws_service_test.py
View File

@ -10,14 +10,14 @@ class TestFilterInstanceDataFromAwsResponse(TestCase):
def test_filter_instance_data_from_aws_response(self): def test_filter_instance_data_from_aws_response(self):
json_response_full = """ json_response_full = """
{ {
"InstanceInformationList": [ "InstanceInformationList": [
{ {
"ActivationId": "string", "ActivationId": "string",
"AgentVersion": "string", "AgentVersion": "string",
"AssociationOverview": { "AssociationOverview": {
"DetailedStatus": "string", "DetailedStatus": "string",
"InstanceAssociationStatusAggregatedCount": { "InstanceAssociationStatusAggregatedCount": {
"string" : 6 "string" : 6
} }
}, },
"AssociationStatus": "string", "AssociationStatus": "string",

5
monkey/infection_monkey/network/info.py
View File

@ -47,24 +47,19 @@ def get_host_subnets():
if is_windows_os(): if is_windows_os():
def local_ips(): def local_ips():
local_hostname = socket.gethostname() local_hostname = socket.gethostname()
return socket.gethostbyname_ex(local_hostname)[2] return socket.gethostbyname_ex(local_hostname)[2]
def get_routes(): def get_routes():
raise NotImplementedError() raise NotImplementedError()
else: else:
from fcntl import ioctl from fcntl import ioctl
def local_ips(): def local_ips():
valid_ips = [network['addr'] for network in get_host_subnets()] valid_ips = [network['addr'] for network in get_host_subnets()]
return valid_ips return valid_ips
def get_routes(): # based on scapy implementation for route parsing def get_routes(): # based on scapy implementation for route parsing
try: try:
f = open("/proc/net/route", "r") f = open("/proc/net/route", "r")