Skip to content

fix: CVE-2022-28948 #23

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
testwill wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: CVE-2022-28948 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b8feb
fix: CVE-2022-28948
testwill May 29, 2023
5c1ade7
io/ioutil deprecated
testwill May 29, 2023
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
3 changes: 1 addition & 2 deletions fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package memoryfs
import (
"io"
"io/fs"
"io/ioutil"
"strings"
"time"
)
Expand Down Expand Up @@ -102,7 +101,7 @@ func (m *FS) ReadFile(name string) ([]byte, error) {
return nil, err
}
defer func() { _ = f.Close() }()
return ioutil.ReadAll(f)
return io.ReadAll(f)
}

// Sub returns an FS corresponding to the subtree rooted at dir.
Expand Down
21 changes: 10 additions & 11 deletions fs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"io"
"io/fs"
"io/ioutil"
"strings"
"sync"
"testing"
Expand Down Expand Up @@ -50,7 +49,7 @@ func Test_AllOperations(t *testing.T) {
f, err := memfs.Open("test.txt")
require.NoError(t, err)
defer func() { _ = f.Close() }()
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "hello world", string(data))
})
Expand All @@ -74,7 +73,7 @@ func Test_AllOperations(t *testing.T) {
f, err := memfs.Open("files/a/b/c/.secret")
require.NoError(t, err)
defer func() { _ = f.Close() }()
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "secret file!", string(data))
})
Expand Down Expand Up @@ -358,7 +357,7 @@ func Test_WriteWhileOpen(t *testing.T) {
err = memfs.WriteFile("test.txt", []byte("hello world"), 0o644)
require.NoError(t, err)

data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)

assert.Equal(t, "hello world", string(data))
Expand All @@ -371,7 +370,7 @@ func Test_DeleteFile(t *testing.T) {

f, err := memfs.Open("test.txt")
require.NoError(t, err)
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "hello world", string(data))

Expand All @@ -391,7 +390,7 @@ func Test_DeleteNestedFile(t *testing.T) {

f, err := memfs.Open("/some/arbitrary/path/test.txt")
require.NoError(t, err)
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "hello world", string(data))

Expand All @@ -411,7 +410,7 @@ func Test_DeleteEmptyDirectory(t *testing.T) {

f, err := memfs.Open("/some/arbitrary/path/test.txt")
require.NoError(t, err)
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "hello world", string(data))

Expand All @@ -434,7 +433,7 @@ func Test_DeleteNonEmptyDirectoryError(t *testing.T) {

f, err := memfs.Open("/some/arbitrary/path/test.txt")
require.NoError(t, err)
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "hello world", string(data))

Expand All @@ -453,7 +452,7 @@ func Test_DeleteNonEmptyDirectorySuccess(t *testing.T) {

f, err := memfs.Open("/some/arbitrary/path/test.txt")
require.NoError(t, err)
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "hello world", string(data))

Expand All @@ -475,7 +474,7 @@ func Test_DeleteNonEmptyDirectorySuccessFromHigherLevel(t *testing.T) {

f, err := memfs.Open("/some/arbitrary/path/test.txt")
require.NoError(t, err)
data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.Equal(t, "hello world", string(data))

Expand All @@ -500,7 +499,7 @@ func Test_CloneFS(t *testing.T) {
require.NoError(t, err)
defer func() { _ = f.Close() }()

data, err := ioutil.ReadAll(f)
data, err := io.ReadAll(f)
require.NoError(t, err)
assert.NotNil(t, data)
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ require github.com/stretchr/testify v1.7.1
require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e // indirect
)
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e h1:3i3ny04XV6HbZ2N1oIBw1UBYATHAOpo4tfTF83JM3Z0=
gopkg.in/yaml.v3 v3.0.0-20220521103104-8f96da9f5d5e/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=