From 8d60e9160f231460c20bde89488ceecc03814aec Mon Sep 17 00:00:00 2001
From: Brandon Barnacle <brandon.barnacle@gmail.com>
Date: Mon, 8 Jul 2024 09:34:30 -0400
Subject: [PATCH] PR comment changes.

---
 .../framework/plugins/windows/modscan.py      |  9 +-
 .../framework/plugins/windows/modules.py      | 89 ++++++++++---------
 2 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/volatility3/framework/plugins/windows/modscan.py b/volatility3/framework/plugins/windows/modscan.py
index 3a786d2ca..98546bc9c 100644
--- a/volatility3/framework/plugins/windows/modscan.py
+++ b/volatility3/framework/plugins/windows/modscan.py
@@ -2,13 +2,10 @@
 # which is available at https://www.volatilityfoundation.org/license/vsl-v1.0
 #
 import logging
-from typing import Iterable, List, Generator
+from typing import Iterable
 
-from volatility3.framework import renderers, interfaces, exceptions, constants
+from volatility3.framework import interfaces
 from volatility3.framework.configuration import requirements
-from volatility3.framework.renderers import format_hints
-from volatility3.framework.symbols import intermed
-from volatility3.framework.symbols.windows.extensions import pe
 from volatility3.plugins.windows import poolscanner, dlllist, pslist, modules
 
 vollog = logging.getLogger(__name__)
@@ -36,7 +33,7 @@ class ModScan(modules.Modules):
                 name="poolscanner", component=poolscanner.PoolScanner, version=(1, 0, 0)
             ),
             requirements.VersionRequirement(
-                name="modules", component=modules.Modules, version=(1, 1, 0)
+                name="modules", component=modules.Modules, version=(2, 0, 0)
             ),
             requirements.VersionRequirement(
                 name="pslist", component=pslist.PsList, version=(2, 0, 0)
diff --git a/volatility3/framework/plugins/windows/modules.py b/volatility3/framework/plugins/windows/modules.py
index 8aea3dd45..79eea1cd7 100644
--- a/volatility3/framework/plugins/windows/modules.py
+++ b/volatility3/framework/plugins/windows/modules.py
@@ -4,9 +4,7 @@
 import logging
 from typing import List, Iterable, Generator
 
-from volatility3.framework import constants
-from volatility3.framework import exceptions, interfaces
-from volatility3.framework import renderers
+from volatility3.framework import exceptions, interfaces, constants, renderers
 from volatility3.framework.configuration import requirements
 from volatility3.framework.renderers import format_hints
 from volatility3.framework.symbols import intermed
@@ -20,7 +18,7 @@ class Modules(interfaces.plugins.PluginInterface):
     """Lists the loaded kernel modules."""
 
     _required_framework_version = (2, 0, 0)
-    _version = (1, 1, 0)
+    _version = (2, 0, 0)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -78,55 +76,58 @@ class Modules(interfaces.plugins.PluginInterface):
 
         return file_output
 
-    def process_module(self, session_layers, pe_table_name, mod):
-        if self.config["base"] and self.config["base"] != mod.DllBase:
-            return None
-
-        try:
-            BaseDllName = mod.BaseDllName.get_string()
-        except exceptions.InvalidAddressException:
-            BaseDllName = ""
-
-        if self.config["name"] and self.config["name"] not in BaseDllName:
-            return None
-
-        try:
-            FullDllName = mod.FullDllName.get_string()
-        except exceptions.InvalidAddressException:
-            FullDllName = ""
-
-        file_output = "Disabled"
-        if self.config["dump"]:
-            file_output = self.dump_module(session_layers, pe_table_name, mod)
-
-        return (
-            format_hints.Hex(mod.vol.offset),
-            format_hints.Hex(mod.DllBase),
-            format_hints.Hex(mod.SizeOfImage),
-            BaseDllName,
-            FullDllName,
-            file_output,
-        )
-
     def _generator(self):
         kernel = self.context.modules[self.config["kernel"]]
 
-        pe_table_name = intermed.IntermediateSymbolTable.create(
-            self.context, self.config_path, "windows", "pe", class_types=pe.class_types
-        )
+        pe_table_name = None
+        session_layers = None
 
-        session_layers = list(
-            self.get_session_layers(
-                self.context, kernel.layer_name, kernel.symbol_table_name
+        if self.config["dump"]:
+            pe_table_name = intermed.IntermediateSymbolTable.create(
+                self.context,
+                self.config_path,
+                "windows",
+                "pe",
+                class_types=pe.class_types,
+            )
+
+            session_layers = list(
+                self.get_session_layers(
+                    self.context, kernel.layer_name, kernel.symbol_table_name
+                )
             )
-        )
 
         for mod in self._enumeration_method(
             self.context, kernel.layer_name, kernel.symbol_table_name
         ):
-            record = self.process_module(session_layers, pe_table_name, mod)
-            if record:
-                yield (0, record)
+            if self.config["base"] and self.config["base"] != mod.DllBase:
+                continue
+
+            try:
+                BaseDllName = mod.BaseDllName.get_string()
+            except exceptions.InvalidAddressException:
+                BaseDllName = interfaces.renderers.BaseAbsentValue()
+
+            if self.config["name"] and self.config["name"] not in BaseDllName:
+                continue
+
+            try:
+                FullDllName = mod.FullDllName.get_string()
+            except exceptions.InvalidAddressException:
+                FullDllName = interfaces.renderers.BaseAbsentValue()
+
+            file_output = "Disabled"
+            if self.config["dump"]:
+                file_output = self.dump_module(session_layers, pe_table_name, mod)
+
+            yield 0, (
+                format_hints.Hex(mod.vol.offset),
+                format_hints.Hex(mod.DllBase),
+                format_hints.Hex(mod.SizeOfImage),
+                BaseDllName,
+                FullDllName,
+                file_output,
+            )
 
     @classmethod
     def get_session_layers(