Normalize Sonar paths to base directory path (#345)

pixee · Mar 8, 2024 · c7a729a · c7a729a
1 parent 1b43f0b
commit c7a729a
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 12 deletions.
diff --git a/src/codemodder/sonar_results.py b/src/codemodder/sonar_results.py
@@ -3,8 +3,9 @@
 from pathlib import Path
 
 import libcst as cst
-from typing_extensions import Self
+from typing_extensions import Self, override
 
+from codemodder.context import CodemodExecutionContext
 from codemodder.logging import logger
 from codemodder.result import LineInfo, Location, Result, ResultSet
 
@@ -58,3 +59,10 @@ def from_json(cls, json_file: str | Path) -> Self:
         except Exception:
             logger.debug("Could not parse sonar json %s", json_file)
         return cls()
+
+    @override
+    def results_for_rule_and_file(
+        self, context: CodemodExecutionContext, rule_id: str, file: Path
+    ) -> list[Result]:
+        paths_for_rule = self.get(rule_id, {})
+        return paths_for_rule.get(file.relative_to(context.directory), [])
diff --git a/tests/codemods/test_sonar_django_json_response_type.py b/tests/codemods/test_sonar_django_json_response_type.py
@@ -35,7 +35,7 @@ def foo(request):
                 {
                     "rule": "pythonsecurity:S5131",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 7,
                         "endLine": 7,

diff --git a/tests/codemods/test_sonar_django_receiver_on_top.py b/tests/codemods/test_sonar_django_receiver_on_top.py
@@ -33,7 +33,7 @@ def foo():
                 {
                     "rule": "python:S6552",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 5,
                         "endLine": 5,

diff --git a/tests/codemods/test_sonar_exception_without_raise.py b/tests/codemods/test_sonar_exception_without_raise.py
@@ -23,7 +23,7 @@ def test_simple(self, tmpdir):
                 {
                     "rule": "python:S3984",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 2,
                         "endLine": 2,

diff --git a/tests/codemods/test_sonar_fix_assert_tuple.py b/tests/codemods/test_sonar_fix_assert_tuple.py
@@ -25,7 +25,7 @@ def test_simple(self, tmpdir):
                 {
                     "rule": "python:S5905",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 2,
                         "endLine": 2,

diff --git a/tests/codemods/test_sonar_flask_json_response_type.py b/tests/codemods/test_sonar_flask_json_response_type.py
@@ -41,7 +41,7 @@ def foo(request):
                 {
                     "rule": "pythonsecurity:S5131",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 10,
                         "endLine": 10,

diff --git a/tests/codemods/test_sonar_jwt_decode_verify.py b/tests/codemods/test_sonar_jwt_decode_verify.py
@@ -43,7 +43,7 @@ def test_simple(self, tmpdir):
                 {
                     "rule": "python:S5659",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 11,
                         "endLine": 11,
@@ -54,7 +54,7 @@ def test_simple(self, tmpdir):
                 {
                     "rule": "python:S5659",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 12,
                         "endLine": 12,

diff --git a/tests/codemods/test_sonar_literal_or_new_object_identity.py b/tests/codemods/test_sonar_literal_or_new_object_identity.py
@@ -25,7 +25,7 @@ def test_list(self, tmpdir):
                 {
                     "rule": "python:S5796",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 2,
                         "endLine": 2,

diff --git a/tests/codemods/test_sonar_numpy_nan_equality.py b/tests/codemods/test_sonar_numpy_nan_equality.py
@@ -27,7 +27,7 @@ def test_simple(self, tmpdir):
                 {
                     "rule": "python:S6725",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 3,
                         "endLine": 3,

diff --git a/tests/codemods/test_sonar_remove_assertion_in_pytest_raises.py b/tests/codemods/test_sonar_remove_assertion_in_pytest_raises.py
@@ -33,7 +33,7 @@ def foo():
                 {
                     "rule": "python:S5915",
                     "status": "OPEN",
-                    "component": f"{tmpdir / 'code.py'}",
+                    "component": "code.py",
                     "textRange": {
                         "startLine": 6,
                         "endLine": 6,

diff --git a/tests/samples/sonar_issues.json b/tests/samples/sonar_issues.json