From 0860441c2fc5a5a97902a7582473d8462c457bc3 Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Thu, 9 Jan 2025 17:11:02 +0000
Subject: [PATCH] Core: Improve speed to JSONSchema validation

---
 pyproject.toml                           |  3 +--
 volatility3/framework/plugins/isfinfo.py |  2 +-
 volatility3/schemas/__init__.py          | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 86e3921d2..af22cbe0a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,10 +33,9 @@ cloud = [
 
 dev = [
     "volatility3[full,cloud]",
-    "jsonschema>=4.23.0,<5",
+    "fastjsonschema>=2.21.1,<3",
     "pyinstaller>=6.11.0,<7",
     "pyinstaller-hooks-contrib>=2024.9",
-    "types-jsonschema>=4.23.0,<5",
 ]
 
 test = [
diff --git a/volatility3/framework/plugins/isfinfo.py b/volatility3/framework/plugins/isfinfo.py
index 1c2ac52e9..34b0a5653 100644
--- a/volatility3/framework/plugins/isfinfo.py
+++ b/volatility3/framework/plugins/isfinfo.py
@@ -97,7 +97,7 @@ class IsfInfo(plugins.PluginInterface):
                     if filter_item in isf_file:
                         filtered_list.append(isf_file)
 
-        if find_spec("jsonschema") and self.config["validate"]:
+        if find_spec("fastjsonschema") and self.config["validate"]:
 
             def check_valid(data):
                 return "True" if schemas.validate(data, True) else "False"
diff --git a/volatility3/schemas/__init__.py b/volatility3/schemas/__init__.py
index 90cfaba48..3964e29a6 100644
--- a/volatility3/schemas/__init__.py
+++ b/volatility3/schemas/__init__.py
@@ -14,6 +14,8 @@ vollog = logging.getLogger(__name__)
 
 cached_validation_filepath = os.path.join(constants.CACHE_PATH, "valid_isf.hashcache")
 
+validators = {}
+
 
 def load_cached_validations() -> Set[str]:
     """Loads up the list of successfully cached json objects, so we don't need
@@ -92,7 +94,12 @@ def valid(
     if input_hash in cached_validations and use_cache:
         return True
     try:
-        import jsonschema
+        import fastjsonschema
+
+        schema_key = json.dumps(schema, sort_keys=True)
+        if schema_key not in validators:
+            validator = fastjsonschema.compile(schema)
+            validators[schema_key] = validator
     except ImportError:
         vollog.info("Dependency for validation unavailable: jsonschema")
         vollog.debug("All validations will report success, even with malformed input")
@@ -100,10 +107,13 @@ def valid(
 
     try:
         vollog.debug("Validating JSON against schema...")
-        jsonschema.validate(input, schema)
+        validators[schema_key](input)
+        import pdb
+
+        pdb.set_trace()
         cached_validations.add(input_hash)
         vollog.debug("JSON validated against schema (result cached)")
-    except jsonschema.exceptions.SchemaError:
+    except fastjsonschema.JsonSchemaValueException:
         vollog.debug("Schema validation error", exc_info=True)
         return False