nicer secret_generator

Makefile

@@ -17,5 +17,8 @@ test:
 clean:
 	find -name '*.pyc' -delete
 	find -name '__pycache__' -delete
+
+.PHONY: super-clean
+super-clean: clean
 	rm -rf .tox
 	rm -rf venv

detect_secrets/core/audit.py

@@ -10,7 +10,6 @@
 from ..plugins.common import initialize
 from ..plugins.common.filetype import determine_file_type
 from ..plugins.high_entropy_strings import HighEntropyStringsPlugin
-from ..plugins.keyword import KeywordDetector
 from .baseline import format_baseline_for_output
 from .baseline import merge_results
 from .bidirectional_iterator import BidirectionalIterator
@@ -586,12 +585,8 @@ def _highlight_secret(
 
 def _raw_secret_generator(plugin, secret_line, filetype):
     """Generates raw secrets by re-scanning the line, with the specified plugin"""
-    if isinstance(plugin, KeywordDetector):
-        for raw_secret in plugin.secret_generator(secret_line, filetype=filetype):
-            yield raw_secret
-    else:
-        for raw_secret in plugin.secret_generator(secret_line):
-            yield raw_secret
+    for raw_secret in plugin.secret_generator(secret_line, filetype=filetype):
+        yield raw_secret
 
     if issubclass(plugin.__class__, HighEntropyStringsPlugin):
         with plugin.non_quoted_string_regex(strict=False):

detect_secrets/plugins/base.py

@@ -47,7 +47,7 @@ def analyze_string(self, string, line_num, filename):
         raise NotImplementedError
 
     @abstractmethod
-    def secret_generator(self, string):
+    def secret_generator(self, string, *args, **kwargs):
         """Flags secrets in a given string, and yields the raw secret value.
         Used in self.analyze_string for PotentialSecret creation.
 
@@ -127,7 +127,7 @@ def analyze_string(self, string, line_num, filename):
 
         return output
 
-    def secret_generator(self, string):
+    def secret_generator(self, string, *args, **kwargs):
         for regex in self.blacklist:
             for match in regex.findall(string):
                 yield match

detect_secrets/plugins/high_entropy_strings.py

@@ -109,7 +109,7 @@ def analyze_string(self, string, line_num, filename):
 
         return output
 
-    def secret_generator(self, string):
+    def secret_generator(self, string, *args, **kwargs):
         # There may be multiple strings on the same line
         results = self.regex.findall(string)
         for result in results: