credsweeper 1.11.4__py3-none-any.whl → 1.11.6__py3-none-any.whl

credsweeper/filters/value_pattern_check.py

@@ -1,10 +1,10 @@
 import re
 
 from credsweeper.common.constants import DEFAULT_PATTERN_LEN
-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 ValuePatternCheck(Filter):

credsweeper/filters/value_similarity_check.py

@@ -1,7 +1,7 @@
-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 ValueSimilarityCheck(Filter):

credsweeper/filters/value_split_keyword_check.py

@@ -1,10 +1,10 @@
 from typing import Union
 
 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 ValueSplitKeywordCheck(Filter):

credsweeper/filters/value_string_type_check.py

@@ -1,9 +1,9 @@
 import re
 
-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 ValueStringTypeCheck(Filter):

credsweeper/filters/value_token_base_check.py

@@ -2,10 +2,10 @@ import contextlib
 from abc import abstractmethod
 from typing import Tuple
 
-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.utils.hop_stat import HopStat
 
 

credsweeper/filters/value_token_check.py

@@ -1,9 +1,9 @@
 import re
 
-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 ValueTokenCheck(Filter):

credsweeper/logger/__init__.py

@@ -1 +0,0 @@
-from credsweeper.logger.logger import Logger

credsweeper/logger/logger.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Optional
 
 from credsweeper.app import APP_PATH
-from credsweeper.utils import Util
+from credsweeper.utils.util import Util
 
 
 class Logger:

credsweeper/ml_model/__init__.py

@@ -1 +0,0 @@
-from credsweeper.ml_model.ml_validator import MlValidator

credsweeper/ml_model/features/entropy_evaluation.py

@@ -4,7 +4,7 @@ from typing import Dict, List, Set
 import numpy as np
 
 from credsweeper.common.constants import Chars, ML_HUNK
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.file_handler.data_content_provider import MIN_DATA_LEN
 from credsweeper.ml_model.features.feature import Feature
 

credsweeper/ml_model/features/feature.py

@@ -3,7 +3,7 @@ from typing import List, Any
 
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 
 
 class Feature(ABC):

credsweeper/ml_model/features/file_extension.py

@@ -2,7 +2,7 @@ from typing import List, Any
 
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/features/has_html_tag.py

@@ -1,7 +1,7 @@
 from credsweeper.common.constants import CHUNK_SIZE
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.feature import Feature
-from credsweeper.utils import Util
+from credsweeper.utils.util import Util
 
 
 class HasHtmlTag(Feature):

credsweeper/ml_model/features/is_secret_numeric.py

@@ -1,4 +1,4 @@
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.feature import Feature
 
 

credsweeper/ml_model/features/length_of_attribute.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 from credsweeper.common.constants import ML_HUNK
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.feature import Feature
 
 

credsweeper/ml_model/features/morpheme_dense.py

@@ -1,5 +1,5 @@
 from credsweeper.common import static_keyword_checklist
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.feature import Feature
 
 

credsweeper/ml_model/features/rule_name.py

@@ -2,7 +2,7 @@ from typing import List, Any
 
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/features/search_in_attribute.py

@@ -1,6 +1,6 @@
 import re
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.feature import Feature
 
 

credsweeper/ml_model/features/word_in.py

@@ -3,7 +3,7 @@ from typing import List, Any, Tuple, Set
 
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.feature import Feature
 
 

credsweeper/ml_model/features/word_in_path.py

@@ -3,7 +3,7 @@ from typing import List, Any
 
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/features/word_in_postamble.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 from credsweeper.common.constants import ML_HUNK
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/features/word_in_preamble.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 from credsweeper.common.constants import ML_HUNK
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/features/word_in_transition.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/features/word_in_value.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/features/word_in_variable.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from credsweeper.credentials import Candidate
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.ml_model.features.word_in import WordIn
 
 

credsweeper/ml_model/ml_validator.py

@@ -9,8 +9,9 @@ from onnxruntime import InferenceSession
 
 import credsweeper.ml_model.features as features
 from credsweeper.common.constants import ThresholdPreset, ML_HUNK
-from credsweeper.credentials import Candidate, CandidateKey
-from credsweeper.utils import Util
+from credsweeper.credentials.candidate import Candidate
+from credsweeper.credentials.candidate_key import CandidateKey
+from credsweeper.utils.util import Util
 
 logger = logging.getLogger(__name__)
 

credsweeper/rules/__init__.py

@@ -1 +0,0 @@
-from credsweeper.rules.rule import Rule

credsweeper/rules/config.yaml

@@ -209,6 +209,20 @@
     - code
     - doc
 
+- name: Akamai Credentials
+  severity: high
+  confidence: strong
+  type: pattern
+  values:
+    - (?P<value>akab-[0-9a-z]{16}-[0-9a-z]{16})(?!\.[0-9a-z-]{1,80}\.akamaiapis\.net)
+  filter_type: GeneralPattern
+  required_substrings:
+    - akab-
+  min_line_len: 38
+  target:
+    - code
+    - doc
+
 - name: AWS Client ID
   severity: high
   confidence: moderate
@@ -375,16 +389,16 @@
     - code
     - doc
 
-- name: Heroku API Key
+- name: Heroku Credentials
   severity: high
-  confidence: moderate
+  confidence: strong
   type: pattern
   values:
-    - (?i)(?P<value>heroku(.{0,20})?[0-9a-f]{8}(-[0-9a-f]{4})+-[0-9a-f]{12})(?![0-9A-Za-z_-])
+    - (?P<value>HRKU-([0-9A-Za-z_-]{60}|[0-9A-Fa-f]{8}(-[0-9A-Fa-f]{4}){3}-[0-9A-Fa-f]{12}))
   filter_type: GeneralPattern
   required_substrings:
-    - heroku
-  min_line_len: 24
+    - HRKU-
+  min_line_len: 41
   target:
     - code
     - doc
@@ -413,7 +427,49 @@
     - ValueJsonWebTokenCheck
   required_substrings:
     - eyJ
-  min_line_len: 18
+  min_line_len: 64
+  target:
+    - code
+    - doc
+
+- name: JSON Web Key
+  severity: medium
+  confidence: strong
+  type: pattern
+  values:
+    - (?P<value>\b(e(yJ|yAi|woi|wog|w0K)|W(yJ|3si|wp7|wog|w0K|3sK))[0-9A-Za-z_+/-]{60,8000})
+  filter_type:
+    - ValueJsonWebKeyCheck
+  required_substrings:
+    - eyJ
+    - eyAi
+    - ewoi
+    - ewog
+    - ew0K
+    - WyJ
+    - W3si
+    - Wwp7
+    - Wwog
+    - Ww0K
+    - W3sK
+  min_line_len: 64
+  target:
+    - code
+    - doc
+
+- name: JWK
+  severity: medium
+  confidence: moderate
+  type: multi
+  values:
+    - (?P<value>['"]?\b(?P<variable>kty)[^0-9A-Za-z_-]{1,8}(RSA|EC|oct)\b['"]?)
+    - (?P<variable>\b[dk])[^0-9A-Za-z_-]{1,8}(?P<value>[0-9A-Za-z_-]{22,8000})(?![=0-9A-Za-z_-])
+  filter_type:
+    - ValuePatternCheck
+    - ValueCoupleKeywordCheck(3)
+  required_substrings:
+    - kty
+  min_line_len: 8
   target:
     - code
     - doc
@@ -1234,6 +1290,23 @@
     - code
     - doc
 
+- name: Docker Access Token
+  severity: high
+  confidence: strong
+  type: pattern
+  values:
+    - (?P<value>dckr_[op]at_[0-9A-Za-z_-]{27,32})
+  min_line_len: 36
+  filter_type:
+    - ValuePatternCheck
+    - ValueEntropyBase64Check
+  required_substrings:
+    - dckr_pat_
+    - dckr_oat_
+  target:
+    - code
+    - doc
+
 - name: Docker Swarm Token
   severity: high
   confidence: strong
@@ -1392,45 +1465,61 @@
     - code
     - doc
 
-- name: API
+- name: Basic Authorization
+  severity: medium
+  confidence: strong
+  type: pattern
+  values:
+    - (?P<variable>(?i:basic))(?P<separator>\s+)(?P<value>[=0-9A-Za-z_/+-]{8,8000})(?![0-9A-Za-z_/+-])
+  min_line_len: 18
+  filter_type:
+    - ValueBasicAuthCheck
+  required_substrings:
+    - basic
+  target:
+    - code
+    - doc
+
+- name: Bearer Authorization
   severity: medium
   confidence: moderate
-  type: keyword
+  type: pattern
   values:
-    - api(?!tal)
+    - (?P<variable>(?i:bearer|ntlm))(?P<separator>\s+)(?P<value>[.0-9A-Za-z_/+-]{32,8000}=*)(?![0-9A-Za-z_/+-])
+  min_line_len: 37
   filter_type: GeneralKeyword
-  use_ml: true
-  min_line_len: 11
   required_substrings:
-    - api
+    - bearer
+    - ntlm
   target:
     - code
+    - doc
 
-- name: Auth
-  severity: medium
+- name: API
+  severity: low
   confidence: moderate
   type: keyword
   values:
-    - auth(?!ors?(?!i[tz]))
+    - api(?!tal)
   filter_type: GeneralKeyword
   use_ml: true
-  min_line_len: 12
+  min_line_len: 11
   required_substrings:
-    - auth
+    - api
   target:
     - code
 
-- name: Certificate
+- name: Auth
   severity: medium
   confidence: moderate
   type: keyword
   values:
-    - cert
+    - auth(?!ors?(?!i[tz]))
   filter_type: GeneralKeyword
   use_ml: true
   min_line_len: 12
   required_substrings:
-    - cert
+    - auth
   target:
     - code
 
@@ -1449,7 +1538,7 @@
     - code
 
 - name: Key
-  severity: medium
+  severity: high
   confidence: moderate
   type: keyword
   values:
@@ -1463,7 +1552,7 @@
     - code
 
 - name: Nonce
-  severity: medium
+  severity: low
   confidence: moderate
   type: keyword
   values:
@@ -1477,7 +1566,7 @@
     - code
 
 - name: Password
-  severity: medium
+  severity: high
   confidence: moderate
   type: keyword
   values:
@@ -1492,7 +1581,7 @@
     - code
 
 - name: Salt
-  severity: medium
+  severity: low
   confidence: moderate
   type: keyword
   values:
@@ -1520,7 +1609,7 @@
     - code
 
 - name: Token
-  severity: medium
+  severity: high
   confidence: moderate
   type: keyword
   values:

credsweeper/rules/rule.py

@@ -7,9 +7,10 @@ from typing import Dict, List, Optional, Union, Set
 from credsweeper import filters
 from credsweeper.common.constants import RuleType, Severity, MAX_LINE_LENGTH, Confidence
 from credsweeper.common.keyword_pattern import KeywordPattern
-from credsweeper.config import Config
-from credsweeper.filters import Filter, group
-from credsweeper.filters.group import Group
+from credsweeper.config.config import Config
+from credsweeper.filters import group
+from credsweeper.filters.filter import Filter
+from credsweeper.filters.group.group import Group
 
 logger = logging.getLogger(__name__)
 

credsweeper/scanner/__init__.py

@@ -1 +0,0 @@
-from credsweeper.scanner.scanner import Scanner

credsweeper/scanner/scan_type/__init__.py

@@ -1,5 +0,0 @@
-from credsweeper.scanner.scan_type.scan_type import ScanType  # isort:skip
-
-from credsweeper.scanner.scan_type.multi_pattern import MultiPattern
-from credsweeper.scanner.scan_type.pem_key_pattern import PemKeyPattern
-from credsweeper.scanner.scan_type.single_pattern import SinglePattern

credsweeper/scanner/scan_type/multi_pattern.py

@@ -1,11 +1,11 @@
 from typing import List
 
 from credsweeper.common.constants import RuleType
-from credsweeper.config import Config
-from credsweeper.credentials import Candidate
+from credsweeper.config.config import Config
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.rules import Rule
-from credsweeper.scanner.scan_type import ScanType
+from credsweeper.rules.rule import Rule
+from credsweeper.scanner.scan_type.scan_type import ScanType
 
 
 class MultiPattern(ScanType):
@@ -37,8 +37,7 @@ class MultiPattern(ScanType):
             "Rules provided to MultiPattern.run should have pattern_type equal to MULTI_PATTERN"
 
         candidates = cls._get_candidates(config, rule, target)
-        if not candidates:
-            return candidates
+
         for candidate in candidates:
             line_pos_margin = 1
             while line_pos_margin <= cls.MAX_SEARCH_MARGIN:

credsweeper/scanner/scan_type/pem_key_pattern.py

@@ -2,11 +2,11 @@ import logging
 from typing import List
 
 from credsweeper.common.constants import RuleType
-from credsweeper.config import Config
-from credsweeper.credentials import Candidate
+from credsweeper.config.config import Config
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.rules import Rule
-from credsweeper.scanner.scan_type import ScanType
+from credsweeper.rules.rule import Rule
+from credsweeper.scanner.scan_type.scan_type import ScanType
 from credsweeper.utils.pem_key_detector import PemKeyDetector
 
 logger = logging.getLogger(__name__)

credsweeper/scanner/scan_type/scan_type.py

@@ -4,11 +4,11 @@ from abc import ABC, abstractmethod
 from typing import List
 
 from credsweeper.common.constants import RuleType, MIN_DATA_LEN
-from credsweeper.config import Config
-from credsweeper.credentials import Candidate, LineData
+from credsweeper.config.config import Config
+from credsweeper.credentials.candidate import Candidate, LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.filters import Filter
-from credsweeper.rules import Rule
+from credsweeper.filters.filter import Filter
+from credsweeper.rules.rule import Rule
 
 logger = logging.getLogger(__name__)
 

credsweeper/scanner/scan_type/single_pattern.py

@@ -1,10 +1,10 @@
 from typing import List
 
-from credsweeper.config import Config
-from credsweeper.credentials import Candidate
+from credsweeper.config.config import Config
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.file_handler.analysis_target import AnalysisTarget
-from credsweeper.rules import Rule
-from credsweeper.scanner.scan_type import ScanType
+from credsweeper.rules.rule import Rule
+from credsweeper.scanner.scan_type.scan_type import ScanType
 
 
 class SinglePattern(ScanType):

credsweeper/scanner/scanner.py

@@ -6,13 +6,16 @@ from typing import List, Type, Tuple, Union, Dict, Generator, Set
 from credsweeper.app import APP_PATH
 from credsweeper.common.constants import RuleType, MIN_VARIABLE_LENGTH, MIN_SEPARATOR_LENGTH, MIN_VALUE_LENGTH, \
     MAX_LINE_LENGTH, PEM_BEGIN_PATTERN
-from credsweeper.config import Config
-from credsweeper.credentials import Candidate
+from credsweeper.config.config import Config
+from credsweeper.credentials.candidate import Candidate
 from credsweeper.file_handler.analysis_target import AnalysisTarget
 from credsweeper.file_handler.content_provider import ContentProvider
-from credsweeper.rules import Rule
-from credsweeper.scanner.scan_type import PemKeyPattern, ScanType, SinglePattern, MultiPattern
-from credsweeper.utils import Util
+from credsweeper.rules.rule import Rule
+from credsweeper.scanner.scan_type.multi_pattern import MultiPattern
+from credsweeper.scanner.scan_type.pem_key_pattern import PemKeyPattern
+from credsweeper.scanner.scan_type.scan_type import ScanType
+from credsweeper.scanner.scan_type.single_pattern import SinglePattern
+from credsweeper.utils.util import Util
 
 logger = logging.getLogger(__name__)