Skip to content
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

Organisation Scan Start on children #1611

Merged
merged 6 commits into from
Sep 25, 2023
Merged

Organisation Scan Start on children #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fce095e
#1605 start compliance scan for org on children
saurabh2253 Sep 25, 2023
3cfc704
conditional iteration
saurabh2253 Sep 25, 2023
e4f8e5d
fix
saurabh2253 Sep 25, 2023
ec381b5
adding logs
saurabh2253 Sep 25, 2023
4e7f4fb
log
saurabh2253 Sep 25, 2023
2bd0f94
reverting logs
saurabh2253 Sep 25, 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
2 changes: 1 addition & 1 deletion deepfence_server/handler/scan_reports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ func (h *Handler) StartComplianceScanHandler(w http.ResponseWriter, r *http.Requ
return
}
} else {
nodes = reqs.NodeIds
nodes = cloudNodeIds
}

var scanTrigger model.NodeIdentifier
Expand Down
31 changes: 28 additions & 3 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 @@ -416,8 +416,8 @@ func GetCloudAccountIDs(ctx context.Context, cloudProviderIds []model.NodeIdenti

nres, err := tx.Run(`
MATCH (n:CloudNode)
WHERE n.cloud_provider IN $node_ids
RETURN n.node_id`,
WHERE n.node_id IN $node_ids
RETURN n.node_id, n.cloud_provider`,
map[string]interface{}{"node_ids": NodeIdentifierToIdList(cloudProviderIds)})
if err != nil {
return res, err
Expand All @@ -427,13 +427,38 @@ func GetCloudAccountIDs(ctx context.Context, cloudProviderIds []model.NodeIdenti
if err != nil {
return res, err
}

orgNodeIds := []string{}
for _, rec := range recs {
cloudProvider := rec.Values[1].(string)
if cloudProvider == model.PostureProviderAWSOrg || cloudProvider == model.PostureProviderGCPOrg {
orgNodeIds = append(orgNodeIds, rec.Values[0].(string))
continue
}
res = append(res, model.NodeIdentifier{
NodeId: rec.Values[0].(string),
NodeType: controls.ResourceTypeToString(controls.CloudAccount),
})
}
if len(orgNodeIds) > 0 {
nres, err = tx.Run(`
MATCH (n:CloudNode) -[:IS_CHILD] -> (m)
WHERE n.node_id IN $node_ids
RETURN m.node_id`,
map[string]interface{}{"node_ids": orgNodeIds})
if err != nil {
return res, err
}
recs, err = nres.Collect()
if err != nil {
return res, err
}
for _, rec := range recs {
res = append(res, model.NodeIdentifier{
NodeId: rec.Values[0].(string),
NodeType: controls.ResourceTypeToString(controls.CloudAccount),
})
}
}

return res, nil
}
Expand Down