fix issue #393 by adjusting the default workspace for the source-code

smithy-security · Oct 3, 2024 · 87413c5 · 87413c5
1 parent 49b41f4
commit 87413c5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/components/producers/producer.go b/components/producers/producer.go
@@ -37,7 +37,7 @@ var (
 )
 
 const (
-	sourceDir = "/workspace/output"
+	sourceDir = "/workspace/output/source-code/"
 )
 
 var fileTargetPattern = regexp.MustCompile(`^(.*?:.*?):(.*)$`)
@@ -102,9 +102,9 @@ func WriteDraconOut(
 	source := getSource()
 	cleanIssues := []*draconapiv1.Issue{}
 	for _, iss := range issues {
-		iss.Description = strings.ReplaceAll(iss.Description, sourceDir, ".")
-		iss.Title = strings.ReplaceAll(iss.Title, sourceDir, ".")
-		iss.Target = strings.ReplaceAll(iss.Target, sourceDir, ".")
+		iss.Description = strings.ReplaceAll(iss.Description, sourceDir, "")
+		iss.Title = strings.ReplaceAll(iss.Title, sourceDir, "")
+		iss.Target = strings.ReplaceAll(iss.Target, sourceDir, "")
 		iss.Source = source
 		cleanIssues = append(cleanIssues, iss)
 		slog.Debug(fmt.Sprintf("found issue: %+v\n", iss))

diff --git a/components/producers/producer_test.go b/components/producers/producer_test.go
@@ -59,9 +59,9 @@ func TestWriteDraconOut(t *testing.T) {
 		"dracon-test",
 		[]*v1.Issue{
 			{
-				Target:      "/workspace/output/foobar",
-				Title:       "/workspace/output/barfoo",
-				Description: "/workspace/output/example.yaml",
+				Target:      "/workspace/output/source-code/foobar",
+				Title:       "/workspace/output/source-code/barfoo",
+				Description: "/workspace/output/source-code/example.yaml",
 				Cve:         "123-321",
 			},
 		},
@@ -75,9 +75,9 @@ func TestWriteDraconOut(t *testing.T) {
 	require.NoError(t, proto.Unmarshal(pBytes, &res))
 
 	assert.Equal(t, "dracon-test", res.GetToolName())
-	assert.Equal(t, "./foobar", res.GetIssues()[0].GetTarget())
-	assert.Equal(t, "./barfoo", res.GetIssues()[0].GetTitle())
-	assert.Equal(t, "./example.yaml", res.GetIssues()[0].GetDescription())
+	assert.Equal(t, "foobar", res.GetIssues()[0].GetTarget())
+	assert.Equal(t, "barfoo", res.GetIssues()[0].GetTitle())
+	assert.Equal(t, "example.yaml", res.GetIssues()[0].GetDescription())
 	assert.Equal(t, baseTime.Unix(), res.GetScanInfo().GetScanStartTime().GetSeconds())
 	assert.Equal(t, "ab3d3290-cd9f-482c-97dc-ec48bdfcc4de", res.GetScanInfo().GetScanUuid())
 	assert.Equal(t, "123-321", res.GetIssues()[0].GetCve())

diff --git a/pkg/sarif/sarif.go b/pkg/sarif/sarif.go
@@ -115,7 +115,7 @@ func FromDraconRawIssuesRun(responses []*v1.LaunchToolResponse) (*sarif.Report,
 }
 
 func removeDraconInternalPath(target string) string {
-	return strings.Replace(target, "/workspace/output", "", 1)
+	return strings.Replace(target, "/workspace/output/source-code", "", 1)
 }
 
 func draconIssueToSarif(issue *v1.Issue, rule *sarif.ReportingDescriptor) (*sarif.Result, error) {

diff --git a/pkg/sarif/sarif_test.go b/pkg/sarif/sarif_test.go
@@ -356,7 +356,7 @@ func Test_draconIssueToSarif(t *testing.T) {
 		Severity:    v1.Severity_SEVERITY_INFO,
 		Cvss:        0.0,
 		Source:      "//foo/bar:baz",
-		Target:      "/workspace/output/foo1/bar1:baz2",
+		Target:      "/workspace/output/source-code/foo1/bar1:baz2",
 		Title:       "Unit Test Title",
 		Type:        "test type",
 		Cve:         "CVE-0000-99999",