Skip to content

Commit 875d96b

Browse files
authored
Merge pull request #179 from safedep/fix/add-guardrails-against-nil-pkg-in-event
chore: Add guard rails against nil pkg in event for JSON report generator
2 parents 273d999 + d63e927 commit 875d96b

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

pkg/analyzer/analyzer.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ type AnalyzerEventType string
1010

1111
const (
1212
ET_FilterExpressionMatched = AnalyzerEventType("ev_pkg_filter_match")
13-
ET_LockfilePoisoningSignal = AnalyzerEventType("ev_lockfile_poisoning")
1413
ET_AnalyzerFailOnError = AnalyzerEventType("ev_fail_on_error")
14+
15+
// Following event types must set the Threat field
16+
ET_LockfilePoisoningSignal = AnalyzerEventType("ev_lockfile_poisoning")
1517
)
1618

1719
type AnalyzerEvent struct {

pkg/reporter/json_report.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ func (r *jsonReportGenerator) handleThreatEvent(event *analyzer.AnalyzerEvent) {
7979
return
8080
}
8181

82+
if event.Threat.SubjectType == jsonreportspec.ReportThreat_Manifest && event.Manifest == nil {
83+
return
84+
}
85+
86+
if event.Threat.SubjectType == jsonreportspec.ReportThreat_Package && event.Package == nil {
87+
return
88+
}
89+
8290
switch event.Threat.SubjectType {
8391
case jsonreportspec.ReportThreat_Manifest:
8492
manifest := r.findPackageManifestReport(event.Manifest)

0 commit comments

Comments
 (0)