fix: Fix secrets output not containing file/lines (#2467)

aquasecurity · Jul 8, 2022 · 7699153 · 7699153
1 parent a70fd75
commit 7699153
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 3 deletions.
diff --git a/integration/testdata/secrets.json.golden b/integration/testdata/secrets.json.golden
@@ -26,7 +26,51 @@
           "Title": "AWS Access Key ID",
           "StartLine": 3,
           "EndLine": 3,
-          "Match": "export AWS_ACCESS_KEY_ID=********************"
+          "Match": "export AWS_ACCESS_KEY_ID=********************",
+          "Code" : {
+          "Lines": [
+           {
+               "Number": 1,
+               "Content": "#!/bin/sh",
+               "IsCause": false,
+               "Annotation": "",
+               "Truncated": false,
+               "Highlighted": "#!/bin/sh",
+               "FirstCause": false,
+               "LastCause": false
+           },
+           {
+               "Number": 2,
+               "Content": "",
+               "IsCause": false,
+               "Annotation": "",
+               "Truncated": false,
+               "Highlighted": "",
+               "FirstCause": false,
+               "LastCause": false
+           },
+           {
+               "Number": 3,
+               "Content": "export AWS_ACCESS_KEY_ID=********************",
+               "IsCause": true,
+               "Annotation": "",
+               "Truncated": false,
+               "Highlighted": "export AWS_ACCESS_KEY_ID=********************",
+               "FirstCause": true,
+               "LastCause": true
+           },
+           {
+               "Number": 4,
+               "Content": "",
+               "IsCause": false,
+               "Annotation": "",
+               "Truncated": false,
+               "Highlighted": "",
+               "FirstCause": false,
+               "LastCause": false
+           }
+          ]
+          }
         },
         {
           "RuleID": "mysecret",
@@ -35,7 +79,41 @@
           "Title": "My Secret",
           "StartLine": 7,
           "EndLine": 7,
-          "Match": "echo ********"
+          "Match": "echo ********",
+          "Code" : {
+          "Lines": [
+           {
+                "Number": 5,
+                "Content": "export GITHUB_PAT=ghp_0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+                "IsCause": false,
+                "Annotation": "",
+                "Truncated": false,
+                "Highlighted": "export GITHUB_PAT=ghp_0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ",
+                "FirstCause": false,
+                "LastCause": false
+           },
+           {
+                "Number": 6,
+                "Content": "",
+                "IsCause": false,
+                "Annotation": "",
+                "Truncated": false,
+                "Highlighted": "",
+                "FirstCause": false,
+                "LastCause": false
+           },
+           {
+               "Number": 7,
+               "Content": "echo ********",
+               "IsCause": true,
+               "Annotation": "",
+               "Truncated": false,
+               "Highlighted": "echo ********",
+               "FirstCause": true,
+               "LastCause": true
+            }
+          ]
+          }
         }
       ]
     }

diff --git a/pkg/fanal/types/secret.go b/pkg/fanal/types/secret.go
@@ -15,6 +15,6 @@ type SecretFinding struct {
 	Title     string
 	StartLine int
 	EndLine   int
-	Code      Code `json:"-"`
+	Code      Code
 	Match     string
 }