dissect.target 3.16.dev38__py3-none-any.whl → 3.16.dev39__py3-none-any.whl

dissect/target/plugins/apps/vpn/wireguard.py

@@ -1,7 +1,7 @@
 import re
 from collections import OrderedDict
 from configparser import ConfigParser
-from os.path import basename
+from functools import partial
 from pathlib import Path
 from typing import Iterator, Union
 
@@ -34,7 +34,7 @@ WireGuardPeerRecord = TargetRecordDescriptor(
         ("string", "name"),
         ("string", "public_key"),
         ("string", "pre_shared_key"),
-        ("net.ipnetwork", "allowed_ips"),
+        ("net.ipnetwork[]", "allowed_ips"),
         ("string", "endpoint"),
         ("varint", "persistent_keep_alive"),
         ("string", "source"),
@@ -102,37 +102,42 @@ class WireGuardPlugin(Plugin):
 
             config = _parse_config(config_buf)
 
-            for section in config.sections():
+            # Set up an iterator to go through all the sections and pre-set the fallback
+            config_iterator = ((section, partial(config.get, section, fallback=None)) for section in config.sections())
+
+            for section, config_dict in config_iterator:
                 if "Interface" in section:
-                    if address := config.get(section, "Address", fallback=None):
+                    if address := config_dict("Address"):
                         address = address.split("/")[0]
-                    name = basename(config_path)
-                    name = self.TUNNEL_NAME_RE.sub("", name)
+
                     yield WireGuardInterfaceRecord(
-                        name=name,
+                        name=config_path.stem,
                         address=address,
-                        listen_port=config.get(section, "ListenPort", fallback=None),
-                        private_key=config.get(section, "PrivateKey", fallback=None),
-                        fw_mark=config.get(section, "FwMark", fallback=None),
-                        dns=config.get(section, "DNS", fallback=None),
-                        table=config.get(section, "Table", fallback=None),
-                        mtu=config.get(section, "MTU", fallback=None),
-                        preup=config.get(section, "PreUp", fallback=None),
-                        postup=config.get(section, "PostUp", fallback=None),
-                        predown=config.get(section, "PreDown", fallback=None),
-                        postdown=config.get(section, "PostDown", fallback=None),
+                        listen_port=config_dict("ListenPort"),
+                        private_key=config_dict("PrivateKey"),
+                        fw_mark=config_dict("FwMark"),
+                        dns=config_dict("DNS"),
+                        table=config_dict("Table"),
+                        mtu=config_dict("MTU"),
+                        preup=config_dict("PreUp"),
+                        postup=config_dict("PostUp"),
+                        predown=config_dict("PreDown"),
+                        postdown=config_dict("PostDown"),
                         source=config_path,
                         _target=self.target,
                     )
 
                 if "Peer" in section:
+                    if allowed_ips := config_dict("AllowedIPs"):
+                        allowed_ips = [value.strip() for value in allowed_ips.split(",")]
+
                     yield WireGuardPeerRecord(
-                        name=config.get(section, "Name", fallback=None),
-                        public_key=config.get(section, "PublicKey", fallback=None),
-                        pre_shared_key=config.get(section, "PreSharedKey", fallback=None),
-                        allowed_ips=config.get(section, "AllowedIPs", fallback=None),
-                        endpoint=config.get(section, "Endpoint", fallback=None),
-                        persistent_keep_alive=config.get(section, "PersistentKeepAlive", fallback=None),
+                        name=config_dict("Name"),
+                        public_key=config_dict("PublicKey"),
+                        pre_shared_key=config_dict("PreSharedKey"),
+                        allowed_ips=allowed_ips,
+                        endpoint=config_dict("Endpoint"),
+                        persistent_keep_alive=config_dict("PersistentKeepAlive"),
                         source=config_path,
                         _target=self.target,
                     )
@@ -148,6 +153,8 @@ def _parse_config(content: str) -> ConfigParser:
     """
 
     cp = ConfigParser(defaults=None, dict_type=MultiDict, strict=False)
+    # Set to use str so it doesn't do any lower operation on the keys.
+    cp.optionxform = str
     cp.read_string(content)
     return cp
 
@@ -158,7 +165,7 @@ class MultiDict(OrderedDict):
         super().__init__(*args, **kwargs)
 
     def __setitem__(self, key, val):
-        if isinstance(val, dict) and (key == "Peer" or key == "Interface"):
+        if isinstance(val, dict) and (key in ["Peer", "Interface"]):
             self._unique += 1
             key += str(self._unique)
         super().__setitem__(key, val)

{dissect.target-3.16.dev38.dist-info → dissect.target-3.16.dev39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.16.dev38
+Version: 3.16.dev39
 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.16.dev38.dist-info → dissect.target-3.16.dev39.dist-info}/RECORD

@@ -137,7 +137,7 @@ dissect/target/plugins/apps/ssh/putty.py,sha256=N8ssjutUVN50JNA5fEIVISbP5sJ7bGTF
 dissect/target/plugins/apps/ssh/ssh.py,sha256=uCaoWlT2bgKLUHA1aL6XymJDWJ8JmLsN8PB1C66eidY,1409
 dissect/target/plugins/apps/vpn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/plugins/apps/vpn/openvpn.py,sha256=NZeFSFgGAifevGIQBusdbBRFOPxu0584Th8rKE-XSus,6875
-dissect/target/plugins/apps/vpn/wireguard.py,sha256=45WvCqQQGrG3DVDH5ghcsGpM_BomF4RcTLzcIvnyuNs,6554
+dissect/target/plugins/apps/vpn/wireguard.py,sha256=SoAMED_bwWJQ3nci5qEY-qV4wJKSSDZQ8K7DoJRYq0k,6521
 dissect/target/plugins/apps/webhosting/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dissect/target/plugins/apps/webhosting/cpanel.py,sha256=OeFQnu9GmpffIlFyK-AR2Qf8tjyMhazWEAUyccDU5y0,2979
 dissect/target/plugins/apps/webserver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -332,10 +332,10 @@ dissect/target/volumes/luks.py,sha256=OmCMsw6rCUXG1_plnLVLTpsvE1n_6WtoRUGQbpmu1z
 dissect/target/volumes/lvm.py,sha256=wwQVR9I3G9YzmY6UxFsH2Y4MXGBcKL9aayWGCDTiWMU,2269
 dissect/target/volumes/md.py,sha256=j1K1iKmspl0C_OJFc7-Q1BMWN2OCC5EVANIgVlJ_fIE,1673
 dissect/target/volumes/vmfs.py,sha256=-LoUbn9WNwTtLi_4K34uV_-wDw2W5hgaqxZNj4UmqAQ,1730
-dissect.target-3.16.dev38.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
-dissect.target-3.16.dev38.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-dissect.target-3.16.dev38.dist-info/METADATA,sha256=LCsm2qVyfCBMvuEx5O0DbD_J-OhYuilVWMT_N2YRS7s,11107
-dissect.target-3.16.dev38.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-dissect.target-3.16.dev38.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
-dissect.target-3.16.dev38.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
-dissect.target-3.16.dev38.dist-info/RECORD,,
+dissect.target-3.16.dev39.dist-info/COPYRIGHT,sha256=m-9ih2RVhMiXHI2bf_oNSSgHgkeIvaYRVfKTwFbnJPA,301
+dissect.target-3.16.dev39.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+dissect.target-3.16.dev39.dist-info/METADATA,sha256=ngLz4XeexsGKv4urTocePElt3tx1Jpc0yxVHs1FcGWU,11107
+dissect.target-3.16.dev39.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+dissect.target-3.16.dev39.dist-info/entry_points.txt,sha256=tvFPa-Ap-gakjaPwRc6Fl6mxHzxEZ_arAVU-IUYeo_s,447
+dissect.target-3.16.dev39.dist-info/top_level.txt,sha256=Mn-CQzEYsAbkxrUI0TnplHuXnGVKzxpDw_po_sXpvv4,8
+dissect.target-3.16.dev39.dist-info/RECORD,,