Extend webserver collection (#264)

Author: qmadev

acquire/acquire.py

@@ -17,15 +17,18 @@
 import urllib.request
 import warnings
 from collections import defaultdict
-from itertools import chain, product
+from itertools import product
 from pathlib import Path
 from typing import TYPE_CHECKING, BinaryIO, NamedTuple, NoReturn
 
 from dissect.target import Target
 from dissect.target.filesystems import ntfs
 from dissect.target.helpers import fsutil
 from dissect.target.loaders.local import _windows_get_devices
-from dissect.target.plugins.apps.webserver import iis
+from dissect.target.plugins.apps.webserver.apache import ApachePlugin
+from dissect.target.plugins.apps.webserver.caddy import CaddyPlugin
+from dissect.target.plugins.apps.webserver.iis import IISLogsPlugin
+from dissect.target.plugins.apps.webserver.nginx import NginxPlugin
 from dissect.target.plugins.os.windows.cam import CamPlugin
 from dissect.target.plugins.os.windows.log import evt, evtx
 from dissect.target.tools.utils.cli import args_to_uri
@@ -870,15 +873,36 @@ class IIS(Module):
 
     @classmethod
     def get_spec_additions(cls, target: Target, cli_args: argparse.Namespace) -> Iterator[tuple]:
-        spec = {
-            ("glob", "sysvol\\Windows\\System32\\LogFiles\\W3SVC*\\*.log"),
-            ("glob", "sysvol\\Windows.old\\Windows\\System32\\LogFiles\\W3SVC*\\*.log"),
-            ("glob", "sysvol\\inetpub\\logs\\LogFiles\\*.log"),
-            ("glob", "sysvol\\inetpub\\logs\\LogFiles\\W3SVC*\\*.log"),
-            ("glob", "sysvol\\Resources\\Directory\\*\\LogFiles\\Web\\W3SVC*\\*.log"),
-        }
-        iis_plugin = iis.IISLogsPlugin(target)
-        spec.update(("path", log_path) for log_path in chain(*iis_plugin.log_dirs.values()))
+        warnings.warn(
+            "--iis is deprecated in favor of --webserver-logs and will be removed in acquire 3.22",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return Webserver.get_spec_additions(cls, target, cli_args)
+
+
+@register_module("--webserver")
+class Webserver(Module):
+    DESC = "Various webserver logs and configuration files"
+
+    @classmethod
+    def get_spec_additions(cls, target: Target, cli_args: argparse.Namespace) -> Iterator[tuple]:
+        spec = set()
+        subclasses = [
+            ApachePlugin,
+            CaddyPlugin,
+            IISLogsPlugin,
+            NginxPlugin,
+        ]
+
+        for subclass in subclasses:
+            if subclass.__name__ == "IISLogsPlugin" and target.os != "windows":
+                continue
+
+            webserver = subclass(target)
+            for log_path in webserver.get_all_paths():
+                spec.add(("path", log_path))
+
         return spec
 
 

pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
     "dissect.cstruct>=4,<5",
-    "dissect.target>=3.24,<4",
+    "dissect.target>=3.25.dev,<4",  # TODO: update on release
 ]
 dynamic = ["version"]
 
@@ -47,7 +47,7 @@ full = [
 dev = [
     "acquire[full]",
     "dissect.cstruct>=4.0.dev,<5.0.dev",
-    "dissect.target[dev]>=3.24.dev,<4.0.dev",
+    "dissect.target[dev]>=3.25.dev,<4.0.dev",
 ]
 
 [dependency-groups]