Merge branch 'main' into awsm

Author: babenek

constants.py

@@ -6,4 +6,6 @@
 OTHER_CATEGORY = "Other"
 PRIVATE_KEY_CATEGORY = "PEM Private Key"
 # the rules may have multiline markup and should be skipped for single line obfuscation
-MULTI_PATTERN_RULES = ("AWS Multi", "Google Multi", "JWK", OTHER_CATEGORY, PRIVATE_KEY_CATEGORY)
+MULTI_PATTERN_RULES = ("AWS Multi", "Google Multi", "JWK")
+# the rules may be multiline
+MULTI_LINE_RULES = MULTI_PATTERN_RULES + (OTHER_CATEGORY, PRIVATE_KEY_CATEGORY)

review_data.py

@@ -18,7 +18,7 @@
 
 from colorama import Fore, Back, Style
 
-from constants import LABEL_OTHER, LABEL_FALSE, LABEL_TRUE, MULTI_PATTERN_RULES, OTHER_CATEGORY
+from constants import LABEL_OTHER, LABEL_FALSE, LABEL_TRUE, OTHER_CATEGORY, MULTI_LINE_RULES
 from meta_cred import MetaCred
 from meta_row import read_meta, MetaRow
 
@@ -201,7 +201,7 @@ def review(meta_dir: str,
                 print(f"Too long for Password TRUE markup!\n{row}", flush=True)
                 errors += 1
 
-        if row.LineStart != row.LineEnd and not any(x in row.Category.split(':') for x in MULTI_PATTERN_RULES) and  'Multi' not in row.Category :
+        if row.LineStart != row.LineEnd and not any(x in row.Category.split(':') for x in MULTI_LINE_RULES):
             print(f"Check multiline markup - may be not suitable for the category!\n{row}", flush=True)
             errors += 1