Passive/p0f: tiny fixes for ivre p0f2db

ivre/parser/p0f.py

@@ -28,6 +28,7 @@
 
 
 CONTAINER_TYPE = re.compile(b"^(table|set|vector)\\[([a-z]+)\\]$")
+LINE_RE = re.compile(r"^\[(?P<time>[^\]]+)\] (?P<data>.*)$")
 
 
 class P0fFile(Parser):
@@ -50,18 +51,14 @@ def __next__(self) -> Dict[str, Any]:
         return self.parse_line(next(self.fdesc).strip())
 
     def parse_line(self, line: bytes) -> Dict[str, Any]:
-        line_s = line.decode()
-        LINE_RE = re.compile(r"^\[(?P<time>[^\]]+)\] (?P<data>.*)$")
-        m = LINE_RE.match(line_s)
+        m = LINE_RE.match(line.decode())
         if not m:
             return {}
         res: Dict[str, Any] = {}
         # time of event
-        time = m.group("time")
-        res["ts"] = datetime.datetime.strptime("%s" % time, "%Y/%m/%d %H:%M:%S")
+        res["ts"] = datetime.datetime.strptime(m.group("time"), "%Y/%m/%d %H:%M:%S")
         # data of event
-        data = m.group("data")
-        for entry in data.split("|"):
+        for entry in m.group("data").split("|"):
             k, v = entry.split("=", 1)
             if k in res:
                 LOGGER.warning("Duplicate key in line [%r]", line)

ivre/tools/__init__.py

@@ -38,6 +38,7 @@
     "iphost",
     "localscan",
     "macinfo",
+    "p0f2db",
     "passiverecon2db",
     "passivereconworker",
     "plotdb",