add content to dataflow

Bearer · Nov 15, 2024 · 5d30fdc · 5d30fdc
1 parent 995f697
commit 5d30fdc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/pkg/report/output/dataflow/risks/risks.go b/pkg/report/output/dataflow/risks/risks.go
@@ -85,6 +85,7 @@ func (holder *Holder) AddRiskPresence(detection detections.Detection) {
 			StartColumnNumber: *detection.Source.StartColumnNumber,
 			EndLineNumber:     *detection.Source.EndLineNumber,
 			EndColumnNumber:   *detection.Source.EndColumnNumber,
+			Content:           &content,
 		}
 	} else {
 		// parent can be nil
@@ -194,7 +195,7 @@ func (holder *Holder) addDatatype(
 	// create datatype source entry if it doesn't exist
 	sourceKey := "undefined_source"
 	if schema.Source != nil {
-		sourceKey = schema.Source.Content
+		sourceKey = *schema.Source.Content
 	}
 
 	if _, exists := line.source[sourceKey]; !exists {

diff --git a/pkg/report/schema/datatype/datatype.go b/pkg/report/schema/datatype/datatype.go
@@ -211,7 +211,9 @@ func dataTypeToSchema[D DataTypable](report detections.ReportDetection, detectio
 		var sourceSchema *schema.Source
 
 		if parent != nil {
+			parentContent := parent.Content()
 			sourceSchema = &schema.Source{
+				Content:           &parentContent,
 				StartLineNumber:   parent.StartLineNumber(),
 				StartColumnNumber: parent.StartColumnNumber(),
 				EndLineNumber:     parent.EndLineNumber(),

diff --git a/pkg/report/schema/schema.go b/pkg/report/schema/schema.go
@@ -33,11 +33,11 @@ type Schema struct {
 
 type Source struct {
 	// This is the starting line number, the very beginning of what's used by the custom detection
-	StartLineNumber   int    `json:"start_line_number,omitempty" yaml:"start_line_number,omitempty"`
-	StartColumnNumber int    `json:"start_column_number,omitempty" yaml:"start_column_number,omitempty"`
-	EndLineNumber     int    `json:"end_line_number,omitempty" yaml:"end_line_number,omitempty"`
-	EndColumnNumber   int    `json:"end_column_number,omitempty" yaml:"end_column_number,omitempty"`
-	Content           string `json:"content,omitempty" yaml:"content,omitempty"`
+	StartLineNumber   int     `json:"start_line_number,omitempty" yaml:"start_line_number,omitempty"`
+	StartColumnNumber int     `json:"start_column_number,omitempty" yaml:"start_column_number,omitempty"`
+	EndLineNumber     int     `json:"end_line_number,omitempty" yaml:"end_line_number,omitempty"`
+	EndColumnNumber   int     `json:"end_column_number,omitempty" yaml:"end_column_number,omitempty"`
+	Content           *string `json:"content,omitempty" yaml:"content,omitempty"`
 }
 
 type ReportSchema interface {

diff --git a/pkg/scanner/scanner.go b/pkg/scanner/scanner.go
@@ -65,6 +65,7 @@ func (scanner *Scanner) Scan(
 		}
 
 		for _, detection := range expectedDetections {
+			value := ""
 			detectorType := detectors.Type(detection.RuleID)
 			report.AddDetection(reportdetections.TypeExpectedDetection,
 				detectorType,
@@ -82,7 +83,7 @@ func (scanner *Scanner) Scan(
 					EndLineNumber:     detection.MatchNode.ContentEnd.Line,
 					StartColumnNumber: detection.MatchNode.ContentStart.Column,
 					EndColumnNumber:   detection.MatchNode.ContentEnd.Column,
-					Content:           "",
+					Content:           &value,
 				})
 		}
 
@@ -113,7 +114,7 @@ func (scanner *Scanner) Scan(
 						EndLineNumber:     detection.MatchNode.ContentEnd.Line,
 						StartColumnNumber: detection.MatchNode.ContentStart.Column,
 						EndColumnNumber:   detection.MatchNode.ContentEnd.Column,
-						Content:           value,
+						Content:           &value,
 					})
 			}
 
@@ -144,6 +145,8 @@ func reportDatatypeDetection(
 	data := datatypeDetection.Data.(datatype.Data)
 
 	for _, property := range data.Properties {
+		detectionContent := detection.MatchNode.Content()
+
 		report.AddDetection(
 			reportdetections.TypeCustomClassified,
 			detectorType,
@@ -167,7 +170,7 @@ func reportDatatypeDetection(
 					EndLineNumber:     detection.MatchNode.ContentEnd.Line,
 					StartColumnNumber: detection.MatchNode.ContentStart.Column,
 					EndColumnNumber:   detection.MatchNode.ContentEnd.Column,
-					Content:           detection.MatchNode.Content(),
+					Content:           &detectionContent,
 				},
 			},
 		)