dissect.target 3.9.dev5__tar.gz → 3.9.dev6__tar.gz

{dissect.target-3.9.dev5/dissect.target.egg-info → dissect.target-3.9.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.9.dev5
+Version: 3.9.dev6
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect.target-3.9.dev5 → dissect.target-3.9.dev6}/dissect/target/helpers/network_managers.py

@@ -516,25 +516,25 @@ def parse_unix_dhcp_log_messages(target) -> list[str]:
             line = record.message
 
             # Ubuntu DHCP
-            if "DHCPv4" in line or "DHCPv6" in line:
+            if ("DHCPv4" in line or "DHCPv6" in line) and " address " in line and " via " in line:
                 ip = line.split(" address ")[1].split(" via ")[0].strip().split("/")[0]
                 if ip not in ips:
                     ips.append(ip)
 
             # Ubuntu DHCP NetworkManager
-            if "option ip_address" in line and ("dhcp4" in line or "dhcp6" in line):
+            elif "option ip_address" in line and ("dhcp4" in line or "dhcp6" in line) and "=> '" in line:
                 ip = line.split("=> '")[1].replace("'", "").strip()
                 if ip not in ips:
                     ips.append(ip)
 
             # Debian and CentOS dhclient
-            if record.daemon == "dhclient" and "bound to" in line:
+            elif record.daemon == "dhclient" and "bound to" in line:
                 ip = line.split("bound to")[1].split(" ")[1].strip()
                 if ip not in ips:
                     ips.append(ip)
 
             # CentOS DHCP and general NetworkManager
-            if " address " in line and ("dhcp4" in line or "dhcp6" in line):
+            elif " address " in line and ("dhcp4" in line or "dhcp6" in line):
                 ip = line.split(" address ")[1].strip()
                 if ip not in ips:
                     ips.append(ip)

{dissect.target-3.9.dev5 → dissect.target-3.9.dev6/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.9.dev5
+Version: 3.9.dev6
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect.target-3.9.dev5 → dissect.target-3.9.dev6}/tests/test_plugins_os_unix_ips.py

@@ -15,6 +15,8 @@ def test_ips_dhcp_plugin(target_unix_users, fs_unix):
     Feb  2 13:37:02 test systemd-networkd[2]: eth0: DHCPv4 address 10.13.37.2/24 via 10.13.37.0
     Mar  3 13:37:03 localhost NetworkManager[3]: <info>  [1600000000.0003] dhcp4 (eth0):   address 10.13.37.3
     Apr  4 13:37:04 localhost dhclient[4]: bound to 10.13.37.4 -- renewal in 1337 seconds.
+    May  5 13:37:05 test systemd-networkd[5]: eth0: DHCPv6 lease lost
+    Jun  6 13:37:06 test systemd-networkd[5]: eth0: DHCPv6 address 2001:db8::/64 via 2001:db8:ffff:ffff:ffff:ffff:ffff:ffff
     """  # noqa E501
 
     fs_unix.map_file_fh(
@@ -25,7 +27,7 @@ def test_ips_dhcp_plugin(target_unix_users, fs_unix):
     target_unix_users.add_plugin(LinuxPlugin)
     results = target_unix_users.ips
     results.reverse()
-    assert results == ["10.13.37.1", "10.13.37.2", "10.13.37.3", "10.13.37.4"]
+    assert results == ["10.13.37.1", "10.13.37.2", "10.13.37.3", "10.13.37.4", "2001:db8::"]
 
 
 def test_ips_cloud_init_plugin(target_unix_users, fs_unix):