Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Import: leverage the minimum severity flag #10550

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Import: leverage the minimum severity flag #10550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dojo/importers/default_importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def process_findings(
# make sure the severity is something is digestible
unsaved_finding = self.sanitize_severity(unsaved_finding)
# Filter on minimum severity if applicable
if (minimum_severity := kwargs.get("minimum_severity")) and (Finding.SEVERITIES[unsaved_finding.severity] > Finding.SEVERITIES[minimum_severity]):
if Finding.SEVERITIES[unsaved_finding.severity] > Finding.SEVERITIES[self.minimum_severity]:
# finding's severity is below the configured threshold : ignoring the finding
continue

Expand Down
2 changes: 1 addition & 1 deletion dojo/importers/default_reimporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def process_findings(
# make sure the severity is something is digestible
unsaved_finding = self.sanitize_severity(unsaved_finding)
# Filter on minimum severity if applicable
if (minimum_severity := kwargs.get("minimum_severity")) and (Finding.SEVERITIES[unsaved_finding.severity] > Finding.SEVERITIES[minimum_severity]):
if Finding.SEVERITIES[unsaved_finding.severity] > Finding.SEVERITIES[self.minimum_severity]:
# finding's severity is below the configured threshold : ignoring the finding
continue
# Some parsers provide "mitigated" field but do not set timezone (because they are probably not available in the report)
Expand Down
4 changes: 3 additions & 1 deletion unittests/dojo_test_case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ def patch_finding_api(self, finding_id, finding_details, push_to_jira=None):
def assert_finding_count_json(self, count, findings_content_json):
self.assertEqual(findings_content_json['count'], count)

def get_test_findings_api(self, test_id, active=None, verified=None, is_mitigated=None, component_name=None, component_version=None):
def get_test_findings_api(self, test_id, active=None, verified=None, is_mitigated=None, component_name=None, component_version=None, severity=None):
payload = {'test': test_id}
if active is not None:
payload['active'] = active
Expand All @@ -660,6 +660,8 @@ def get_test_findings_api(self, test_id, active=None, verified=None, is_mitigate
payload['component_name'] = component_name
if component_version is not None:
payload['component_version'] = component_version
if severity is not None:
payload['severity'] = severity

response = self.client.get(reverse('finding-list'), payload, format='json')
self.assertEqual(200, response.status_code, response.content[:1000])
Expand Down
23 changes: 23 additions & 0 deletions unittests/test_import_reimport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,29 @@ def test_import_sonar1_reimport_sonar1_active_not_verified(self):
# reimporting the exact same scan shouldn't create any notes
self.assertEqual(notes_count_before, self.db_notes_count())

# Test the minimum severity flag
def test_import_sonar1_measure_minimum_severity_counts(self):
# Critical
response_json = self.import_scan_with_params(self.sonarqube_file_name1, scan_type=self.scan_type_sonarqube_detailed, minimum_severity="Critical")
test_id = response_json['test']
# Count all findings
self.assert_finding_count_json(3, self.get_test_findings_api(test_id))
self.assert_finding_count_json(3, self.get_test_findings_api(test_id, severity="Critical"))

# High
response_json = self.import_scan_with_params(self.sonarqube_file_name1, scan_type=self.scan_type_sonarqube_detailed, minimum_severity="High")
test_id = response_json['test']
# Count all findings
self.assert_finding_count_json(4, self.get_test_findings_api(test_id))
self.assert_finding_count_json(1, self.get_test_findings_api(test_id, severity="High"))

# Low
response_json = self.import_scan_with_params(self.sonarqube_file_name1, scan_type=self.scan_type_sonarqube_detailed, minimum_severity="Low")
test_id = response_json['test']
# Count all findings
self.assert_finding_count_json(6, self.get_test_findings_api(test_id))
self.assert_finding_count_json(2, self.get_test_findings_api(test_id, severity="Low"))

# Test re-import with unique_id_from_tool_or_hash_code algorithm
# import veracode_many_findings and then reimport veracode_many_findings again with verified is false
# - reimport, findings stay the same, stay active
Expand Down
Loading