Merge branch 'main' into py312

credsweeper/common/keyword_pattern.py

@@ -4,7 +4,7 @@
 class KeywordPattern:
     """Pattern set of keyword types"""
     key_left = r"(\\[nrt])?"\
-               r"(?P<variable>(([`'\"]+[^:='\"`}<>\\/&?]*|[^:='\"`}<>\s()\\/&?]*)" \
+               r"(?P<variable>(([`'\"]+[^:='\"`}<>\\/&?]*|[^:='\"`}<>\s()\\/&?;,]*)" \
                r"(?P<keyword>"
     # there will be inserted a keyword
     key_right = r")" \

credsweeper/filters/__init__.py

@@ -2,6 +2,7 @@
 
 from credsweeper.filters.line_git_binary_check import LineGitBinaryCheck
 from credsweeper.filters.line_specific_key_check import LineSpecificKeyCheck
+from credsweeper.filters.line_uue_part_check import LineUUEPartCheck
 from credsweeper.filters.value_allowlist_check import ValueAllowlistCheck
 from credsweeper.filters.value_array_dictionary_check import ValueArrayDictionaryCheck
 from credsweeper.filters.value_atlassian_token_check import ValueAtlassianTokenCheck

credsweeper/filters/group/password_keyword.py

@@ -3,11 +3,16 @@
 from credsweeper.filters import ValueDictionaryValueLengthCheck, LineGitBinaryCheck
 from credsweeper.filters import ValueSplitKeywordCheck
 from credsweeper.filters.group import Group
+from credsweeper.filters.line_uue_part_check import LineUUEPartCheck
 
 
 class PasswordKeyword(Group):
     """PasswordKeyword"""
 
     def __init__(self, config: Config) -> None:
         super().__init__(config, GroupType.KEYWORD)
-        self.filters.extend([ValueDictionaryValueLengthCheck(), ValueSplitKeywordCheck(), LineGitBinaryCheck()])
+        self.filters.extend(
+            [ValueDictionaryValueLengthCheck(),
+             ValueSplitKeywordCheck(),
+             LineGitBinaryCheck(),
+             LineUUEPartCheck()])

credsweeper/filters/line_git_binary_check.py

@@ -26,7 +26,7 @@ def run(self, line_data: LineData, target: AnalysisTarget) -> bool:
             True, if need to filter candidate and False if left
 
         """
-        if line_data.line is None:
+        if not line_data.line:
             return True
         if 66 < target.line_strip_len:
             return False

credsweeper/filters/line_uue_part_check.py

@@ -0,0 +1,44 @@
+import re
+
+from credsweeper.config import Config
+from credsweeper.credentials import LineData
+from credsweeper.file_handler.analysis_target import AnalysisTarget
+from credsweeper.filters import Filter
+
+
+class LineUUEPartCheck(Filter):
+    """Checks that line is not a part of UU encoding only for maximal line"""
+    uue_string = re.compile(r"^M[!-`]{60}$")
+
+    def __init__(self, config: Config = None) -> None:
+        pass
+
+    def run(self, line_data: LineData, target: AnalysisTarget) -> bool:
+        """Run filter checks on received credential candidate data 'line_data'.
+
+        Args:
+            line_data: credential candidate data
+            target: multiline target from which line data was obtained
+
+        Return:
+            True, if need to filter candidate and False if left
+
+        """
+        if not line_data.line:
+            return True
+        if 61 != target.line_len:
+            return False
+        line = target.line
+        if LineUUEPartCheck.uue_string.match(line):
+            # to be sure - check two lines: before and/or after
+            if 0 < line_data.line_pos:
+                previous_line = target.lines[line_data.line_pos - 1]
+                if LineUUEPartCheck.uue_string.match(previous_line):
+                    return True
+
+            if len(target.lines) > 1 + line_data.line_pos:
+                next_line = target.lines[line_data.line_pos + 1]
+                if LineUUEPartCheck.uue_string.match(next_line):
+                    return True
+
+        return False