dissect.target 3.9.dev5__py3-none-any.whl → 3.9.dev6__py3-none-any.whl

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.dist-info → dissect.target-3.9.dev6.dist-info}/METADATA

@@ -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.dist-info → dissect.target-3.9.dev6.dist-info}/RECORD

@@ -44,7 +44,7 @@ dissect/target/helpers/lazy.py,sha256=4VnF-fUKor1K77Z09F4YnLpxM9PMHULzS9SJwVOnUS
 dissect/target/helpers/loaderutil.py,sha256=txtY6uE3vctiHH_V75pwe3OB1qcQWuf54Qdk5gzkCZc,2146
 dissect/target/helpers/localeutil.py,sha256=Y4Fh4jDSGfm5356xSLMriUCN8SZP_FAHg_iodkAxNq4,1504
 dissect/target/helpers/mount.py,sha256=KdmMJX0E5svZr9xURAp6knbK8bngxQGIyB_n2fzVEEs,2734
-dissect/target/helpers/network_managers.py,sha256=v4yf1hW4pFBaOz5vQ6ieCqhwrJ-Q87QeJAt7N70Mlzg,24476
+dissect/target/helpers/network_managers.py,sha256=jzrcblmDthl1o5-dP-Qh7mroAzcMzmLrnNZaE5trrJ4,24547
 dissect/target/helpers/record.py,sha256=zXg4tgPVpMB4U3Z8VCN_VeuOKTFAHQLMkw5fqZ5to-4,4798
 dissect/target/helpers/regutil.py,sha256=iSmJDCHNaicYfJZxHdMh3GseFEdo6UpaHm_YSjQ3n38,21820
 dissect/target/helpers/shell_folder_ids.py,sha256=Behhb8oh0kMxrEk6YYKYigCDZe8Hw5QS6iK_d2hTs2Y,24978
@@ -254,10 +254,10 @@ dissect/target/volumes/bde.py,sha256=gYGg5yF9MNARwNzEkrEfZmKkxyZW4rhLkpdnPJCbhGk
 dissect/target/volumes/disk.py,sha256=95grSsPt1BLVpKwTclwQYzPFGKTkFFqapIk0RoGWf38,968
 dissect/target/volumes/lvm.py,sha256=zXAfszxNR6tOGrKAtAa_E-JhjI-sXQyR4VYLXD-kqCw,1616
 dissect/target/volumes/vmfs.py,sha256=mlAJ8278tYaoRjk1u6tFFlCaDQUrVu5ZZE4ikiFvxi8,1707
-dissect.target-3.9.dev5.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.9.dev5.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.9.dev5.dist-info/METADATA,sha256=7fD8KTaf5nY6wqUT9nkQPI5go4MlzXPyne8iVMBCSww,9751
-dissect.target-3.9.dev5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-dissect.target-3.9.dev5.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
-dissect.target-3.9.dev5.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.9.dev5.dist-info/RECORD,,
+dissect.target-3.9.dev6.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.9.dev6.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.9.dev6.dist-info/METADATA,sha256=gqfaYSMWs78cm0_j7cwoAw1-tXDHt0ompeBiKM4H4tA,9751
+dissect.target-3.9.dev6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+dissect.target-3.9.dev6.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
+dissect.target-3.9.dev6.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.9.dev6.dist-info/RECORD,,