Windows.vadregexscan: update imports, revert vadyarascan changes

volatility3/framework/plugins/windows/vadregexscan.py

@@ -6,9 +6,9 @@ import logging
 import re
 from typing import List
 
-from volatility3.framework import interfaces, renderers
+from volatility3.framework import renderers
 from volatility3.framework.configuration import requirements
-from volatility3.framework.interfaces import plugins
+from volatility3.framework.interfaces import plugins, configuration
 from volatility3.framework.layers import scanners
 from volatility3.framework.renderers import format_hints
 from volatility3.plugins.windows import pslist
@@ -24,7 +24,7 @@ class VadRegExScan(plugins.PluginInterface):
     MAXSIZE_DEFAULT = 128
 
     @classmethod
-    def get_requirements(cls) -> List[interfaces.configuration.RequirementInterface]:
+    def get_requirements(cls) -> List[configuration.RequirementInterface]:
         # Since we're calling the plugin, make sure we have the plugin's requirements
         return [
             requirements.ModuleRequirement(

volatility3/framework/plugins/windows/vadyarascan.py

@@ -5,8 +5,7 @@
 import logging
 from typing import Iterable, List, Tuple
 
-from volatility3.framework import renderers
-from volatility3.framework.interfaces import plugins, configuration, objects
+from volatility3.framework import interfaces, renderers
 from volatility3.framework.configuration import requirements
 from volatility3.framework.renderers import format_hints
 from volatility3.plugins import yarascan
@@ -15,14 +14,14 @@ from volatility3.plugins.windows import pslist
 vollog = logging.getLogger(__name__)
 
 
-class VadYaraScan(plugins.PluginInterface):
+class VadYaraScan(interfaces.plugins.PluginInterface):
     """Scans all the Virtual Address Descriptor memory maps using yara."""
 
     _required_framework_version = (2, 4, 0)
     _version = (1, 1, 1)
 
     @classmethod
-    def get_requirements(cls) -> List[configuration.RequirementInterface]:
+    def get_requirements(cls) -> List[interfaces.configuration.RequirementInterface]:
         # create a list of requirements for vadyarascan
         vadyarascan_requirements = [
             requirements.ModuleRequirement(
@@ -113,7 +112,7 @@ class VadYaraScan(plugins.PluginInterface):
 
     @staticmethod
     def get_vad_maps(
-        task: objects.ObjectInterface,
+        task: interfaces.objects.ObjectInterface,
     ) -> Iterable[Tuple[int, int]]:
         """Creates a map of start/end addresses within a virtual address
         descriptor tree.