↪️ Merge pull request #336 from OiCMudkips/fix_scan_string_verify

Fix adhoc scan verify

detect_secrets/plugins/aws.py

@@ -27,8 +27,8 @@ class AWSKeyDetector(RegexBasedDetector):
     def disable_flag_text(cls):
         return 'no-aws-key-scan'
 
-    def verify(self, token, content):
-        secret_access_key_candidates = get_secret_access_keys(content)
+    def verify(self, token, context):
+        secret_access_key_candidates = get_secret_access_keys(context)
         if not secret_access_key_candidates:
             return VerifiedResult.UNVERIFIED
 

detect_secrets/plugins/base.py

@@ -144,7 +144,7 @@ def analyze(self, file, filename):
                     lines_of_context=LINES_OF_CONTEXT,
                 )
 
-                is_verified = self.verify(result.secret_value, content=str(snippet))
+                is_verified = self.verify(result.secret_value, context=str(snippet))
                 if is_verified == VerifiedResult.VERIFIED_TRUE:
                     result.is_verified = True
 
@@ -226,7 +226,7 @@ def adhoc_scan(self, string):
 
         verified_result = VerifiedResult.UNVERIFIED
         for result in results:
-            is_verified = self.verify(result.secret_value)
+            is_verified = self.verify(result.secret_value, string)
             if is_verified != VerifiedResult.UNVERIFIED:
                 verified_result = is_verified
                 break
@@ -239,7 +239,7 @@ def adhoc_scan(self, string):
 
         return output[verified_result]
 
-    def verify(self, token, content=''):
+    def verify(self, token, context=''):
         """
         To increase accuracy and reduce false positives, plugins can also
         optionally declare a method to verify their status.

detect_secrets/plugins/cloudant.py

@@ -60,9 +60,9 @@ class CloudantDetector(RegexBasedDetector):
         ),
     ]
 
-    def verify(self, token, content):
+    def verify(self, token, context):
 
-        hosts = find_account(content)
+        hosts = find_account(context)
         if not hosts:
             return VerifiedResult.UNVERIFIED
 
@@ -72,7 +72,7 @@ def verify(self, token, content):
         return VerifiedResult.VERIFIED_FALSE
 
 
-def find_account(content):
+def find_account(context):
     opt_hostname_keyword = r'(?:hostname|host|username|id|user|userid|user-id|user-name|' \
         'name|user_id|user_name|uname|account)'
     account = r'(\w[\w\-]*)'
@@ -98,7 +98,7 @@ def find_account(content):
 
     return [
         match
-        for line in content.splitlines()
+        for line in context.splitlines()
         for regex in regexes
         for match in regex.findall(line)
     ]

detect_secrets/plugins/ibm_cos_hmac.py

@@ -29,8 +29,8 @@ class IbmCosHmacDetector(RegexBasedDetector):
         ),
     )
 
-    def verify(self, token, content):
-        key_id_matches = find_access_key_id(content)
+    def verify(self, token, context):
+        key_id_matches = find_access_key_id(context)
 
         if not key_id_matches:
             return VerifiedResult.UNVERIFIED
@@ -48,7 +48,7 @@ def verify(self, token, content):
         return VerifiedResult.VERIFIED_FALSE
 
 
-def find_access_key_id(content):
+def find_access_key_id(context):
     key_id_keyword_regex = r'(?:access[-_]?(?:key)?[-_]?(?:id)?|key[-_]?id)'
     key_id_regex = r'([a-f0-9]{32})'
 
@@ -60,7 +60,7 @@ def find_access_key_id(content):
 
     return [
         match
-        for line in content.splitlines()
+        for line in context.splitlines()
         for match in regex.findall(line)
     ]
 

detect_secrets/plugins/softlayer.py

@@ -28,8 +28,8 @@ class SoftlayerDetector(RegexBasedDetector):
         ),
     ]
 
-    def verify(self, token, content):
-        usernames = find_username(content)
+    def verify(self, token, context):
+        usernames = find_username(context)
         if not usernames:
             return VerifiedResult.UNVERIFIED
 
@@ -39,7 +39,7 @@ def verify(self, token, content):
         return VerifiedResult.VERIFIED_FALSE
 
 
-def find_username(content):
+def find_username(context):
     # opt means optional
     username_keyword = (
         r'(?:'
@@ -58,7 +58,7 @@ def find_username(content):
 
     return [
         match
-        for line in content.splitlines()
+        for line in context.splitlines()
         for match in regex.findall(line)
     ]