Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/base_importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def sync_process_findings(
Processes findings in a synchronous manner such that all findings
will be processed in a worker/process/thread
"""
return self.process_findings(parsed_findings, sync=True, **kwargs)
return self.process_findings(parsed_findings, **kwargs)

def determine_process_method(
self,
Expand Down
4 changes: 0 additions & 4 deletions dojo/importers/default_importer.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from django.conf import settings
from django.core.files.uploadedfile import TemporaryUploadedFile
from django.core.serializers import serialize
from django.db.models.query_utils import Q
from django.urls import reverse

Expand Down Expand Up @@ -300,9 +299,6 @@ def process_findings(
# Always perform an initial grading, even though it might get overwritten later.
perform_product_grading(self.test.engagement.product)

sync = kwargs.get("sync", True)
if not sync:
return [serialize("json", [finding]) for finding in new_findings]
return new_findings

def close_old_findings(
Expand Down
25 changes: 1 addition & 24 deletions dojo/importers/default_reimporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from django.conf import settings
from django.core.files.uploadedfile import TemporaryUploadedFile
from django.core.serializers import serialize
from django.db.models.query_utils import Q

import dojo.finding.helper as finding_helper
Expand Down Expand Up @@ -1013,29 +1012,7 @@ def process_results(
self,
**kwargs: dict,
) -> tuple[list[Finding], list[Finding], list[Finding], list[Finding]]:
"""
Determine how to to return the results based on whether the process was
ran asynchronous or not
"""
if not kwargs.get("sync"):
serialized_new_items = [
serialize("json", [finding]) for finding in self.new_items
]
serialized_reactivated_items = [
serialize("json", [finding]) for finding in self.reactivated_items
]
serialized_to_mitigate = [
serialize("json", [finding]) for finding in self.to_mitigate
]
serialized_untouched = [
serialize("json", [finding]) for finding in self.untouched
]
return (
serialized_new_items,
serialized_reactivated_items,
serialized_to_mitigate,
serialized_untouched,
)
"""Return the finding lists collected during process_findings."""
return self.new_items, self.reactivated_items, self.to_mitigate, self.untouched

def calculate_unsaved_finding_hash_code(
Expand Down