|
|
@@ -9,7 +9,7 @@ from definitions import ROOT_DIR
|
|
|
from Attack import BaseAttack
|
|
|
from Attack.AttackParameters import Parameter as Param
|
|
|
from Attack.AttackParameters import ParameterTypes
|
|
|
-from ID2TLib.Utility import update_timestamp, get_interval_pps
|
|
|
+from ID2TLib.Utility import update_timestamp, get_interval_pps, handle_most_used_outputs
|
|
|
|
|
|
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
|
|
|
# noinspection PyPep8
|
|
|
@@ -58,8 +58,6 @@ class JoomlaRegPrivExploit(BaseAttack.BaseAttack):
|
|
|
# (values are overwritten if user specifies them)
|
|
|
# Attacker configuration
|
|
|
most_used_ip_address = self.statistics.get_most_used_ip_address()
|
|
|
- if isinstance(most_used_ip_address, list):
|
|
|
- most_used_ip_address = most_used_ip_address[0]
|
|
|
self.add_param_value(Param.IP_SOURCE, most_used_ip_address)
|
|
|
self.add_param_value(Param.MAC_SOURCE, self.statistics.get_mac_address(most_used_ip_address))
|
|
|
|
|
|
@@ -113,14 +111,14 @@ class JoomlaRegPrivExploit(BaseAttack.BaseAttack):
|
|
|
source_ttl_prob_dict = Lea.fromValFreqsDict(source_ttl_dist)
|
|
|
source_ttl_value = source_ttl_prob_dict.random()
|
|
|
else:
|
|
|
- source_ttl_value = self.statistics.process_db_query("most_used(ttlValue)")
|
|
|
+ source_ttl_value = handle_most_used_outputs(self.statistics.process_db_query("most_used(ttlValue)"))
|
|
|
|
|
|
destination_ttl_dist = self.statistics.get_ttl_distribution(ip_destination)
|
|
|
if len(destination_ttl_dist) > 0:
|
|
|
destination_ttl_prob_dict = Lea.fromValFreqsDict(destination_ttl_dist)
|
|
|
destination_ttl_value = destination_ttl_prob_dict.random()
|
|
|
else:
|
|
|
- destination_ttl_value = self.statistics.process_db_query("most_used(ttlValue)")
|
|
|
+ destination_ttl_value = handle_most_used_outputs(self.statistics.process_db_query("most_used(ttlValue)"))
|
|
|
|
|
|
# Inject Joomla_registration_privesc
|
|
|
# Read joomla_registration_privesc pcap file
|
