Skip to content

Fix service field overwrite issue #13461 #13466

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

Closed
Layyzyy wants to merge 1 commit into from
Closed

Fix service field overwrite issue #13461 #13466

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
4 changes: 2 additions & 2 deletions dojo/importers/default_importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
# scan_date was provided, override value from parser
if self.scan_date_override:
unsaved_finding.date = self.scan_date.date()
if self.service is not None:
if self.service is not None and self.service != "":

Check failure on line 207 in dojo/importers/default_importer.py

View workflow job for this annotation

GitHub Actions / ruff-linting

Ruff (PLC1901) 

dojo/importers/default_importer.py:207:61: PLC1901 `self.service != ""` can be simplified to `self.service` as an empty string is falsey
unsaved_finding.service = self.service

# Force parsers to use unsaved_tags (stored in below after saving)
Expand Down Expand Up @@ -343,7 +343,7 @@
else:
old_findings = old_findings.filter(test__engagement=self.test.engagement)
# Use the service to differentiate further
if self.service is not None:
if self.service is not None and self.service != "":

Check failure on line 346 in dojo/importers/default_importer.py

View workflow job for this annotation

GitHub Actions / ruff-linting

Ruff (PLC1901) 

dojo/importers/default_importer.py:346:57: PLC1901 `self.service != ""` can be simplified to `self.service` as an empty string is falsey
old_findings = old_findings.filter(service=self.service)
else:
old_findings = old_findings.filter(Q(service__isnull=True) | Q(service__exact=""))
Expand Down
Loading