Merge branch 'volatilityfoundation:develop' into Volshell

.github/workflows/black.yml

@@ -1,4 +1,4 @@
-name: Black python linter
+name: Black python formatter
 
 on: [push, pull_request]
 

.github/workflows/ruff.yaml

@@ -0,0 +1,15 @@
+---
+name: Ruff
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: astral-sh/ruff-action@v1
+        with:
+          args: check
+          src: "."

.github/workflows/test.yaml

@@ -42,8 +42,13 @@ jobs:
 
     - name: Testing...
       run: |
-        pytest ./test/test_volatility.py --volatility=vol.py --image-dir=./test_images -k test_windows -v
-        pytest ./test/test_volatility.py --volatility=vol.py --image-dir=./test_images -k test_linux -v
+        # VolShell
+        pytest ./test/test_volatility.py --volatility=volshell.py --image-dir=./test_images -k test_windows_volshell -v
+        pytest ./test/test_volatility.py --volatility=volshell.py --image-dir=./test_images -k test_linux_volshell -v
+
+        # Volatility
+        pytest ./test/test_volatility.py --volatility=vol.py --image-dir=./test_images -k "test_windows and not test_windows_volshell" -v
+        pytest ./test/test_volatility.py --volatility=vol.py --image-dir=./test_images -k "test_linux and not test_linux_volshell" -v
 
     - name: Clean up post-test
       run: |

development/banner_server.py

@@ -28,48 +28,65 @@ def convert_url(self, url):
 
     def run(self):
         context = contexts.Context()
-        json_output = {'version': 1}
+        json_output = {"version": 1}
 
         path = self._path
-        filename = '*'
+        filename = "*"
 
         for banner_cache in [linux.LinuxBannerCache, mac.MacBannerCache]:
             sub_path = banner_cache.os
             potentials = []
             for extension in constants.ISF_EXTENSIONS:
                 # Hopefully these will not be large lists, otherwise this might be slow
                 try:
-                    for found in pathlib.Path(path).joinpath(sub_path).resolve().rglob(filename + extension):
+                    for found in (
+                        pathlib.Path(path)
+                        .joinpath(sub_path)
+                        .resolve()
+                        .rglob(filename + extension)
+                    ):
                         potentials.append(found.as_uri())
                 except FileNotFoundError:
                     # If there's no linux symbols, don't cry about it
                     pass
 
-            new_banners = banner_cache.read_new_banners(context, 'BannerServer', potentials, banner_cache.symbol_name,
-                                                        banner_cache.os, progress_callback = PrintedProgress())
+            new_banners = banner_cache.read_new_banners(
+                context,
+                "BannerServer",
+                potentials,
+                banner_cache.symbol_name,
+                banner_cache.os,
+                progress_callback=PrintedProgress(),
+            )
             result_banners = {}
             for new_banner in new_banners:
                 # Only accept file schemes
-                value = [self.convert_url(url) for url in new_banners[new_banner] if
-                         urllib.parse.urlparse(url).scheme == 'file']
+                value = [
+                    self.convert_url(url)
+                    for url in new_banners[new_banner]
+                    if urllib.parse.urlparse(url).scheme == "file"
+                ]
                 if value and new_banner:
                     # Convert files into URLs
-                    result_banners[str(base64.b64encode(new_banner), 'latin-1')] = value
+                    result_banners[str(base64.b64encode(new_banner), "latin-1")] = value
 
             json_output[banner_cache.os] = result_banners
 
-        output_path = os.path.join(self._path, 'banners.json')
-        with open(output_path, 'w') as fp:
+        output_path = os.path.join(self._path, "banners.json")
+        with open(output_path, "w") as fp:
             vollog.warning(f"Banners file written to {output_path}")
             json.dump(json_output, fp)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
 
     parser = argparse.ArgumentParser()
-    parser.add_argument('--path', default = os.path.dirname(__file__))
-    parser.add_argument('--urlprefix', help = 'Web prefix that will eventually serve the ISF files',
-                        default = 'http://localhost/symbols')
+    parser.add_argument("--path", default=os.path.dirname(__file__))
+    parser.add_argument(
+        "--urlprefix",
+        help="Web prefix that will eventually serve the ISF files",
+        default="http://localhost/symbols",
+    )
 
     args = parser.parse_args()