Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Read files in chunks to avoid reading entire files in memory #19

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions internal/resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ func TestNewResourceFromUrl(t *testing.T) {

for _, data := range tests {
resource, err := NewResourceFromUrl(data.urls, algo, []string{}, "")
assert.Equal(t, err == nil, data.valid)
assert.Equal(t, data.valid, err == nil)
if err != nil {
assert.Contains(t, err.Error(), data.errorContains)
} else {
assert.Equal(t, *resource, data.res)
assert.Equal(t, data.res, *resource)
}
}
}
27 changes: 24 additions & 3 deletions internal/sri.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
package internal

import (
"bufio"
"encoding/base64"
"fmt"
"io"
"os"
"strings"
)
Expand All @@ -15,12 +17,31 @@ func getIntegrityFromFile(path string, algo string) (string, error) {
if err != nil {
return "", err
}
f, err := os.ReadFile(path)
hasher := hash.hash()
f, err := os.Open(path)
defer f.Close()
if err != nil {
return "", fmt.Errorf("cannot open file '%s'", path)
}
hasher := hash.hash()
hasher.Write(f)
reader := bufio.NewReader(f)
// each block size is 10MB
const chunkSize = 10 * 1024 * 1024
buf := make([]byte, chunkSize)
for {
n, err := reader.Read(buf)
buf = buf[:n]

if n == 0 {
if err != nil {
if err == io.EOF {
break
}
return "", err
}
break
}
hasher.Write(buf)
}
h := hasher.Sum(nil)
return fmt.Sprintf("%s-%s", algo, base64.StdEncoding.EncodeToString(h)), nil
}
Expand Down
6 changes: 3 additions & 3 deletions internal/sri_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ func TestGetAlgoFromIntegrity(t *testing.T) {

for _, data := range tests {
algo, err := getAlgoFromIntegrity(data.sriString)
assert.Equal(t, err == nil, data.valid)
assert.Equal(t, data.valid, err == nil)
if err != nil {
assert.Contains(t, err.Error(), data.errorContains)
} else {
assert.Equal(t, algo, data.resString)
assert.Equal(t, data.resString, algo)
}
}
}
Expand All @@ -48,7 +48,7 @@ func TestGetIntegrityFromFile(t *testing.T) {
path := tmpFile(t, "abcdef")
sri, err := getIntegrityFromFile(path, "sha256")
assert.Nil(t, err)
assert.Equal(t, sri, "sha256-vvV+x/U6bUC+tkCngKY5yDvCmsipgW8fxsXG3Nk8RyE=")
assert.Equal(t, "sha256-vvV+x/U6bUC+tkCngKY5yDvCmsipgW8fxsXG3Nk8RyE=", sri)
}

func TestCheckIntegrityFromFile(t *testing.T) {
Expand Down
Loading