credsweeper 1.11.5__py3-none-any.whl → 1.12.0__py3-none-any.whl

credsweeper/filters/group/group.py

@@ -2,23 +2,53 @@ from abc import ABC
 from typing import List
 
 from credsweeper.common.constants import GroupType
-from credsweeper.config import Config
-from credsweeper.filters import (Filter, LineSpecificKeyCheck, ValueAllowlistCheck, ValueArrayDictionaryCheck,
-                                 ValueBlocklistCheck, ValueCamelCaseCheck, ValueFilePathCheck, ValueLastWordCheck,
-                                 ValueMethodCheck, ValueNotAllowedPatternCheck, ValuePatternCheck, ValueSimilarityCheck,
-                                 ValueStringTypeCheck, ValueTokenCheck, ValueHexNumberCheck)
+from credsweeper.config.config import Config
+from credsweeper.filters.filter import Filter
+from credsweeper.filters.line_specific_key_check import LineSpecificKeyCheck
+from credsweeper.filters.value_allowlist_check import ValueAllowlistCheck
+from credsweeper.filters.value_array_dictionary_check import ValueArrayDictionaryCheck
+from credsweeper.filters.value_blocklist_check import ValueBlocklistCheck
+from credsweeper.filters.value_camel_case_check import ValueCamelCaseCheck
+from credsweeper.filters.value_file_path_check import ValueFilePathCheck
+from credsweeper.filters.value_hex_number_check import ValueHexNumberCheck
+from credsweeper.filters.value_last_word_check import ValueLastWordCheck
+from credsweeper.filters.value_method_check import ValueMethodCheck
+from credsweeper.filters.value_not_allowed_pattern_check import ValueNotAllowedPatternCheck
+from credsweeper.filters.value_pattern_check import ValuePatternCheck
+from credsweeper.filters.value_similarity_check import ValueSimilarityCheck
+from credsweeper.filters.value_string_type_check import ValueStringTypeCheck
+from credsweeper.filters.value_token_check import ValueTokenCheck
 
 
 class Group(ABC):
     """Abstract Group class"""
 
     def __init__(self, config: Config, rule_type: GroupType = GroupType.DEFAULT) -> None:
+        """Config is required for filter group"""
         if rule_type == GroupType.KEYWORD:
-            self.filters: List[Filter] = self.get_keyword_base_filters(config)
+            self.__filters = [  #
+                ValueAllowlistCheck(),  #
+                ValueArrayDictionaryCheck(),  #
+                ValueBlocklistCheck(),  #
+                ValueCamelCaseCheck(),  #
+                ValueFilePathCheck(),  #
+                ValueHexNumberCheck(),  #
+                ValueLastWordCheck(),  #
+                ValueMethodCheck(),  #
+                ValueSimilarityCheck(),  #
+                ValueStringTypeCheck(check_for_literals=config.check_for_literals),  #
+                ValueTokenCheck(),  #
+            ]
+            if not config.doc:
+                self.__filters.extend([ValuePatternCheck(), ValueNotAllowedPatternCheck()])
         elif rule_type == GroupType.PATTERN:
-            self.filters: List[Filter] = self.get_pattern_base_filters(config)
+            self.__filters = [  #
+                LineSpecificKeyCheck(),  #
+                ValuePatternCheck(),  #
+            ]
         else:
-            self.filters: List[Filter] = []
+            # GroupType.DEFAULT
+            self.__filters = []
 
     @property
     def filters(self) -> List[Filter]:
@@ -29,31 +59,3 @@ class Group(ABC):
     def filters(self, filters: List[Filter]) -> None:
         """property setter"""
         self.__filters = filters
-
-    @staticmethod
-    def get_keyword_base_filters(config: Config) -> List[Filter]:
-        """returns base filters"""
-        filters = [  #
-            ValueAllowlistCheck(),
-            ValueArrayDictionaryCheck(),
-            ValueBlocklistCheck(),
-            ValueCamelCaseCheck(),
-            ValueFilePathCheck(),
-            ValueHexNumberCheck(),
-            ValueLastWordCheck(),
-            ValueMethodCheck(),
-            ValueSimilarityCheck(),
-            ValueStringTypeCheck(config),
-            ValueTokenCheck(),
-        ]
-        if not config.doc:
-            filters.extend([ValuePatternCheck(pattern_len=config.pattern_len), ValueNotAllowedPatternCheck()])
-        return filters
-
-    @staticmethod
-    def get_pattern_base_filters(config: Config) -> List[Filter]:
-        """return base filters for pattern"""
-        return [  #
-            LineSpecificKeyCheck(),  #
-            ValuePatternCheck(pattern_len=config.pattern_len),  #
-        ]

credsweeper/filters/group/password_keyword.py

@@ -1,8 +1,8 @@
 from credsweeper.common.constants import GroupType
-from credsweeper.config import Config
-from credsweeper.filters import ValueDictionaryValueLengthCheck, LineGitBinaryCheck
+from credsweeper.config.config import Config
+from credsweeper.filters import ValueLengthCheck, LineGitBinaryCheck
 from credsweeper.filters import ValueSplitKeywordCheck
-from credsweeper.filters.group import Group
+from credsweeper.filters.group.group import Group
 from credsweeper.filters.line_uue_part_check import LineUUEPartCheck
 
 
@@ -11,8 +11,9 @@ class PasswordKeyword(Group):
 
     def __init__(self, config: Config) -> None:
         super().__init__(config, GroupType.KEYWORD)
-        self.filters.extend(
-            [ValueDictionaryValueLengthCheck(),
-             ValueSplitKeywordCheck(),
-             LineGitBinaryCheck(),
-             LineUUEPartCheck()])
+        self.filters.extend([
+            ValueLengthCheck(max_len=config.max_password_value_length),
+            ValueSplitKeywordCheck(),
+            LineGitBinaryCheck(),
+            LineUUEPartCheck()
+        ])

credsweeper/filters/group/token_pattern.py

@@ -1,7 +1,7 @@
 from credsweeper.common.constants import GroupType
-from credsweeper.config import Config
+from credsweeper.config.config import Config
 from credsweeper.filters import ValueCoupleKeywordCheck, ValueCamelCaseCheck, ValueNumberCheck, ValuePatternCheck
-from credsweeper.filters.group import Group
+from credsweeper.filters.group.group import Group
 
 
 class TokenPattern(Group):
@@ -13,5 +13,5 @@ class TokenPattern(Group):
             ValueCoupleKeywordCheck(),
             ValueNumberCheck(),
             ValueCamelCaseCheck(),
-            ValuePatternCheck(pattern_len=config.pattern_len)
+            ValuePatternCheck(),
         ]

credsweeper/filters/group/url_credentials_group.py

@@ -1,10 +1,10 @@
 from credsweeper.common.constants import GroupType
-from credsweeper.config import Config
+from credsweeper.config.config import Config
 from credsweeper.filters import (ValueAllowlistCheck, ValueArrayDictionaryCheck, ValueBlocklistCheck,
-                                 ValueCamelCaseCheck, ValueDictionaryValueLengthCheck, ValueFilePathCheck,
-                                 ValueLastWordCheck, ValueMethodCheck, ValueNotAllowedPatternCheck, ValuePatternCheck,
-                                 ValueStringTypeCheck, ValueTokenCheck)
-from credsweeper.filters.group import Group
+                                 ValueCamelCaseCheck, ValueLengthCheck, ValueFilePathCheck, ValueLastWordCheck,
+                                 ValueMethodCheck, ValueNotAllowedPatternCheck, ValuePatternCheck, ValueStringTypeCheck,
+                                 ValueTokenCheck)
+from credsweeper.filters.group.group import Group
 
 
 class UrlCredentialsGroup(Group):
@@ -25,9 +25,9 @@ class UrlCredentialsGroup(Group):
             ValueFilePathCheck(),
             ValueLastWordCheck(),
             ValueMethodCheck(),
-            ValueStringTypeCheck(config),
+            ValueStringTypeCheck(check_for_literals=config.check_for_literals),
             ValueNotAllowedPatternCheck(),
             ValueTokenCheck(),
-            ValueDictionaryValueLengthCheck(min_len=4, max_len=80),
-            ValuePatternCheck(pattern_len=config.pattern_len)
+            ValueLengthCheck(max_len=config.max_url_cred_value_length),
+            ValuePatternCheck()
         ]

credsweeper/filters/group/weird_base36_token.py

@@ -1,8 +1,8 @@
 from credsweeper.common.constants import GroupType
-from credsweeper.config import Config
+from credsweeper.config.config import Config
 from credsweeper.filters import ValueCoupleKeywordCheck, ValuePatternCheck, ValueNumberCheck, ValueEntropyBase36Check, \
     ValueTokenBase36Check
-from credsweeper.filters.group import Group
+from credsweeper.filters.group.group import Group
 
 
 class WeirdBase36Token(Group):
@@ -12,7 +12,7 @@ class WeirdBase36Token(Group):
         super().__init__(config, GroupType.DEFAULT)
         self.filters = [
             ValueCoupleKeywordCheck(),
-            ValuePatternCheck(config),
+            ValuePatternCheck(),
             ValueNumberCheck(),
             ValueTokenBase36Check(),
             ValueEntropyBase36Check()

credsweeper/filters/group/weird_base64_token.py

@@ -1,9 +1,9 @@
 from credsweeper.common.constants import GroupType
-from credsweeper.config import Config
+from credsweeper.config.config import Config
 from credsweeper.filters import ValueCoupleKeywordCheck, ValueNotPartEncodedCheck, \
     ValueBase64DataCheck, ValueEntropyBase64Check, ValuePatternCheck, ValueNumberCheck, ValueTokenBase64Check, \
     ValueBase64PartCheck
-from credsweeper.filters.group import Group
+from credsweeper.filters.group.group import Group
 
 
 class WeirdBase64Token(Group):
@@ -17,7 +17,7 @@ class WeirdBase64Token(Group):
             ValueBase64DataCheck(),
             ValueTokenBase64Check(),
             ValueEntropyBase64Check(),
-            ValuePatternCheck(config),
+            ValuePatternCheck(),
             ValueNotPartEncodedCheck(),
             ValueBase64PartCheck(),
         ]

credsweeper/filters/line_git_binary_check.py

@@ -1,18 +1,19 @@
 import base64
 import contextlib
 import re
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
+from credsweeper.filters.filter import Filter
 
 
 class LineGitBinaryCheck(Filter):
     """Checks that line is not a part of git binary patch"""
     base85string = re.compile(r"^[A-Za-z][0-9A-Za-z!#$%&()*+;<=>?@^_`{|}~-]{6,65}$")
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/line_specific_key_check.py

@@ -1,11 +1,12 @@
 import re
+from typing import Optional
 
 from credsweeper.common.constants import ML_HUNK
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
 
 
 class LineSpecificKeyCheck(Filter):
@@ -14,7 +15,7 @@ class LineSpecificKeyCheck(Filter):
     NOT_ALLOWED = [r"example", r"\benc[\(\[]", r"\btrue\b", r"\bfalse\b"]
     NOT_ALLOWED_PATTERN = re.compile(Util.get_regex_combine_or(NOT_ALLOWED), re.IGNORECASE)
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/line_uue_part_check.py

@@ -1,16 +1,17 @@
 import re
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
+from credsweeper.filters.filter 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:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_allowlist_check.py

@@ -1,10 +1,11 @@
 import re
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
 
 
 class ValueAllowlistCheck(Filter):
@@ -40,7 +41,7 @@ class ValueAllowlistCheck(Filter):
 
     ALLOWED_UNQUOTED_PATTERN = re.compile(Util.get_regex_combine_or(ALLOWED_UNQUOTED), flags=re.IGNORECASE)
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_array_dictionary_check.py

@@ -1,9 +1,10 @@
 import re
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
+from credsweeper.filters.filter import Filter
 
 
 class ValueArrayDictionaryCheck(Filter):
@@ -14,9 +15,9 @@ class ValueArrayDictionaryCheck(Filter):
         `token = {'root'}` would be kept
     """
 
-    PATTERN = re.compile(r"\[('|\")?[^,]+('|\")?\]")
+    PATTERN = re.compile(r"\[['\"]?[^,]+['\"]?]")
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:
@@ -32,11 +33,12 @@ class ValueArrayDictionaryCheck(Filter):
         """
         if line_data.is_well_quoted_value:
             return False
+        # not well quoted value
         if line_data.wrap and "byte" in line_data.wrap.lower():
             return False
         if self.PATTERN.search(line_data.value):
             return True
-        if line_data.wrap and not line_data.is_well_quoted_value and ('[' in line_data.wrap or '(' in line_data.wrap):
+        if line_data.wrap and (line_data.wrap.endswith('[') or line_data.wrap.endswith('(')):
             return True
 
         return False

credsweeper/filters/value_atlassian_token_check.py

@@ -1,18 +1,19 @@
 import binascii
 import contextlib
+from typing import Optional
 
 from credsweeper.common.constants import LATIN_1, ASCII
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
 
 
 class ValueAtlassianTokenCheck(Filter):
     """Check that candidate have a known structure"""
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_azure_token_check.py

@@ -1,12 +1,13 @@
 import contextlib
 import json
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
+from credsweeper.filters.filter import Filter
 from credsweeper.filters.value_entropy_base64_check import ValueEntropyBase64Check
-from credsweeper.utils import Util
+from credsweeper.utils.util import Util
 
 
 class ValueAzureTokenCheck(Filter):
@@ -15,7 +16,7 @@ class ValueAzureTokenCheck(Filter):
     https://learn.microsoft.com/en-us/azure/active-directory-b2c/access-tokens
     """
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_base32_data_check.py

@@ -1,12 +1,13 @@
 import base64
 import contextlib
 import string
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
 
 
 class ValueBase32DataCheck(Filter):
@@ -14,7 +15,7 @@ class ValueBase32DataCheck(Filter):
     Check that candidate is NOT an ascii encoded string with entropy check
     """
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:
@@ -38,6 +39,8 @@ class ValueBase32DataCheck(Filter):
                 return True
         # check whether decoded bytes have enough entropy
         with contextlib.suppress(Exception):
+            if pad_remain := len(value) % 8:
+                value += '=' * (8 - pad_remain)
             decoded = base64.b32decode(value)
             return Util.is_ascii_entropy_validate(decoded)
         return True

credsweeper/filters/value_base64_data_check.py

@@ -1,11 +1,12 @@
 import contextlib
 import string
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
 
 
 class ValueBase64DataCheck(Filter):
@@ -13,7 +14,7 @@ class ValueBase64DataCheck(Filter):
     Check that candidate is NOT an ascii encoded string with entropy check
     """
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_base64_encoded_pem_check.py

@@ -1,18 +1,19 @@
 import contextlib
+from typing import Optional
 
 from credsweeper.common.constants import ASCII, PEM_BEGIN_PATTERN
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
 from credsweeper.utils.pem_key_detector import PemKeyDetector
+from credsweeper.utils.util import Util
 
 
 class ValueBase64EncodedPem(Filter):
     """Check that candidate contains base64 encoded pem private key"""
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         self.config = config
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_base64_key_check.py

@@ -1,10 +1,11 @@
 import contextlib
+from typing import Optional
 
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
 
 
 class ValueBase64KeyCheck(Filter):
@@ -12,7 +13,7 @@ class ValueBase64KeyCheck(Filter):
 
     EXTRA_TRANS_TABLE = str.maketrans('', '', "\",'\\")
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         self.config = config
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_base64_part_check.py

@@ -2,14 +2,15 @@ import contextlib
 import re
 import statistics
 from itertools import takewhile
+from typing import Optional
 
 from credsweeper.common.constants import Chars
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
+from credsweeper.filters.filter import Filter
 from credsweeper.filters.value_entropy_base64_check import ValueEntropyBase64Check
-from credsweeper.utils import Util
+from credsweeper.utils.util import Util
 
 
 class ValueBase64PartCheck(Filter):
@@ -20,7 +21,7 @@ class ValueBase64PartCheck(Filter):
     base64_pattern = re.compile(r"^(\\{1,8}[0abfnrtv]|[0-9A-Za-z+/=]){1,4000}$")
     base64_char_set = set(Chars.BASE64STDPAD_CHARS.value + '\\')
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_basic_auth_check.py

@@ -0,0 +1,37 @@
+import contextlib
+from typing import Optional
+
+from credsweeper.common.constants import DEFAULT_PATTERN_LEN, UTF_8
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
+from credsweeper.file_handler.analysis_target import AnalysisTarget
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
+
+
+class ValueBasicAuthCheck(Filter):
+    """Check that candidate have a known structure"""
+
+    def __init__(self, config: Optional[Config] = None) -> None:
+        pass
+
+    def run(self, line_data: LineData, target: AnalysisTarget) -> bool:
+        """Run filter checks on received token which might be structured.
+
+        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
+
+        """
+        value = line_data.value
+        with contextlib.suppress(Exception):
+            # Basic encoding -> login:password
+            decoded = Util.decode_base64(value, padding_safe=True, urlsafe_detect=True)
+            delimiter_pos = decoded.find(b':')
+            # check whether the delimiter exists and all chars are decoded
+            if 0 < delimiter_pos < len(decoded) - DEFAULT_PATTERN_LEN and decoded.decode(UTF_8):
+                return False
+        return True

credsweeper/filters/value_blocklist_check.py

@@ -1,7 +1,9 @@
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from typing import Optional
+
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
+from credsweeper.filters.filter import Filter
 
 
 class ValueBlocklistCheck(Filter):
@@ -18,7 +20,7 @@ class ValueBlocklistCheck(Filter):
         "undefined",
     ]
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_camel_case_check.py

@@ -1,11 +1,12 @@
 import re
+from typing import Optional
 
 from credsweeper.common import static_keyword_checklist
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.utils import Util
+from credsweeper.filters.filter import Filter
+from credsweeper.utils.util import Util
 
 
 class ValueCamelCaseCheck(Filter):
@@ -14,7 +15,7 @@ class ValueCamelCaseCheck(Filter):
     CAMEL_CASE = ["^([a-z]+([A-Z][a-z]+)+)$", "^([A-Z][a-z]+([A-Z][a-z]+)+)$"]
     CAMEL_CASE_PATTERN = re.compile(Util.get_regex_combine_or(CAMEL_CASE))
 
-    def __init__(self, config: Config = None) -> None:
+    def __init__(self, config: Optional[Config] = None) -> None:
         pass
 
     def run(self, line_data: LineData, target: AnalysisTarget) -> bool:

credsweeper/filters/value_couple_keyword_check.py

@@ -1,14 +1,16 @@
+from typing import Optional
+
 from credsweeper.common import static_keyword_checklist
-from credsweeper.config import Config
-from credsweeper.credentials import LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.line_data import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
+from credsweeper.filters.filter import Filter
 
 
 class ValueCoupleKeywordCheck(Filter):
     """Check value if TWO words from morphemes checklist exists in value"""
 
-    def __init__(self, config: Config = None, threshold=1) -> None:
+    def __init__(self, config: Optional[Config] = None, threshold=1) -> None:
         # threshold - minimum morphemes number in a value
         self.threshold = threshold