Skip to content

Conversation

@PoojasPatel013
Copy link
Contributor

Closes #13555

I have applied logic to filters.py, where OR logic is present. Review and address any required revisions.

I have kept the existing code as is, so there are now two logics for filter OR and AND with label Tags (AND)

I closed the previous PR as there were conflicts when I was asked to change the base, and to resolve those, I committed multiple times, and it looked quite messy.

Test results

Have performed manual verification using the UI with a local development instance:

Screenshot 2025-11-29 163131

Setup: Created findings with various tag combinations (e.g., pci, pentest, and cloud).
Action: Tested the new Tags (AND) filter with pci and pentest..
Result: The new filter works as expected without disrupting the existing functionality.

Documentation
N/A (UI enhancement).

@dryrunsecurity
Copy link

DryRun Security

🔴 Risk threshold exceeded.

This pull request modifies dojo/filters.py, which the scanner flagged as a sensitive edit; sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml. The change is marked at a failing risk threshold but is not set to block the merge.

🔴 Configured Codepaths Edit in dojo/filters.py
Vulnerability Configured Codepaths Edit
Description Sensitive edits detected for this file. Sensitive file paths and allowed authors can be configured in .dryrunsecurity.yaml.

We've notified @mtesauro.


All finding details can be found in the DryRun Security Dashboard.

@valentijnscholten valentijnscholten added this to the 2.53.1 milestone Nov 30, 2025
@valentijnscholten valentijnscholten changed the title Fixes #13555 AND logic not present when filtering Findings via two or more tags UI: Add AND logic for tag filtering Nov 30, 2025
Copy link
Contributor

@mtesauro mtesauro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@mtesauro mtesauro merged commit a88bdee into DefectDojo:bugfix Dec 1, 2025
149 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants