rule fix

Samsung · Aug 2, 2023 · 5f923ef · 5f923ef
1 parent dcb52b9
commit 5f923ef
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 5 deletions.
diff --git a/credsweeper/filters/value_iban_check.py b/credsweeper/filters/value_iban_check.py
@@ -1,12 +1,12 @@
 import contextlib
 
+from schwifty import IBAN
 from schwifty.exceptions import SchwiftyException
 
 from credsweeper.config import Config
 from credsweeper.credentials import LineData
 from credsweeper.file_handler.analysis_target import AnalysisTarget
 from credsweeper.filters import Filter
-from schwifty import IBAN
 
 
 class ValueIbanCheck(Filter):

diff --git a/credsweeper/rules/config.yaml b/credsweeper/rules/config.yaml
@@ -13,7 +13,7 @@
   severity: info
   type: pattern
   values:
-    - (^|[^.0-9A-Za-z_/+-])(?P<value>[A-Z]{2}[A-Z0-9]{14,32})([^=0-9A-Za-z_/+-]|$)
+    - (^|[^0-9A-Za-z])(?P<value>[A-Z]{2}[0-9]{2}[A-Z0-9]{12,30})([^=0-9A-Za-z]|$)
   filter_type:
     - ValueIbanCheck
   min_line_len: 16

diff --git a/setup.py b/setup.py
@@ -17,6 +17,7 @@
     "PyYAML",  #
     "requests",  #
     "scipy",  #
+    "schwifty",  #
     "typing_extensions",  #
     "whatthepatch",  #
     "numpy",  #

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -4,11 +4,11 @@
 SAMPLES_FILES_COUNT: int = 107
 
 # credentials count after scan
-SAMPLES_CRED_COUNT: int = 103
-SAMPLES_CRED_LINE_COUNT: int = 114
+SAMPLES_CRED_COUNT: int = 104
+SAMPLES_CRED_LINE_COUNT: int = 115
 
 # credentials count after post-processing
-SAMPLES_POST_CRED_COUNT: int = 97
+SAMPLES_POST_CRED_COUNT: int = 98
 
 # with option --doc
 SAMPLES_IN_DOC = 86

diff --git a/tests/data/depth_3.json b/tests/data/depth_3.json
@@ -1169,6 +1169,28 @@
             }
         ]
     },
+    {
+        "api_validation": "NOT_AVAILABLE",
+        "ml_validation": "NOT_AVAILABLE",
+        "ml_probability": null,
+        "rule": "IBAN",
+        "severity": "info",
+        "line_data_list": [
+            {
+                "line": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0433\u043e IBAN: https://api.accountants/iban/UA893206490000026007052606100/",
+                "line_num": 3,
+                "path": "tests/samples/iban",
+                "info": "tests/samples/iban|RAW",
+                "value": "UA893206490000026007052606100",
+                "variable": null,
+                "entropy_validation": {
+                    "iterator": "BASE64_CHARS",
+                    "entropy": 2.86575901199594,
+                    "valid": false
+                }
+            }
+        ]
+    },
     {
         "api_validation": "NOT_AVAILABLE",
         "ml_validation": "VALIDATED_KEY",

diff --git a/tests/data/ml_threshold_0.json b/tests/data/ml_threshold_0.json
@@ -1169,6 +1169,28 @@
             }
         ]
     },
+    {
+        "api_validation": "NOT_AVAILABLE",
+        "ml_validation": "NOT_AVAILABLE",
+        "ml_probability": null,
+        "rule": "IBAN",
+        "severity": "info",
+        "line_data_list": [
+            {
+                "line": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0433\u043e IBAN: https://api.accountants/iban/UA893206490000026007052606100/",
+                "line_num": 3,
+                "path": "tests/samples/iban",
+                "info": "",
+                "value": "UA893206490000026007052606100",
+                "variable": null,
+                "entropy_validation": {
+                    "iterator": "BASE64_CHARS",
+                    "entropy": 2.86575901199594,
+                    "valid": false
+                }
+            }
+        ]
+    },
     {
         "api_validation": "NOT_AVAILABLE",
         "ml_validation": "NOT_AVAILABLE",

diff --git a/tests/data/output.json b/tests/data/output.json
@@ -1103,6 +1103,28 @@
             }
         ]
     },
+    {
+        "api_validation": "NOT_AVAILABLE",
+        "ml_validation": "NOT_AVAILABLE",
+        "ml_probability": null,
+        "rule": "IBAN",
+        "severity": "info",
+        "line_data_list": [
+            {
+                "line": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0433\u043e IBAN: https://api.accountants/iban/UA893206490000026007052606100/",
+                "line_num": 3,
+                "path": "tests/samples/iban",
+                "info": "",
+                "value": "UA893206490000026007052606100",
+                "variable": null,
+                "entropy_validation": {
+                    "iterator": "BASE64_CHARS",
+                    "entropy": 2.86575901199594,
+                    "valid": false
+                }
+            }
+        ]
+    },
     {
         "api_validation": "NOT_AVAILABLE",
         "ml_validation": "VALIDATED_KEY",