Merge pull request #14 from flashnuke/fix/iface_name

Fix/iface name

Author: flashnuke

deadnet.py

@@ -22,7 +22,7 @@
 
 
 class DeadNet:
-    def __init__(self, iface, cidrlen, s_time, gateway, disable_ipv6, ipv6_preflen):
+    def __init__(self, iface, cidrlen, s_time, gateway_ipv4, gateway_mac, disable_ipv6, ipv6_preflen):
         self.network_interface = iface
         self.arp_poison_interval = s_time
         self.ipv6_preflen = ipv6_preflen or IPV6_PREFLEN
@@ -37,13 +37,15 @@ def __init__(self, iface, cidrlen, s_time, gateway, disable_ipv6, ipv6_preflen):
         self.subnet_ipv4 = self.user_ipv4.split(".")[:3]
         self.subnet_ipv4_sr = f"{'.'.join(self.subnet_ipv4)}.0/{self.cidrlen_ipv4}"
 
-        self.gateway_ipv4 = gateway or self.get_gateway_ipv4(self.network_interface)
+        self.gateway_ipv4 = gateway_ipv4 or self.get_gateway_ipv4(self.network_interface)
         if not self.gateway_ipv4:
             raise Exception(f"{RED}[!]{WHITE} Unable to automatically set IPv4 gateway address, try setting manually"
                             f" by passing (-g, --set-gateway)...")
-        self.gateway_mac = self.get_gateway_mac()
+        self.gateway_mac = gateway_mac or self.get_gateway_mac()
         if not self.gateway_mac:
-            raise Exception(f"{RED}[-]{WHITE} Unable to get gateway mac -> {self.gateway_ipv4}")
+            raise Exception(f"{RED}[-]{WHITE} Unable to retrieve gateway ({self.gateway_ipv4}) mac address")
+        elif not is_valid_mac(self.gateway_mac):
+            raise Exception(f"{RED}[-]{WHITE} Invalid gateway mac address -> {self.gateway_mac}")
         self.gateway_ipv6 = mac2ipv6_ll(self.gateway_mac, IPV6_LL_PREF)
 
         self.print_settings()
@@ -72,7 +74,7 @@ def get_gateway_mac(self):
                 for line in output.split('\n'):
                     columns = line.split()
                     if len(columns) >= 4:
-                        if columns[3] == 'lladdr' and columns[4] != '<incomplete>' and columns[2] == iface:
+                        if columns[3] == 'lladdr' and columns[4] != '<incomplete>' and columns[2] == self.network_interface:
                             gateway_hwaddr = columns[4]
                             break
             except Exception as exc:
@@ -88,6 +90,7 @@ def user_abort(self):
     def print_settings(self):
         printf("- net iface" + self.network_interface.rjust(38))
         printf("- sleep time" + str(self.arp_poison_interval).rjust(32) + "[sec]")
+        printf("- MAC gateway" + self.gateway_mac.rjust(36))
         printf("- IPv4 subnet" + self.subnet_ipv4_sr.rjust(36))
         printf("- IPv4 gateway" + self.gateway_ipv4.rjust(35))
         printf("- IPv6 gateway" + self.gateway_ipv6.rjust(35))
@@ -197,6 +200,6 @@ def get_gateway_ipv4(iface):
     arguments = define_args()
     invalidate_print()  # after arg parsing
 
-    attacker = DeadNet(arguments.iface, arguments.cidrlen, arguments.s_time, arguments.gateway,
-                       arguments.disable_ipv6, arguments.preflen)
+    attacker = DeadNet(arguments.iface, arguments.cidrlen, arguments.s_time, arguments.gateway_ipv4,
+                       arguments.gateway_mac, arguments.disable_ipv6, arguments.preflen)
     attacker.start_attack()

utils/argparser.py

@@ -21,15 +21,19 @@ def define_args():
                         help=f"set the sleep time between each arp poison attempt (default -> {_DEF_SLEEPTIME}[sec])",
                         required=False)
 
-    parser.add_argument("-g", "--set-gateway", dest='gateway', type=str, metavar=(""), default=None,
-                        help="set the gateway ip manually (defaults to x.x.x.1)",
+    parser.add_argument("-g", "--gateway-ipv4", dest='gateway_ipv4', type=str, metavar=(""), default=None,
+                        help="set the gateway ipv4 manually (defaults to x.x.x.1)",
+                        required=False)
+
+    parser.add_argument("-M", "--gateway-mac", dest='gateway_mac', type=str, metavar=(""), default=None,
+                        help="set the gateway mac address (use if unable to fetch automatically)",
                         required=False)
 
     parser.add_argument("-6", "--disable-ipv6", dest='disable_ipv6', action="store_true",
                         default=False, help="disable IPv6 dead router attack"
                                            " (enabled by default)", required=False)
 
-    parser.add_argument("-pl", "--set-preflen", dest='preflen', type=int, metavar=(""), default=_DEF_PREFLEN,
+    parser.add_argument("-p", "--set-preflen", dest='preflen', type=int, metavar=(""), default=_DEF_PREFLEN,
                         help=f"set the prefix length of the IPv6 subnet (default -> {_DEF_PREFLEN})",
                         required=False)
 

utils/methods.py

@@ -1,7 +1,12 @@
+import re
 import sys
 import time
 
 
+def is_valid_mac(mac):
+    return re.match(r'^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$', mac)
+
+
 def get_ts_ms():
     return int(time.time() * 1_000)