fixes

Author: valentijnscholten

dojo/jira_link/helper.py

@@ -1809,8 +1809,4 @@ def get_finding_group_findings_above_threshold(finding_group):
     if System_Settings.objects.get().jira_minimum_severity:
         jira_minimum_threshold = Finding.get_numerical_severity(System_Settings.objects.get().jira_minimum_severity)
 
-    findings = finding_group.findings.filter(numerical_severity__lte=jira_minimum_threshold)
-    # TODO: JIRA REMOVE
-    logger.error(findings.query)
-    logger.error(f"count: {findings.count()}")
-    return findings
+    return finding_group.findings.filter(numerical_severity__lte=jira_minimum_threshold)

run-unittest.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-set -x
-
 unset TEST_CASE
 
 bash ./docker/docker-compose-check.sh
@@ -55,4 +53,4 @@ echo "Running docker compose unit tests with test case $TEST_CASE ..."
 # Compose V2 integrates compose functions into the Docker platform, continuing to support
 # most of the  previous docker-compose features and flags. You can run Compose V2 by
 # replacing the hyphen (-) with a space, using docker compose, instead of docker-compose.
-docker compose exec -e JIRA_PAT_DD=$JIRA_PAT_DD=$JIRA_PAT_DD=$JIRA_PAT_DD uwsgi bash -c "python manage.py test $TEST_CASE -v2 --keepdb --failfast"
+docker compose exec uwsgi bash -c "python manage.py test $TEST_CASE -v2 --keepdb"

unittests/test_jira_import_and_pushing_api.py

@@ -76,6 +76,8 @@ def setUp(self):
         self.client.credentials(HTTP_AUTHORIZATION="Token " + token.key)
         self.zap_sample5_filename = get_unit_tests_scans_path("zap") / "5_zap_sample_one.xml"
         self.npm_groups_sample_filename = get_unit_tests_scans_path("npm_audit") / "many_vuln_with_groups.json"
+        self.npm_groups_sample_filename2 = get_unit_tests_scans_path("npm_audit") / "many_vuln_with_groups_different_titles.json"
+        self.clair_few_findings = get_unit_tests_scans_path("clair") / "clair_few_vuln.json"
         self.client.force_login(self.get_test_admin())
 
     def test_import_no_push_to_jira(self):
@@ -649,51 +651,58 @@ def test_import_with_push_to_jira_update_tags(self):
 
     @toggle_system_setting_boolean("enforce_verified_status", True)  # noqa: FBT003
     @toggle_system_setting_boolean("enforce_verified_status_jira", True)  # noqa: FBT003
+    @with_system_setting("jira_minimum_severity", "Low")
     def test_import_with_push_to_jira_not_verified_enforced_verified_globally_true_enforced_verified_jira_true(self):
         import0 = self.import_scan_with_params(self.zap_sample5_filename, push_to_jira=True, verified=False)
         test_id = import0["test"]
         # This scan file has two active findings, so we should not push either of them
-        self.assert_jira_group_issue_count_in_test(test_id, 0)
+        self.assert_jira_issue_count_in_test(test_id, 0)
 
-        import0 = self.import_scan_with_params(self.zap_sample5_filename, push_to_jira=True, verified=True)
+        # Verfied findings should be pushed, different scan to avoid dedupe interference
+        import0 = self.import_scan_with_params(self.clair_few_findings, scan_type="Clair Scan", push_to_jira=True, verified=True)
         test_id = import0["test"]
-        self.assert_jira_group_issue_count_in_test(test_id, 2)
+        self.assert_jira_issue_count_in_test(test_id, 4)
 
         # by asserting full cassette is played we know all calls to JIRA have been made as expected
         self.assert_cassette_played()
 
     @toggle_system_setting_boolean("enforce_verified_status", True)  # noqa: FBT003
     @toggle_system_setting_boolean("enforce_verified_status_jira", False)  # noqa: FBT003
+    @with_system_setting("jira_minimum_severity", "Low")
     def test_import_with_push_to_jira_not_verified_enforced_verified_globally_true_enforced_verified_jira_false(self):
         import0 = self.import_scan_with_params(self.zap_sample5_filename, push_to_jira=True, verified=False)
         test_id = import0["test"]
         # This scan file has two active findings, so we should not push either of them
         self.assert_jira_issue_count_in_test(test_id, 0)
 
-        import0 = self.import_scan_with_params(self.zap_sample5_filename, push_to_jira=True, verified=True)
+        # Verfied findings should be pushed, different scan to avoid dedupe interference
+        import0 = self.import_scan_with_params(self.clair_few_findings, scan_type="Clair Scan", push_to_jira=True, verified=True)
         test_id = import0["test"]
-        self.assert_jira_issue_count_in_test(test_id, 2)
+        self.assert_jira_issue_count_in_test(test_id, 4)
         # by asserting full cassette is played we know all calls to JIRA have been made as expected
 
         self.assert_cassette_played()
 
     @toggle_system_setting_boolean("enforce_verified_status", False)  # noqa: FBT003
     @toggle_system_setting_boolean("enforce_verified_status_jira", True)  # noqa: FBT003
+    @with_system_setting("jira_minimum_severity", "Low")
     def test_import_with_push_to_jira_not_verified_enforced_verified_globally_false_enforced_verified_jira_true(self):
         import0 = self.import_scan_with_params(self.zap_sample5_filename, push_to_jira=True, verified=False)
         test_id = import0["test"]
         # This scan file has two active findings, so we should not push either of them
         self.assert_jira_issue_count_in_test(test_id, 0)
 
-        import0 = self.import_scan_with_params(self.zap_sample5_filename, push_to_jira=True, verified=True)
+        # Verfied findings should be pushed, different scan to avoid dedupe interference
+        import0 = self.import_scan_with_params(self.clair_few_findings, scan_type="Clair Scan", push_to_jira=True, verified=True)
         test_id = import0["test"]
-        self.assert_jira_issue_count_in_test(test_id, 2)
+        self.assert_jira_issue_count_in_test(test_id, 4)
 
         # by asserting full cassette is played we know all calls to JIRA have been made as expected
         self.assert_cassette_played()
 
     @toggle_system_setting_boolean("enforce_verified_status", False)  # noqa: FBT003
     @toggle_system_setting_boolean("enforce_verified_status_jira", False)  # noqa: FBT003
+    @with_system_setting("jira_minimum_severity", "Low")
     def test_import_with_push_to_jira_not_verified_enforced_verified_globally_false_enforced_verified_jira_false(self):
         import0 = self.import_scan_with_params(self.zap_sample5_filename, push_to_jira=True, verified=False)
         test_id = import0["test"]
@@ -710,7 +719,7 @@ def test_groups_import_with_push_to_jira_not_verified_enforced_verified_globally
         # No verified findings, means no groups pushed to JIRA
         self.assert_jira_group_issue_count_in_test(test_id, 0)
 
-        import0 = self.import_scan_with_params(self.npm_groups_sample_filename, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
+        import0 = self.import_scan_with_params(self.npm_groups_sample_filename2, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
         test_id = import0["test"]
         self.assert_jira_group_issue_count_in_test(test_id, 3)
 
@@ -725,7 +734,7 @@ def test_groups_import_with_push_to_jira_not_verified_enforced_verified_globally
         # No verified findings, means no groups pushed to JIRA
         self.assert_jira_group_issue_count_in_test(test_id, 0)
 
-        import0 = self.import_scan_with_params(self.npm_groups_sample_filename, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
+        import0 = self.import_scan_with_params(self.npm_groups_sample_filename2, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
         test_id = import0["test"]
         self.assert_jira_group_issue_count_in_test(test_id, 3)
         # by asserting full cassette is played we know all calls to JIRA have been made as expected
@@ -740,7 +749,7 @@ def test_groups_import_with_push_to_jira_not_verified_enforced_verified_globally
         # No verified findings, means no groups pushed to JIRA
         self.assert_jira_group_issue_count_in_test(test_id, 0)
 
-        import0 = self.import_scan_with_params(self.npm_groups_sample_filename, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
+        import0 = self.import_scan_with_params(self.npm_groups_sample_filename2, scan_type="NPM Audit Scan", group_by="component_name+component_version", push_to_jira=True, verified=True)
         test_id = import0["test"]
         self.assert_jira_group_issue_count_in_test(test_id, 3)