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

Remove unecessary parameters and members. 

Create better abstraction
This commit is contained in:
Itay Mizeretz 2018-02-26 17:53:16 +02:00
parent 816be5191b
commit e57ce1099f
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infection_monkey/network/network_scanner.py
View File

@ -45,7 +45,8 @@ class NetworkScanner(object):
for net_range in self._ranges: for net_range in self._ranges:
LOG.debug("Scanning for potential victims in the network %r", net_range) LOG.debug("Scanning for potential victims in the network %r", net_range)
for victim in net_range: for ip_addr in net_range:
victim = VictimHost(ip_addr)
if stop_callback and stop_callback(): if stop_callback and stop_callback():
LOG.debug("Got stop signal") LOG.debug("Got stop signal")
break break

20
infection_monkey/network/range.py
View File

@ -5,18 +5,14 @@ from abc import ABCMeta, abstractmethod
import ipaddress import ipaddress
from model.host import VictimHost
__author__ = 'itamar' __author__ = 'itamar'
class NetworkRange(object): class NetworkRange(object):
__metaclass__ = ABCMeta __metaclass__ = ABCMeta
def __init__(self, base_address, shuffle=True): def __init__(self, shuffle=True):
self._base_address = base_address
self._shuffle = shuffle self._shuffle = shuffle
self._config = __import__('config').WormConfiguration
def get_range(self): def get_range(self):
return [x for x in self._get_range() if (x & 0xFF != 0)] # remove broadcast ips return [x for x in self._get_range() if (x & 0xFF != 0)] # remove broadcast ips
@ -27,7 +23,7 @@ class NetworkRange(object):
random.shuffle(base_range) random.shuffle(base_range)
for x in base_range: for x in base_range:
yield VictimHost(self._number_to_ip(self._base_address + x)) yield self._number_to_ip(x)
@abstractmethod @abstractmethod
def is_in_range(self, ip_address): def is_in_range(self, ip_address):
@ -59,13 +55,12 @@ class NetworkRange(object):
class CidrRange(NetworkRange): class CidrRange(NetworkRange):
def __init__(self, cidr_range, shuffle=True): def __init__(self, cidr_range, shuffle=True):
base_address = 0 super(CidrRange, self).__init__(shuffle=shuffle)
super(CidrRange, self).__init__(base_address, shuffle=shuffle)
self._cidr_range = cidr_range.strip() self._cidr_range = cidr_range.strip()
self._ip_network = ipaddress.ip_network(unicode(self._cidr_range), strict=False) self._ip_network = ipaddress.ip_network(unicode(self._cidr_range), strict=False)
def __repr__(self): def __repr__(self):
return "<CidrRange %s>" % (self._cidr_range, ) return "<CidrRange %s>" % (self._cidr_range,)
def is_in_range(self, ip_address): def is_in_range(self, ip_address):
return ipaddress.ip_address(ip_address) in self._ip_network return ipaddress.ip_address(ip_address) in self._ip_network
@ -76,8 +71,7 @@ class CidrRange(NetworkRange):
class IpRange(NetworkRange): class IpRange(NetworkRange):
def __init__(self, ip_range=None, lower_end_ip=None, higher_end_ip=None, shuffle=True): def __init__(self, ip_range=None, lower_end_ip=None, higher_end_ip=None, shuffle=True):
base_address = 0 super(IpRange, self).__init__(shuffle=shuffle)
super(IpRange, self).__init__(base_address, shuffle=shuffle)
if ip_range is not None: if ip_range is not None:
addresses = ip_range.split('-') addresses = ip_range.split('-')
if len(addresses) != 2: if len(addresses) != 2:
@ -106,8 +100,7 @@ class IpRange(NetworkRange):
class SingleIpRange(NetworkRange): class SingleIpRange(NetworkRange):
def __init__(self, ip_address, shuffle=True): def __init__(self, ip_address, shuffle=True):
base_address = 0 super(SingleIpRange, self).__init__(shuffle=shuffle)
super(SingleIpRange, self).__init__(base_address, shuffle=shuffle)
self._ip_address = ip_address self._ip_address = ip_address
def __repr__(self): def __repr__(self):
@ -118,4 +111,3 @@ class SingleIpRange(NetworkRange):
def _get_range(self): def _get_range(self):
return [SingleIpRange._ip_to_number(self._ip_address)] return [SingleIpRange._ip_to_number(self._ip_address)]