Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions pkg/action/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,6 @@ func scanSinglePath(ctx context.Context, c malcontent.Config, path string, ruleF
})
buf := readPool.Get(readBuffer) //nolint:nilaway // the buffer pool is created above

var fc bytes.Buffer
_, err = io.CopyBuffer(&fc, io.LimitReader(f, maxBytes), buf)
if err != nil {
return nil, err
}

h := sha256.New()
_, err = h.Write(fc.Bytes())
if err != nil {
return nil, err
}
checksum := fmt.Sprintf("%x", h.Sum(nil))

mime := "<unknown>"
kind, err := programkind.File(ctx, path)
if err != nil && !interactive(c) {
Expand Down Expand Up @@ -152,6 +139,20 @@ func scanSinglePath(ctx context.Context, c malcontent.Config, path string, ruleF
return fr, nil
}

// Only retrieve the file's contents and calculate its checksum if we need to generate a report
var fc bytes.Buffer
_, err = io.CopyBuffer(&fc, io.LimitReader(f, maxBytes), buf)
if err != nil {
return nil, err
}

h := sha256.New()
_, err = h.Write(fc.Bytes())
if err != nil {
return nil, err
}
checksum := fmt.Sprintf("%x", h.Sum(nil))

fr, err := report.Generate(ctx, path, mrs, c, archiveRoot, logger, fc.Bytes(), size, checksum, kind, risk)
if err != nil {
return nil, NewFileReportError(err, path, TypeGenerateError)
Expand Down