From 901a38d40bee487512eddf9b37b221cdda5004cb Mon Sep 17 00:00:00 2001
From: Analyst <analyst@Analysts-MBP.lan>
Date: Mon, 4 Mar 2019 11:00:42 -0600
Subject: [PATCH] pool scanner update: we only ask for specific object types,
 so no need to filter the results anymore

---
 volatility/framework/plugins/windows/driverscan.py | 5 ++---
 volatility/framework/plugins/windows/filescan.py   | 5 ++---
 volatility/framework/plugins/windows/mutantscan.py | 5 ++---
 volatility/framework/plugins/windows/psscan.py     | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/volatility/framework/plugins/windows/driverscan.py b/volatility/framework/plugins/windows/driverscan.py
index d2a148e05..5e45efbb5 100644
--- a/volatility/framework/plugins/windows/driverscan.py
+++ b/volatility/framework/plugins/windows/driverscan.py
@@ -53,9 +53,8 @@ class DriverScan(plugins.PluginInterface):
                                                                  symbol_table,
                                                                  constraints):
 
-            constraint, mem_object, _header = result
-            if constraint.object_type == "Driver":
-                yield mem_object
+            _constraint, mem_object, _header = result
+            yield mem_object
 
     def _generator(self):
         for driver in self.scan_drivers(self.context,
diff --git a/volatility/framework/plugins/windows/filescan.py b/volatility/framework/plugins/windows/filescan.py
index a8c88a6f6..64074bc4b 100644
--- a/volatility/framework/plugins/windows/filescan.py
+++ b/volatility/framework/plugins/windows/filescan.py
@@ -53,9 +53,8 @@ class FileScan(plugins.PluginInterface):
                                                                  symbol_table,
                                                                  constraints):
 
-            constraint, mem_object, _header = result
-            if constraint.object_type == "File":
-                yield mem_object
+            _constraint, mem_object, _header = result
+            yield mem_object
 
     def _generator(self):
         for fileobj in self.scan_files(self.context,
diff --git a/volatility/framework/plugins/windows/mutantscan.py b/volatility/framework/plugins/windows/mutantscan.py
index dc7f4518f..80e392758 100644
--- a/volatility/framework/plugins/windows/mutantscan.py
+++ b/volatility/framework/plugins/windows/mutantscan.py
@@ -53,9 +53,8 @@ class MutantScan(plugins.PluginInterface):
                                                                  symbol_table,
                                                                  constraints):
 
-            constraint, mem_object, _header = result
-            if constraint.object_type == "Mutant":
-                yield mem_object
+            _constraint, mem_object, _header = result
+            yield mem_object
 
     def _generator(self):
         for mutant in self.scan_mutants(self.context,
diff --git a/volatility/framework/plugins/windows/psscan.py b/volatility/framework/plugins/windows/psscan.py
index 4e87b82b8..34e3a1d17 100644
--- a/volatility/framework/plugins/windows/psscan.py
+++ b/volatility/framework/plugins/windows/psscan.py
@@ -55,9 +55,8 @@ class PsScan(plugins.PluginInterface, timeliner.TimeLinerInterface):
                                                                  symbol_table,
                                                                  constraints):
 
-            constraint, mem_object, _header = result
-            if constraint.object_type == "Process":
-                yield mem_object
+            _constraint, mem_object, _header = result
+            yield mem_object
 
     def _generator(self):
         for proc in self.scan_processes(