renaming, update license

LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -1,20 +1,20 @@
-Probe-response attack
-=====================
+PREPARE - The Probe-response attack framework 
+=============================================
 
 This project implements the probe-response attack (PRA) using the effective attack logic
-probosed by Bethencourt et al (see Mapping Internet Sensors With Probe Response Attacks, 2005)
+probosed by Bethencourt et al. (see Mapping Internet Sensors With Probe Response Attacks, 2005)
 improved by further methodologies. The first one is made of a generic encoding scheme using checksums
 to filter out non-probe events from attack reports. The second is a fingerprinting approach using feedback
 on network level to cluster monitor nodes in the following attack iteration.
 The attack framework is targeted against TraCINg and DShield and is extensible towards new CIDS (see Extension).
-Furthermore this projects contains a TraCINg installation extended to mitigate the threat
+Furthermore this project contains a TraCINg installation extended to mitigate the threat
 originated from PRAs and a simulation environment allowing to simulate attacks on TraCINg.
 
 This project is made of the following parts:
 
-* Probe-response attack framework (see ./attack_framework)
+* Probe-response attack framework (PREPARE) (see ./prepare)
 * TraCINg, extended with Probe-Response attack mitigations (see ./tracing)
-* Probe-Response attack simulation environment (see ./attack_framework)
+* Probe-Response attack simulation environment (see ./prepare)
 
 ## Requirements and installation ##
 * The attack framework and simulation environment use raw sockets which implies root priviliges.
@@ -40,14 +40,15 @@ This project is made of the following parts:
     : iptables -A OUTPUT -p tcp -m tcp --tcp-flgas RST,RST RST,RST -j DROP
     : **Undo of the previous command:**
     : iptables -D OUTPUT -p tcp -m tcp --tcp-flags RST,RST RST,RST -j DROP
+
 ### Python 3.x ###
 * Install and start virtualenv
     : virtualenv -p /usr/bin/python3.4 /root/.virtualenv
     : source /root/.virtualenv/bin/activate
 * Install Python modules
-    : pip install -r attack_framework/requirements.txt
+    : pip install -r prepare/requirements.txt
 * Warning: socketio_client needs a bug fix because of wrongly handled encodings (TraCINg sometimes uses non-UTF8 encodings which lets the lib crash)
-    : cp attack_framework/bugfix_socketio/* /root/.virtualenv/lib/python3.4/site-packages/socketIO_client/
+    : cp prepare/bugfix_socketio/* /root/.virtualenv/lib/python3.4/site-packages/socketIO_client/
 
 
 ### ZMap ###
@@ -56,15 +57,15 @@ This project is made of the following parts:
     : rm CMakeCache.txt
     : ./build_zmap.sh
     : ./update_ip_blacklist.sh
-    : cd .\.
+    : See README.md for more informations.
 
-### Node.js ###
-* This is a bugfixed version of TraCINg (allowing ports 0 and 65535 in modules/postHandler.js
-    : cd tracing
-    : rm -rf node_modules
-    : npm install
-    : npm install chance collections event-stream fs
-    : cd .\.
+### TraCINg ###
+* This is a bugfixed version of TraCINg (allowing ports 0 and 65535 in modules/postHandler.js)
+* See TraCINg README for further information on installing/configuring.
+* Some side notes:
+    : Old modules of Node.js should be removed before installing: rm -rf node_modules
+    : Some additional Node.js modules are used which should already be installed using the standard installation.
+Otherwise they can be installed using: cd tracing && npm install chance collections event-stream fs
 
 * Problems with MongoDB:
     : The Latency of Mongo-DB is too large on high traffic which is why
@@ -76,13 +77,16 @@ data insertion is commented out in postHandler.js (not needed)
     : . ./setup_evironment.sh startinterface
 
 ### Starting TraCINg ###
-* cd tracing
-* node --max-new-space-size=4096 --max-old-space-size=2048 index.js
+* cd tracing && node --max-new-space-size=4096 --max-old-space-size=2048 index.js (increase memory if needed)
+* The PRA-mitigation can be activated/deactivated in tracing/modules/postHandler.js via praMitigation.setActive(false|true);
+* In order to introduce noise, this has to be commented in at tracing/modules/proberesponseMitigation.js (see noise_ref). Noise is read from a file called dshield_report.csv.
+The original DShield data has to be converted which can be done using the script at tracing/modules/dshield_to_tracing.py.
+
 
 ### Starting attack ###
 * The attack framework has to be configured for the target system
 * TraCINg
-    : Set correkt tracing_domain in TracingReportFetcher (or create dedicated report fetcher)
+    : Set correkt tracing_domain in TracingReportFetcher in the attack framework (or create dedicated report fetcher)
 * DShield
     : marker value bits=32, marker checksum bits=0 (when doing IP filtering)
     : use_source_ip_filter in report_fetcher.py
@@ -92,15 +96,16 @@ data insertion is commented out in postHandler.js (not needed)
 	    : cidr_bits_stage1 (main_attack.py)
 	    : cores (scanner_wrapper.py)
 * Get gateway MAC via: arping [ip_gateway]
-* Some example calls:
+* Start framework, example calls:
     : python main_attack.py --help
     : python main_attack.py -i eth10 -m [mac_gateway] -r 10000 -b 32 -c 0
+* A command line interface will appear which allows to control the framework. Type 'help' for further information on commands.
 
 ### Starting Simulation ###
 * General initiation
 * Adjust TraCINg domain in TracingReportFetcher to localhost
 * Starting TraCINg
-* cd attack_framework && python main_monitor_simulator.py -m 1000 [further arguments]
+* cd prepare && python main_monitor_simulator.py -m 1000 [further arguments]
 * Starting attack
 
 ## Extension ##

attack_framework/attack_logic.py → prepare/attack_logic.py

@@ -13,6 +13,7 @@ from multiprocessing import Process, SimpleQueue
 from group import Group
 import scanner_wrapper
 import group_handler
+import report_fetcher
 
 import ipv4
 from utility import ip_str_to_bytes
@@ -52,7 +53,7 @@ class ProbeResponseAttackLogic(object):
 	Implemenration of the probe response attack using dedicated scanner for probing.
 	Workflow:
 	>> Stage 1:
-	- Send probes without creating initial groups (saves state information) -> create Groups WHILE scanning
+	- Send probes without creating initial groups (saves state information) -> create Groups WHILE getting feedback
 	- Get result and add Groups to _iterations[index_iteration]
 	- Create groups: Check scanner feedback and re-group per sub-group based on it
 
@@ -64,7 +65,7 @@ class ProbeResponseAttackLogic(object):
 	source IP address, source port, destination port etc.
 
 	Pre-filtering of noisy values:
-	- Noisy marker values do not get pre-filtered as this problem can be effectively
+	- Noisy marker values don't need to get pre-filtered as this problem can be effectively
 	mitigated using a trade off between marker/checksum-bits.
 
 	Detection mitigation:
@@ -75,6 +76,8 @@ class ProbeResponseAttackLogic(object):
 	low number for a specific port "p", which is hard to detect as statistic anomaly.
 	"""
 
+	# Default parameters to be set. This is more efficient flexible
+	# than explicitly setting them in __init__() via self._xyz...
 	PROP_DEFAULTS = {
 		# network options
 		"interface_name": "eth0",
@@ -101,7 +104,6 @@ class ProbeResponseAttackLogic(object):
 		"_group_storeindex": 0,
 		"use_feedback_ips": False,
 		"use_plus1": False,
-		# TODO: change for testing
 		"is_simulation": False,
 		# debugging options
 		# avoid scanning the whole network -> limit to a subnet (default is: scan whole IPv4 - blacklist)
@@ -109,7 +111,6 @@ class ProbeResponseAttackLogic(object):
 		"_cidr_bits_stage1": 0
 	}
 
-
 	def __init__(self, **kwargs):
 		# set default values, will be overwritten by config variables
 		# parameter hierarchy: default -> constructor
@@ -138,6 +139,8 @@ class ProbeResponseAttackLogic(object):
 		self._filename_identified_monitors = os.path.join(self.base_dir_save, "identified_monitors.csv")
 		self._dirname_scanner_logs = self.base_dir_save
 
+		# set default report Fetcher if anything goes wrong
+		self._reportfetcher_class = report_fetcher.TracingReportFetcher
 		self.set_report_fetcher_class(self.report_fetcher_classname)
 		self._report_fetcher = None
 
@@ -157,7 +160,7 @@ class ProbeResponseAttackLogic(object):
 		self.marker_checksum_bytes_amount = math.ceil(self.markerbits_checksum / 8)
 
 		# Groups which got/get scanned.
-		# [[start, stop], {marke: Group}, total groups, total addresses]
+		# [[start, stop], {marker: Group}, total groups, total addresses]
 		self._iterations = []
 		self._iterations.append([[0, 0], {}, 0, 0])
 		initial_group = Group(ip_network_object=IPv4Network(nw_ip_str=self._ip_stage1,
@@ -191,6 +194,9 @@ class ProbeResponseAttackLogic(object):
 														self._create_marker_bitlevel)
 		self._initial_count = 0
 
+	iterations = property(lambda self: self._iterations)
+	grouphandler = property(lambda self: self._grouphandler)
+
 	def set_report_fetcher_class(self, classname):
 		if self._running:
 			return
@@ -301,7 +307,7 @@ class ProbeResponseAttackLogic(object):
 				# 1.2.3.4 -> 1.2 = marker value
 				top_group_markervalue = address_obj.ip_int >> bits_shift_ip
 
-				if not top_group_markervalue in groups_stage1:
+				if top_group_markervalue not in groups_stage1:
 					#logger.derbug("skipping IP not belonging in initial groups: %r" % address_obj)
 					continue
 			except Exception as ex:
@@ -470,7 +476,8 @@ class ProbeResponseAttackLogic(object):
 				fd_write.write(line)
 				#logger.debug(line.strip())
 		fd_write.close()
-		self._save_state()
+		# disable to save space
+		#self._save_state()
 
 	def _start_native_prober(self):
 		"""
@@ -495,7 +502,8 @@ class ProbeResponseAttackLogic(object):
 		logger.debug("waiting some seconds for processess to settle")
 		time.sleep(1)
 
-	def _probe_native_cycler(self, cnt, sockethndl, groupqueue, ip_blacklist, mac_src_s, mac_dst_s, ip_src_s, marker_encoding):
+	def _probe_native_cycler(self, cnt, sockethndl, groupqueue, ip_blacklist,
+							mac_src_s, mac_dst_s, ip_src_s, marker_encoding):
 		"""
 		A native prober cycler to be used with processes.
 		"""
@@ -559,7 +567,8 @@ class ProbeResponseAttackLogic(object):
 
 			# after initial full scan
 			if self._group_storeindex >= 2:
-				logger.info("initiating subgrouping using group handler, top groups=%d" % len(self._iterations[self._group_storeindex - 1][1]))
+				logger.info("initiating subgrouping using group handler, top groups=%d" %
+							len(self._iterations[self._group_storeindex - 1][1]))
 
 				if self.use_feedback_ips and self._group_storeindex == 2:
 					self._read_scanner_feedback_addresses()
@@ -655,7 +664,6 @@ class ProbeResponseAttackLogic(object):
 									(group.amount_addresses, group, group.marker_value_int))
 					#	time.sleep(2)
 					scan_timeout = -1
-					# TODO: just for testing: stop scanning after x seconds
 
 					"""
 					if self._group_storeindex == 1:
@@ -665,7 +673,7 @@ class ProbeResponseAttackLogic(object):
 					"""
 					# group.markervalue: this is None in the first stage -> encode target address
 					# checksum: ZMap module got his own implementation which is needed by stage 0
-					# (create checksum of IP addresses from whole IPv4 address range)
+					# (create checksum of IP addresses)
 					scanner = scanner_wrapper.ZmapWrapper(
 								filename_output_csv=filename_output_csv,
 								filename_blacklist_target_ip=blacklist,
@@ -709,13 +717,25 @@ class ProbeResponseAttackLogic(object):
 								int(self._iterations[self._group_storeindex][0][1] - self._iterations[self._group_storeindex][0][0]),
 								len(self._iterations[self._group_storeindex][1])))
 
+			# root -> 1st stage -> 2nd stage
 			if self._group_storeindex >= 2:
 				if self.use_plus1:
 					group_handler_obj.update_plus1_subgroups(self._iterations[self._group_storeindex - 1][1])
+
+			# update amount of groups
+			logger.debug("updating amount of groups")
 			self._iterations[self._group_storeindex][2] = len(self._iterations[self._group_storeindex][1])
+			# update total addresses
+			logger.debug("updating total addresses")
 			self._iterations[self._group_storeindex][3] = sum([group.amount_addresses
-													for _,group in self._iterations[self._group_storeindex][1].items()])
+													for _, group in self._iterations[self._group_storeindex][1].items()])
 			group_handler_obj.remove_empty_groups(self._iterations[self._group_storeindex][1])
+
+			# now everything should be uptodate, cleanup groups of last round
+			if self._group_storeindex >= 2:
+				# TODO: activate if needed
+				group_handler_obj.cleanup_groups(self._iterations[self._group_storeindex - 1][1])
+
 		self.stop()
 
 	def get_amount_of_probes(self):

attack_framework/group.py → prepare/group.py

@@ -44,11 +44,6 @@ class Group(object):
 		# to scan this addresses again (already placed in separate group)
 		self.top_group = None
 		self.subgroups = set()
-		# indicates that this subgroup has response count unequal
-		# to the sum of responses of all its subgroups
-		# positive value: top group has more responses than sum of all subgroups, negative value: less ...)
-		# TODO: activate if needed (deactivated to save memory)
-		#self.response_discrepancy = 0
 
 	def _get_grouptype(self):
 		return Group.GROUP_TYPE_CIDR if self.ip_network is not None else Group.GROUP_TYPE_SINGLE_ADDRESSES

attack_framework/group_handler.py → prepare/group_handler.py

@@ -350,13 +350,12 @@ class GroupHandler(object):
 			if response_sum_subgroups > top_group.response_count:
 				logger.warning("new response sum of subgroups greater than response count of top group"
 								"-> assuming noise in new responses OR packet drops in old, setting '+1'-group to 0")
-				# TODO: activate if needed (deactivated to save memory)
-				#top_group.response_discrepancy = top_group.response_count - response_sum_subgroups
 				top_group.plus1_subgroup.response_count = 0
 			else:
 				top_group.plus1_subgroup.response_count = top_group.response_count - response_sum_subgroups
 				#if top_group.plus1_subgroup.response_count != 0:
-				#	logger.debug("found a subgroup having response: %r=%d" % (top_group.plus1_subgroup, top_group.plus1_subgroup.response_count))
+				#	logger.debug("found a subgroup having response: %r=%d" %
+				#  (top_group.plus1_subgroup, top_group.plus1_subgroup.response_count))
 
 	@staticmethod
 	def remove_empty_groups(subgroups):
@@ -365,9 +364,26 @@ class GroupHandler(object):
 		This has to be called AFTER update +1 groups or non empty +1 groups could
 		be removed by mistake otherwise.
 		"""
+		logger.debug("removing empty groups")
 		# we can't change a dict while traversing! store keys to be deleted
 		keys_to_remove = [markervalue for markervalue, subgroup in subgroups.items()
 						if subgroup.response_count == 0]
 		for key in keys_to_remove:
 			del subgroups[key]
-		logger.debug("removed empty groups=%d, remaining groups=%d" % (len(keys_to_remove), len(subgroups)))
+		logger.debug("removed empty groups=%d, remaining groups=%d" % (len(keys_to_remove), len(subgroups)))
+
+	@staticmethod
+	def cleanup_groups(topgroups):
+		"""
+		Cleanup unneeded groups.
+		groups -- dict of groups to be cleaned
+		"""
+		logger.debug("cleaning up %d groups" % len(topgroups))
+
+		for markervalue, topgroup_ref in topgroups.items():
+			for subgroup in topgroup_ref.subgroups:
+				subgroup.top_group = None
+
+			topgroup_ref.plus1_subgroup = None
+			topgroup_ref.subgroups.clear()
+		topgroups.clear()

attack_framework/main_attack.py → prepare/main_attack.py

@@ -13,21 +13,25 @@ import time
 from report_fetcher import ReportFetcher
 from attack_logic import ProbeResponseAttackLogic
 
+is_simulation = True
+
 # Logging config
 logging.basicConfig(format="%(levelname)s (%(funcName)s): %(message)s")
 logger = logging.getLogger("pra_framework")
 logger.setLevel(logging.DEBUG)
 
 # TODO: change for testing
-dirname_save = time.strftime("attack_%Y_%m_%d__%H_%M_%S") + "/"
-#dirname_save = "output_dir_testing" + "/"
+if not is_simulation:
+	dirname_save = time.strftime("attack_%Y_%m_%d__%H_%M_%S") + "/"
+else:
+	dirname_save = "output_dir_testing" + "/"
 
 if not os.path.exists(dirname_save):
 	logging.debug("creating new directory to save results: %s" % dirname_save)
 	try:
 		os.mkdir(dirname_save)
-	except Exception as ex:
-		print(ex)
+	except Exception as ex_createdir:
+		print(ex_createdir)
 # Log to file, logging to console is already enabled
 fileHandler = logging.FileHandler(dirname_save + "/framework.log")
 logFormatter = logging.Formatter("%(asctime)s %(levelname)s (%(funcName)s): %(message)s",
@@ -40,39 +44,48 @@ class AttackUI(cmd.Cmd):
 	"""
 	Command line UI to control the attack framework.
 	"""
-	intro = "\n################################################\n#Welcome to the Probe Response attack framework#\n" \
-			"################################################\nType 'help' for available commands. Use tab for auto-completion."
+	intro = """\n
+____  ____  _____ ____    _    ____  _____
+|  _ \|  _ \| ____|  _ \ / \  |  _ \| ____|
+| |_) | |_) |  _| | |_) / _ \ | |_) |  _|
+|  __/|  _ <| |___|  __/ ___ \|  _ <| |___
+|_|   |_| \_\_____|_| /_/   \_\_| \_\_____|
+\n
+###########################################################
+# Welcome to PREPARE, the Probe Response attack framework #
+###########################################################
+Type 'help' for available commands. Use tab for auto-completion.
+"""
 	promt = ">"
 	file = None
 
-	def __init__(self, args):
+	def __init__(self, parameters):
 		super().__init__()
 		try:
-			mac_iface = netifaces.ifaddresses(args.interface)[17][0]["addr"]
-			ip_for_iface = netifaces.ifaddresses(args.interface)[2][0]["addr"]
+			mac_iface = netifaces.ifaddresses(parameters.interface)[17][0]["addr"]
+			ip_for_iface = netifaces.ifaddresses(parameters.interface)[2][0]["addr"]
 
-			self.attacklogic = ProbeResponseAttackLogic(interface_name=args.interface,
+			self.attacklogic = ProbeResponseAttackLogic(interface_name=parameters.interface,
 													ip_src=ip_for_iface,
 													mac_source=mac_iface,
-													mac_gw=args.macgw,
-													rate_kbit_per_s=args.rate,
-													marker_encoding=args.encoding,
-													markerbits_value=args.markervaluebits,
-													markerbits_checksum=args.checksumbits,
-													rate=args.rate,
+													mac_gw=parameters.macgw,
+													rate_kbit_per_s=parameters.rate,
+													marker_encoding=parameters.encoding,
+													markerbits_value=parameters.markervaluebits,
+													markerbits_checksum=parameters.checksumbits,
+													rate=parameters.rate,
 													base_dir_save=dirname_save,
 													base_dir_zmap="../zmap",
-													report_fetcher_classname=args.reportfetcherclass,
-													use_feedback_ips=args.usefeedbackips,
-													use_plus1=args.useplus1,
-													is_simulation=True,
+													report_fetcher_classname=parameters.reportfetcherclass,
+													use_feedback_ips=parameters.usefeedbackips,
+													use_plus1=parameters.useplus1,
+													is_simulation=is_simulation,
 													_ip_stage1="0.0.0.0",
-													_cidr_bits_stage1=0
-													)
+													_cidr_bits_stage1=0)
 		except Exception as ex:
-			print(ex)
+			raise FileExistsError("could not initialize logic: %r" % ex)
 
-	def do_start(self, arg):
+	def do_start(self, _):
 		"""
 		Start the probe response attack
 		"""
@@ -82,44 +95,44 @@ class AttackUI(cmd.Cmd):
 		except Exception as ex:
 			print(ex)
 
-	def do_stop(self, arg):
+	def do_stop(self, _):
 		"""
 		Stop the probe response attack
 		"""
 		logging.info("stopping attack")
 		self.attacklogic.stop()
 
-	def do_setreportfetcher(self, arg):
+	def do_setreportfetcher(self, _):
 		"""
 		Set a new reportfetcher to fetch report events of the attacked CIDS.
 		"""
-		fetcher_module = __import__("report_fetcher")
-
-		def check(clz):
-			return inspect.isclass(clz) and issubclass(clz, ReportFetcher) and clz != ReportFetcher
+		def check(clz_search):
+			return inspect.isclass(clz_search) and issubclass(clz_search, ReportFetcher) and clz_search != ReportFetcher
 
 		classes = inspect.getmembers(sys.modules["report_fetcher"], check)
 		print("available classes (chose 0-%d):" % (len(classes) - 1))
 
 		for cnt, clz in enumerate(classes):
 			print("%d: %s" % (cnt, clz[1].__name__))
+
 		try:
 			index = int(input("\nNew report fetcher class: "))
 			self.attacklogic.set_report_fetcher_class(classes[index][0])
 		except:
-			print("did not understand, won't chang anything")
+			print("did not understand, won't change anything")
 
-	def do_setrate(self, arg):
+	def do_setrate(self, rate):
 		"""
 		Change the probe rate of the scanner (Kbit/s)
 		"""
 		try:
-			rate = int(input("\nNew attack rate (current: %d):" % self.attacklogic.rate_kbit_per_s))
+			rate = int(rate)
+			logger.info("New attack rate: %d Kbit/s" % rate)
 			self.attacklogic.rate_kbit_per_s = rate
 		except:
-			print("did not understand, won't chang anything")
+			print("did not understand, won't change anything")
 
-	def do_setverbosity(self, arg):
+	def do_setverbosity(self, _):
 		"""
 		Change the frameworks log verbosity (0=WARNING, 1=INFO, 2=DEBUG)
 		"""
@@ -130,7 +143,7 @@ class AttackUI(cmd.Cmd):
 		except:
 			print("did not understand, won't change anything")
 
-	def do_stats(self, arg):
+	def do_stats(self, _):
 		"""
 		Show basic statistics about the attack.
 		"""
@@ -140,7 +153,7 @@ class AttackUI(cmd.Cmd):
 		identified_group_index = 0
 
 		try:
-			for groupstore in self.attacklogic._iterations:
+			for groupstore in self.attacklogic.iterations:
 				start = groupstore[0][0]
 				end = groupstore[0][1]
 				diff = 0 if end == 0 else (end - start)
@@ -153,9 +166,9 @@ class AttackUI(cmd.Cmd):
 				if identified_group_index > 0:
 					try:
 						# group store 2 (iteration) = group handler iteration 1
-						identified_groups = sum([1 for gti in self.attacklogic._grouphandler.identified_groups
+						identified_groups = sum([1 for gti in self.attacklogic.grouphandler.identified_groups
 											if gti[2] == identified_group_index])
-						identified_addr = sum([gti[0].amount_addresses for gti in self.attacklogic._grouphandler.identified_groups
+						identified_addr = sum([gti[0].amount_addresses for gti in self.attacklogic.grouphandler.identified_groups
 											if gti[2] == identified_group_index])
 					except:
 						pass
@@ -165,13 +178,14 @@ class AttackUI(cmd.Cmd):
 
 			logger.info("seconds total: %d" % seconds_total)
 			logger.info("probes total: [first iteration] + %d" % self.attacklogic.get_amount_of_probes())
-			logger.info("identified groups: %d" % len(self.attacklogic._grouphandler.identified_groups))
-			logger.info("identified addresses: %d" % sum([gti[0].amount_addresses for gti in self.attacklogic._grouphandler.identified_groups]))
+			logger.info("identified groups: %d" % len(self.attacklogic.grouphandler.identified_groups))
+			logger.info("identified addresses: %d" %
+						sum([gti[0].amount_addresses for gti in self.attacklogic.grouphandler.identified_groups]))
 		except Exception as ex:
 			logger.warning("try again on less activity")
 			logger.warning(ex)
 
-	def do_quit(self, arg):
+	def do_quit(self, _):
 		"""
 		Shutdown the attack framework.
 		"""

attack_framework/main_monitor_simulator.py → prepare/main_monitor_simulator.py

@@ -74,20 +74,17 @@ class MonitorSimulator(object):
 				url_tracing="https://localhost:443",
 				interface_name="lo",
 				buffer_size=500000,
-				cluster_monitors=False,
 				# probability that a monitor returns a relevant scanner feedback (RST, SYN/ACK)
 				prop_mon_scannerfeedback=0.8,
 				prop_nwdrop=0.0,
 				file_blacklist=None):
-		logger.debug("monitors=%d, non monitors=%d, scanner feedback=%f, nw drop=%f, cluster=%d" % (amount_monitors,
+		logger.debug("monitors=%d, non monitors=%d, scanner feedback=%f, nw drop=%f" % (amount_monitors,
 																						amount_non_monitors,
 																						prop_mon_scannerfeedback,
-																						prop_nwdrop,
-																						cluster_monitors))
+																						prop_nwdrop))
 		self._amount_monitors = amount_monitors
 		self._amount_non_monitors = amount_non_monitors
 		self._prop_mon_scannerfeedback = prop_mon_scannerfeedback
-		self._cluster_monitors = cluster_monitors
 		self._prop_nwdrop = prop_nwdrop
 		self._blacklist_nw_objs = []
 		self._blacklist_int_sub8 = set()
@@ -205,16 +202,11 @@ class MonitorSimulator(object):
 		if len(monitor_ips) > 0:
 			logger.debug("listening IP addresses were given explicitly, adding %d" % len(monitor_ips))
 
-			for ip in monitor_ips:
-				self._listening_ips[IPv4Address(ip_str=ip).packed] = [RESPONSETYPE_TCP_RST, True]
+			for ip_mon in monitor_ips:
+				self._listening_ips[IPv4Address(ip_str=ip_mon).packed] = [RESPONSETYPE_TCP_RST, True]
 
-		if not self._cluster_monitors:
-			#logger.info("creating %d random IPs" % self._amount_monitors)
-			self._create_random_ips(self._amount_monitors, is_monitor_ip=True)
-		else:
-			#logger.info("creating %d random clustered IPs" % self._amount_monitors)
-			#self._create_clustered_monitors(self._amount_monitors)
-			self._create_clustered_monitors_distr(self._amount_monitors)
+		#logger.info("creating %d random IPs" % self._amount_monitors)
+		self._create_random_ips(self._amount_monitors, is_monitor_ip=True)
 
 		logger.debug("total amount of monitors=%d" % len(self._listening_ips))
 
@@ -332,7 +324,6 @@ class MonitorSimulator(object):
 		"""
 		logger.debug("creating %d random IP addresses, monitor=%r" % (target_amount, is_monitor_ip))
 		randrange = self._rand.randrange
-		rand_0_1 = self._rand.random
 		#feedback_prop = self._prop_mon_scannerfeedback if is_monitor_ip else 1.0
 		cnt = 0
 
@@ -388,8 +379,8 @@ class MonitorSimulator(object):
 		while len(self._listening_ips) < target_amount and current_ip < ip_max:
 			sequential_add = int(pareto(pareto_shape) + 1)
 			logger.debug(sequential_add)
-			for ip in range(current_ip, current_ip + sequential_add):
-				ip_bytes = packipv4(ip)
+			for ip_int in range(current_ip, current_ip + sequential_add):
+				ip_bytes = packipv4(ip_int)
 				self._listening_ips[ip_bytes] = [None, True]
 			current_ip += sequential_add + int(exponential(scale=exponential_scale))
 
@@ -515,7 +506,7 @@ class MonitorSimulator(object):
 					#socket_write.send(packet.bin())
 					socket_write.send(packet.bin(update_auto_fields=False))
 				elif responsetype == RESPONSETYPE_ICMP:
-					# TODO: ICMP indicates unreachable hosts, ignore
+					# ICMP indicates unreachable hosts, ignore
 					pass
 				else:
 					logger.warning("unknown response type for %s: %r" % (packet.ip.dst_s, responsetype))
@@ -528,11 +519,11 @@ if __name__ == "__main__":
 	parser.add_argument("-i", "--interface", help="Interface to listen on", default="eth10")
 	parser.add_argument("-m", "--monitors", help="Amount of monitors to be simulated", type=int, default=1000)
 	parser.add_argument("-r", "--cidrbits", help="CIDR bits of simulated network", type=int, default=0)
-	parser.add_argument("-c", "--cluster", help="Create clustered monitors", type=bool, default=False)
 	parser.add_argument("-f", "--monitorfeedback", help="Probability for monitor feedback", type=float, default=0.9)
 	parser.add_argument("-n", "--nonmonitors", help="Amount of non-monitors to be simulated", type=int, default=0)
 	parser.add_argument("-d", "--nwdrop", help="Probability for network drops", type=float, default=0)
-	parser.add_argument("-b", "--buffersize", help="Buffer to be used for storing received packets", type=int, default=1000000)
+	parser.add_argument("-b", "--buffersize", help="Buffer to be used for storing received packets", type=int,
+						default=1000000)
 	parser.add_argument("-s", "--seed", help="Seed to be used to distribute nodes", type=int, default=123456789)
 	parser.add_argument("-u", "--url", help="HTTPS URL of TraCINg to send events to", default="https://localhost:443")
 	args = parser.parse_args()
@@ -549,7 +540,6 @@ if __name__ == "__main__":
 			interface_name=args.interface,
 			buffer_size=args.buffersize,
 			url_tracing=args.url,
-			cluster_monitors=args.cluster,
 			prop_mon_scannerfeedback=args.monitorfeedback,
 			prop_nwdrop=args.nwdrop)
 
@@ -559,7 +549,8 @@ if __name__ == "__main__":
 	user_input = None
 
 	while user_input != "quit":
-		user_input = input("enter 'quit' to quit, 'check' to compare monitors to those in %s\n" % monitorsimulator._file_identified_monitors)
+		user_input = input("enter 'quit' to quit, 'check' to compare monitors to those in %s\n" %
+							monitorsimulator._file_identified_monitors)
 		if user_input == "check":
 			monitorsimulator.check_matches()
 		else: