Skip to content

fix(engine): allow excluding OpenAPI queries by their override (version-specific) IDs #7977

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

Open
cx-ori-bendet wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −2
Open

fix(engine): allow excluding OpenAPI queries by their override (version-specific) IDs #7977

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
18 changes: 16 additions & 2 deletions pkg/engine/source/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,22 @@ func checkQueryExcludeField(id interface{}, excludeQueries []string) bool {
}

func checkQueryExclude(metadata map[string]interface{}, queryParameters *QueryInspectorParameters) bool {
return checkQueryExcludeField(metadata["id"], queryParameters.ExcludeQueries.ByIDs) ||
checkQueryExcludeField(metadata["category"], queryParameters.ExcludeQueries.ByCategories) ||
if checkQueryExcludeField(metadata["id"], queryParameters.ExcludeQueries.ByIDs) {
return true
}

// Also check override IDs (e.g. OpenAPI queries with version-specific variants like Swagger 2.0)
if override, ok := metadata["override"].(map[string]interface{}); ok {
for _, overrideData := range override {
if overrideObj, ok := overrideData.(map[string]interface{}); ok {
if checkQueryExcludeField(overrideObj["id"], queryParameters.ExcludeQueries.ByIDs) {
return true
}
}
}
}

return checkQueryExcludeField(metadata["category"], queryParameters.ExcludeQueries.ByCategories) ||
checkQueryExcludeField(metadata["severity"], queryParameters.ExcludeQueries.BySeverities) ||
(!queryParameters.BomQueries && metadata["severity"] == model.SeverityTrace)
}
Expand Down
Loading