Merge pull request #1755 from gpotter2/manuffix

DADict: improvement + fix Manuf format

Author: p-l-

scapy/dadict.py

@@ -21,7 +21,13 @@
 def fixname(x):
     if x and str(x[0]) in "0123456789":
         x = "n_" + x
-    return x.translate("________________________________________________0123456789_______ABCDEFGHIJKLMNOPQRSTUVWXYZ______abcdefghijklmnopqrstuvwxyz_____________________________________________________________________________________________________________________________________")  # noqa: E501
+    return x.translate(
+        "________________________________________________"
+        "0123456789_______ABCDEFGHIJKLMNOPQRSTUVWXYZ______"
+        "abcdefghijklmnopqrstuvwxyz____________________________"
+        "______________________________________________________"
+        "___________________________________________________"
+    )
 
 
 class DADict_Exception(Scapy_Exception):
@@ -55,7 +61,7 @@ def _show(self):
                 print("%10s = %r" % (k, getattr(self, k)))
 
     def __repr__(self):
-        return "<%s/ %s>" % (self._name, " ".join(x for x in self.__dict__ if x and x[0] != "_"))  # noqa: E501
+        return "<%s - %s elements>" % (self._name, len(self.__dict__))
 
     def _branch(self, br, uniq=0):
         if uniq and br._name in self:

scapy/data.py

@@ -17,6 +17,7 @@
 from scapy.consts import FREEBSD, NETBSD, OPENBSD, WINDOWS
 from scapy.error import log_loading
 from scapy.compat import plain_str
+import scapy.modules.six as six
 
 
 ############
@@ -194,6 +195,9 @@ class ManufDA(DADict):
     def fixname(self, val):
         return plain_str(val)
 
+    def __dir__(self):
+        return ["lookup", "reverse_lookup"]
+
     def _get_manuf_couple(self, mac):
         oui = ":".join(mac.split(":")[:3]).upper()
         return self.__dict__.get(oui, (mac, mac))
@@ -210,24 +214,42 @@ def _resolve_MAC(self, mac):
             return ":".join([self[oui][0]] + mac.split(":")[3:])
         return mac
 
-    def __repr__(self):
-        return "\n".join("<%s %s, %s>" % (i[0], i[1][0], i[1][1]) for i in self.__dict__.items())  # noqa: E501
+    def lookup(self, mac):
+        """Find OUI name matching to a MAC"""
+        oui = ":".join(mac.split(":")[:3]).upper()
+        return self[oui]
+
+    def reverse_lookup(self, name, case_sensitive=False):
+        """Find all MACs registered to a OUI
+        params:
+         - name: the OUI name
+         - case_sensitive: default to False
+        returns: a dict of mac:tuples (Name, Extended Name)
+        """
+        if case_sensitive:
+            filtr = lambda x, l: any(x == z for z in l)
+        else:
+            name = name.lower()
+            filtr = lambda x, l: any(x == z.lower() for z in l)
+        return {k: v for k, v in six.iteritems(self.__dict__)
+                if filtr(name, v)}
 
 
 def load_manuf(filename):
+    """Load manuf file from Wireshark.
+    param:
+     - filename: the file to load the manuf file from"""
     manufdb = ManufDA(_name=filename)
     with open(filename, "rb") as fdesc:
         for line in fdesc:
             try:
                 line = line.strip()
                 if not line or line.startswith(b"#"):
                     continue
-                oui, shrt = line.split()[:2]
-                i = line.find(b"#")
-                if i < 0:
-                    lng = shrt
-                else:
-                    lng = line[i + 2:]
+                parts = line.split(None, 2)
+                oui, shrt = parts[:2]
+                lng = parts[2].lstrip(b"#").strip() if len(parts) > 2 else ""
+                lng = lng or shrt
                 manufdb[oui] = plain_str(shrt), plain_str(lng)
             except Exception:
                 log_loading.warning("Couldn't parse one line from [%s] [%r]",

test/regression.uts

@@ -517,6 +517,52 @@ assert(conf.manufdb._resolve_MAC("00:00:0F:01:02:03") == "Next:01:02:03")
 assert(conf.manufdb._get_short_manuf("00:00:0F:01:02:03") == "Next")
 assert(in6_addrtovendor("fe80::0200:0fff:fe01:0203").lower().startswith("next"))
 
+assert conf.manufdb.lookup("00:00:0F:01:02:03") == ('Next', 'Next, Inc.')
+assert "00:00:0F" in conf.manufdb.reverse_lookup("Next")
+
+= Test multiple wireshark's manuf formats
+~ manufdb
+
+new_format = """
+# comment
+00:00:00    JokyIsland    Joky Insland Corp SA
+00:01:12    SecdevCorp    Secdev Corporation SA LLC
+EE:05:01    Scapy         Scapy CO LTD & CIE
+FF:00:11    NoName
+"""
+old_format = """
+# comment
+00:00:00    JokyIsland  #  Joky Insland Corp SA
+00:01:12    SecdevCorp  #  Secdev Corporation SA LLC
+EE:05:01    Scapy       #  Scapy CO LTD & CIE
+FF:00:11    NoName
+"""
+
+manuf1 = get_temp_file()
+manuf2 = get_temp_file()
+
+with open(manuf1, "w") as w:
+    w.write(old_format)
+
+with open(manuf2, "w") as w:
+    w.write(new_format)
+
+a = load_manuf(manuf1)
+b = load_manuf(manuf2)
+
+a.lookup("00:00:00") == ('JokyIsland', 'Joky Insland Corp SA'),
+a.lookup("FF:00:11:00:00:00") == ('NoName', 'NoName')
+a.reverse_lookup("Scapy") == {'EE:05:01': ('Scapy', 'Scapy CO LTD & CIE')}
+a.reverse_lookup("Secdevcorp") == {'00:01:12': ('SecdevCorp', 'Secdev Corporation SA LLC')}
+
+
+b.lookup("00:00:00") == ('JokyIsland', 'Joky Insland Corp SA'),
+b.lookup("FF:00:11:00:00:00") == ('NoName', 'NoName')
+b.reverse_lookup("Scapy") == {'EE:05:01': ('Scapy', 'Scapy CO LTD & CIE')}
+b.reverse_lookup("Secdevcorp") == {'00:01:12': ('SecdevCorp', 'Secdev Corporation SA LLC')}
+
+scapy_delete_temp_files()
+
 = Test utility functions - network related
 ~ netaccess