Skip to content

[WIP] (fix) scan compare between diff registry account #1851

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[WIP] (fix) scan compare between diff registry account #1851

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e489a16
(fix) scan compare between diff registry account
Dec 22, 2023
3c64a33
fix scan diff for cloud compliance scans
Dec 26, 2023
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
37 changes: 28 additions & 9 deletions deepfence_server/reporters/scan/scan_reporters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,19 +694,38 @@ func GetScanResultDiff[T any](ctx context.Context, scanType utils.Neo4jScanType,
}

query = `
MATCH (m:` + string(scanType) + `{node_id: $base_scan_id}) -[r:DETECTED]-> (d2)
WITH collect(d2) as dset
MATCH (n:` + string(scanType) + `{node_id: $compare_to_scan_id}) -[r:DETECTED]-> (d)
WHERE NOT d in dset
MATCH (m:` + string(scanType) + `{node_id: $compare_to_scan_id}) -[r:DETECTED]-> (d2) -[:IS]-> (rule2)
WITH collect(rule2) as rset
MATCH (n:` + string(scanType) + `{node_id: $base_scan_id}) -[r:DETECTED]-> (d) -[:IS]-> (rule)
WHERE NOT rule in rset
OPTIONAL MATCH (d) -[:IS]-> (e)
OPTIONAL MATCH (n) -[:SCANNED]-> (f)
OPTIONAL MATCH (c:ContainerImage{node_id: f.docker_image_id}) -[:ALIAS] ->(t) -[ma:MASKED]-> (d)
WITH apoc.map.merge( e{.*},
d{.*, masked: coalesce(d.masked or r.masked or e.masked or head(collect(ma.masked)), false),
name: coalesce(e.name, d.name, '')}) AS d` +
reporters.ParseFieldFilters2CypherWhereConditions("d", mo.Some(ff), true) +
ffCondition + ` RETURN d ` +
UNWIND rule as rl
MATCH (rl) <-[:IS]- (d1) <-[r:DETECTED]- ({node_id: $base_scan_id})
WITH apoc.map.merge( e{.*},
d1{.*, masked: coalesce(d1.masked or r.masked or e.masked or head(collect(ma.masked)), false),
name: coalesce(e.name, d1.name, '')}) AS d1` +
reporters.ParseFieldFilters2CypherWhereConditions("d1", mo.Some(ff), true) +
ffCondition + ` RETURN d1 ` +
fw.FetchWindow2CypherQuery()

// for cloud compliance scan, there is no such relation as "IS" between the rule and the detected resource
if scanType == utils.NEO4JCloudComplianceScan {
query = `
MATCH (m:` + string(scanType) + `{node_id: $base_scan_id}) -[r:DETECTED]-> (d2)
WITH collect(d2) as dset
MATCH (n:` + string(scanType) + `{node_id: $compare_to_scan_id}) -[r:DETECTED]-> (d)
WHERE NOT d in dset
OPTIONAL MATCH (d) -[:IS]-> (e)
OPTIONAL MATCH (n) -[:SCANNED]-> (f)
WITH apoc.map.merge( e{.*},
d{.*, masked: coalesce(d.masked or r.masked or e.masked, false),
name: coalesce(e.name, d.name, '')}) AS d` +
reporters.ParseFieldFilters2CypherWhereConditions("d", mo.Some(ff), true) +
ffCondition + ` RETURN d ` +
fw.FetchWindow2CypherQuery()
}
log.Debug().Msgf("diff query: %v", query)
nres, err := tx.Run(query,
map[string]interface{}{
Expand Down