Skip to content

Commit c1dd4f1

Browse files
committed
make the trufflehog parser not error out when receiving an empty file
1 parent d5ba23b commit c1dd4f1

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

components/scanners/trufflehog/internal/transformer/transformer.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,10 @@ func (g *trufflehogTransformer) Transform(ctx context.Context) ([]*ocsf.Vulnerab
206206
}
207207
return nil, errors.Errorf("failed to read raw output file '%s': %w", g.rawOutFilePath, err)
208208
}
209-
209+
if len(b) == 0 {
210+
logger.Info("input file is empty, exiting without findings")
211+
return []*ocsf.VulnerabilityFinding{}, nil
212+
}
210213
truffleResults, err := ParseMultiJSONMessages(b)
211214
if err != nil {
212215
return nil, errors.Errorf("could not parse trufflehog file with multiple messages, err: %w", err)

components/scanners/trufflehog/internal/transformer/transformer_test.go

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package transformer
33
import (
44
"context"
55
_ "embed"
6+
"os"
7+
"path/filepath"
68
"testing"
79
"time"
810

@@ -201,4 +203,19 @@ func TestTrufflehogTransformer_Transform(t *testing.T) {
201203
assert.NotEmptyf(t, vulnerability.Cwe.Caption, "Unexpected empty value for caption in vulnerability for finding %d", idx)
202204
}
203205
})
206+
t.Run("it should return an empty finding array when the input file is empty", func(t *testing.T) {
207+
emptyFilePath := filepath.Join(t.TempDir(), "empty_trufflehog.sarif")
208+
require.NoError(t, os.WriteFile(emptyFilePath, []byte{}, 0644))
209+
210+
ocsfTransformer, err := New(
211+
TrufflehogRawOutFilePath(emptyFilePath),
212+
TrufflehogTransformerWithTarget(ocsffindinginfo.DataSource_TARGET_TYPE_REPOSITORY),
213+
TrufflehogTransformerWithClock(clock),
214+
)
215+
require.NoError(t, err)
216+
217+
findings, err := ocsfTransformer.Transform(ctx)
218+
require.NoError(t, err)
219+
assert.Empty(t, findings, "Expected no findings for an empty input file")
220+
})
204221
}

0 commit comments

Comments
 (0)