Version 2.0.1: fixes for SARIF and Python 3.11

deepsecrets/config.py

@@ -11,7 +11,7 @@
 FALLBACK_PROCESS_COUNT = 4
 
 SCANNER_NAME = "DeepSecrets"
-SCANNER_VERSION = "2.0.0"
+SCANNER_VERSION = "2.0.1"
 SCANNER_VERSION_NUMERIC = [int(subver) for subver in SCANNER_VERSION.split('.')]
 SCANNER_URL = "https://github.com/ntoskernel/deepsecrets"
 

deepsecrets/core/model/response/dojo_sarif.py

@@ -90,8 +90,8 @@ def _sarif_rule_meta_from_rule(self, rule: Rule) -> TierAwareSarifRuleMeta:
         return TierAwareSarifRuleMeta(
             id=f'{base_rule_id}{suffix}',
             payload={
-                'shortDescription': {'text': f'{base_description} ({tier.get('label')} Confidence)'},
-                'properties': {'precision': tier.get('precision'), 'security-severity': tier.get('severity')},
+                'shortDescription': {'text': f'{base_description} ({tier.get("label")} Confidence)'},
+                'properties': {'precision': tier.get("precision"), 'security-severity': tier.get("severity")},
             },
         )
 
@@ -117,13 +117,11 @@ def __init__(self) -> None:
 
     def with_current_mode(self, mode: ScanMode):
         super().with_current_mode(mode)
-        self.report.runs[0].original_uri_base_ids = (
-            {
-                SRC_PATH_BASE_ID: {
-                    'uri': self.mode.config.workdir_path,
-                },
+        self.report.runs[0].original_uri_base_ids = {
+            SRC_PATH_BASE_ID: {
+                'uri': self.mode.config.workdir_path,
             },
-        )
+        }
         return self
 
     def _convert_rules(self, rules: Set[TierAwareSarifRuleMeta]) -> List[ReportingDescriptor]:

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "deepsecrets"
-version = "2.0.0"
-description = "A better tool for secrets search"
+version = "2.0.1"
+description = "A better tool for secrets scanning"
 license = { text = "MIT" }
 readme = "README.md"
 authors = [

tests/output/test_sarif.py

@@ -44,11 +44,16 @@ def test_dojo_sarif(config: Config) -> None:
     findings = mode.run()
     '''
 
-    sarif_response = to_json(
+    sarif_data = (
         DojoSarifResponseBuilder()
         .with_current_mode(mode)
         .with_findings_list(findings)
         .with_masking_enabled(not config.disable_masking)
         .build()
     )
+
+    sarif_response = to_json(sarif_data)
+    assert sarif_data is not None
     assert sarif_response is not None
+
+    assert type(sarif_data.runs[0].original_uri_base_ids) is dict