forked from trufflesecurity/trufflehog
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use re-readable reader and common chunker (trufflesecurity#703)
* Use re-readable reader and common chunker * Linter feedback * Break on error
- Loading branch information
Showing
5 changed files
with
138 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package common | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "errors" | ||
| "io" | ||
|
|
||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| const ( | ||
| ChunkSize = 10 * 1024 | ||
| PeekSize = 3 * 1024 | ||
| ) | ||
|
|
||
| func ChunkReader(r io.Reader) chan []byte { | ||
| chunkChan := make(chan []byte) | ||
| go func() { | ||
| defer close(chunkChan) | ||
| reader := bufio.NewReaderSize(bufio.NewReader(r), ChunkSize) | ||
| for { | ||
| chunk := make([]byte, ChunkSize) | ||
| n, err := reader.Read(chunk) | ||
| if err != nil && !errors.Is(err, io.EOF) { | ||
| log.WithError(err).Error("Error chunking reader.") | ||
| break | ||
| } | ||
| peekData, _ := reader.Peek(PeekSize) | ||
| chunkChan <- append(chunk[:n], peekData...) | ||
| if errors.Is(err, io.EOF) { | ||
| break | ||
| } | ||
| } | ||
| }() | ||
| return chunkChan | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package common | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "bytes" | ||
| "errors" | ||
| "io" | ||
| "net/http" | ||
| "testing" | ||
|
|
||
| diskbufferreader "github.com/bill-rich/disk-buffer-reader" | ||
| ) | ||
|
|
||
| func TestChunker(t *testing.T) { | ||
| resp, err := http.Get("https://raw.githubusercontent.com/bill-rich/bad-secrets/master/FifteenMB.gz") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer resp.Body.Close() | ||
| reReader, err := diskbufferreader.New(resp.Body) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer reReader.Close() | ||
|
|
||
| baseChunkCount := 0 | ||
|
|
||
| // Count chunks from looping using chunk size. | ||
| for { | ||
| baseChunkCount++ | ||
| tmpChunk := make([]byte, ChunkSize) | ||
| _, err := reReader.Read(tmpChunk) | ||
| if err != nil { | ||
| if errors.Is(err, io.EOF) { | ||
| break | ||
| } | ||
| t.Error(err) | ||
| } | ||
| } | ||
| _ = reReader.Reset() | ||
|
|
||
| // Get the first two chunks for comparing later. | ||
| baseChunkOne := make([]byte, ChunkSize) | ||
| baseChunkTwo := make([]byte, ChunkSize) | ||
|
|
||
| baseReader := bufio.NewReaderSize(reReader, ChunkSize) | ||
| _, _ = baseReader.Read(baseChunkOne) | ||
| peek, _ := baseReader.Peek(PeekSize) | ||
| baseChunkOne = append(baseChunkOne, peek...) | ||
| _, _ = baseReader.Read(baseChunkTwo) | ||
| peek, _ = baseReader.Peek(PeekSize) | ||
| baseChunkTwo = append(baseChunkTwo, peek...) | ||
|
|
||
| // Reset the reader to the beginning and use ChunkReader. | ||
| _ = reReader.Reset() | ||
|
|
||
| testChunkCount := 0 | ||
| for chunk := range ChunkReader(reReader) { | ||
| testChunkCount++ | ||
| switch testChunkCount { | ||
| case 1: | ||
| if !bytes.Equal(baseChunkOne, chunk) { | ||
| t.Errorf("First chunk did not match expected. Got: %d bytes, expected: %d bytes", len(chunk), len(baseChunkOne)) | ||
| } | ||
| case 2: | ||
| if !bytes.Equal(baseChunkTwo, chunk) { | ||
| t.Errorf("Second chunk did not match expected. Got: %d bytes, expected: %d bytes", len(chunk), len(baseChunkTwo)) | ||
| } | ||
| } | ||
| } | ||
| if testChunkCount != baseChunkCount { | ||
| t.Errorf("Wrong number of chunks received. Got %d, expected: %d.", testChunkCount, baseChunkCount) | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters