From 3a9d1ec136e049b2bffc9db15230eb70308ac90d Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 13 Jan 2025 23:27:30 +0100 Subject: [PATCH] inline ioutil.WriteFile and ioutil.ReadFile calls throughout --- error_test.go | 9 ++++----- internal/anonssh/anonssh.go | 5 ++--- internal/daemonmaincmd/writetest.go | 3 +-- internal/rsyncchecksum/checksum_test.go | 3 +-- internal/rsyncdconfig/config.go | 3 +-- internal/rsynctest/rsynctest.go | 5 ++--- interop_test.go | 19 +++++++++---------- receiver_listing_test.go | 4 ++-- receiver_test.go | 19 +++++++++---------- 9 files changed, 31 insertions(+), 39 deletions(-) diff --git a/error_test.go b/error_test.go index 1dec520..ec58179 100644 --- a/error_test.go +++ b/error_test.go @@ -2,7 +2,6 @@ package rsync_test import ( "bytes" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -91,12 +90,12 @@ func TestNoReadPermission(t *testing.T) { t.Fatal(err) } dummy := filepath.Join(source, "dummy") - if err := ioutil.WriteFile(dummy, []byte("dummy"), 0644); err != nil { + if err := os.WriteFile(dummy, []byte("dummy"), 0644); err != nil { t.Fatal(err) } other := filepath.Join(source, "other") want := []byte("other file contents") - if err := ioutil.WriteFile(other, want, 0644); err != nil { + if err := os.WriteFile(other, want, 0644); err != nil { t.Fatal(err) } @@ -126,12 +125,12 @@ func TestNoReadPermission(t *testing.T) { if os.Getuid() > 0 { // uid 0 can read the file despite chmod(0), so skip this check: - if _, err := ioutil.ReadFile(filepath.Join(dest, "dummy")); err == nil { + if _, err := os.ReadFile(filepath.Join(dest, "dummy")); err == nil { t.Fatalf("dummy file unexpectedly created in the destination") } } - got, err := ioutil.ReadFile(filepath.Join(dest, "other")) + got, err := os.ReadFile(filepath.Join(dest, "other")) if err != nil { t.Fatal(err) } diff --git a/internal/anonssh/anonssh.go b/internal/anonssh/anonssh.go index 11feb4a..faf590b 100644 --- a/internal/anonssh/anonssh.go +++ b/internal/anonssh/anonssh.go @@ -12,7 +12,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net" "os" "path/filepath" @@ -256,7 +255,7 @@ func loadHostKey() (ssh.Signer, error) { return nil, err } path := filepath.Join(dir, "gokr-rsyncd", "ssh_host_ed25519_key") - b, err := ioutil.ReadFile(path) + b, err := os.ReadFile(path) if err != nil { if os.IsNotExist(err) { if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil { @@ -275,7 +274,7 @@ func loadHostKey() (ssh.Signer, error) { } func loadAuthorizedKeys(path string) (map[string]bool, error) { - b, err := ioutil.ReadFile(path) + b, err := os.ReadFile(path) if err != nil { return nil, err } diff --git a/internal/daemonmaincmd/writetest.go b/internal/daemonmaincmd/writetest.go index 3d37079..aab911f 100644 --- a/internal/daemonmaincmd/writetest.go +++ b/internal/daemonmaincmd/writetest.go @@ -2,14 +2,13 @@ package maincmd import ( "fmt" - "io/ioutil" "os" "path/filepath" ) func canUnexpectedlyWriteTo(dir string) error { fn := filepath.Join(dir, "gokr-rsyncd.unexpectedly_writable") - if err := ioutil.WriteFile(fn, []byte("gokr-rsyncd creates this file to prevent misconfigurations. if you see this file, it means gokr-rsyncd unexpectedly was started with too many privileges"), 0644); err == nil { + if err := os.WriteFile(fn, []byte("gokr-rsyncd creates this file to prevent misconfigurations. if you see this file, it means gokr-rsyncd unexpectedly was started with too many privileges"), 0644); err == nil { os.Remove(fn) return fmt.Errorf("unexpectedly able to write file to %s, exiting", dir) } diff --git a/internal/rsyncchecksum/checksum_test.go b/internal/rsyncchecksum/checksum_test.go index 85d9fdb..ef1e0e5 100644 --- a/internal/rsyncchecksum/checksum_test.go +++ b/internal/rsyncchecksum/checksum_test.go @@ -2,7 +2,6 @@ package rsyncchecksum_test import ( "bytes" - "io/ioutil" "os" "path/filepath" "testing" @@ -25,7 +24,7 @@ func writeLargeDataFile(t *testing.T, source string, headPattern, bodyPattern, e if err := os.MkdirAll(filepath.Dir(large), 0755); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(large, content, 0644); err != nil { + if err := os.WriteFile(large, content, 0644); err != nil { t.Fatal(err) } } diff --git a/internal/rsyncdconfig/config.go b/internal/rsyncdconfig/config.go index 5885c36..303dd7e 100644 --- a/internal/rsyncdconfig/config.go +++ b/internal/rsyncdconfig/config.go @@ -1,7 +1,6 @@ package rsyncdconfig import ( - "io/ioutil" "os" "path/filepath" @@ -36,7 +35,7 @@ func FromString(input string) (*Config, error) { } func FromFile(path string) (*Config, error) { - input, err := ioutil.ReadFile(path) + input, err := os.ReadFile(path) if err != nil { return nil, err } diff --git a/internal/rsynctest/rsynctest.go b/internal/rsynctest/rsynctest.go index 89d9387..29089e5 100644 --- a/internal/rsynctest/rsynctest.go +++ b/internal/rsynctest/rsynctest.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net" "os" "os/exec" @@ -276,14 +275,14 @@ func WriteLargeDataFile(t *testing.T, source string, headPattern, bodyPattern, e if err := os.MkdirAll(filepath.Dir(large), 0755); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(large, content, 0644); err != nil { + if err := os.WriteFile(large, content, 0644); err != nil { t.Fatal(err) } } func DataFileMatches(fn string, headPattern, bodyPattern, endPattern []byte) error { want := ConstructLargeDataFile(headPattern, bodyPattern, endPattern) - got, err := ioutil.ReadFile(fn) + got, err := os.ReadFile(fn) if err != nil { return err } diff --git a/interop_test.go b/interop_test.go index cb7e551..885f304 100644 --- a/interop_test.go +++ b/interop_test.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "fmt" - "io/ioutil" "log" "os" "os/exec" @@ -82,7 +81,7 @@ func TestInterop(t *testing.T) { } dummy := filepath.Join(source, "dummy") want := []byte("heyo") - if err := ioutil.WriteFile(dummy, want, 0644); err != nil { + if err := os.WriteFile(dummy, want, 0644); err != nil { t.Fatal(err) } @@ -119,7 +118,7 @@ func TestInterop(t *testing.T) { // list = true // ` - // if err := ioutil.WriteFile(config, []byte(rsyncdConfig), 0644); err != nil { + // if err := os.WriteFile(config, []byte(rsyncdConfig), 0644); err != nil { // t.Fatal(err) // } // srv := exec.Command("rsync", @@ -176,7 +175,7 @@ func TestInterop(t *testing.T) { } { - got, err := ioutil.ReadFile(filepath.Join(dest, "dummy")) + got, err := os.ReadFile(filepath.Join(dest, "dummy")) if err != nil { t.Fatal(err) } @@ -233,7 +232,7 @@ func createSourceFiles(t *testing.T) (string, string, string) { if err := os.MkdirAll(filepath.Dir(dummy), 0755); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(dummy, []byte(subdir), 0644); err != nil { + if err := os.WriteFile(dummy, []byte(subdir), 0644); err != nil { t.Fatal(err) } } @@ -258,7 +257,7 @@ func sourcesArgs(t *testing.T) []string { func sourceFullySyncedTo(t *testing.T, dest string) error { { want := []byte("expensive") - got, err := ioutil.ReadFile(filepath.Join(dest, "dummy")) + got, err := os.ReadFile(filepath.Join(dest, "dummy")) if err != nil { return err } @@ -273,7 +272,7 @@ func sourceFullySyncedTo(t *testing.T, dest string) error { { want := []byte("cheap") - got, err := ioutil.ReadFile(filepath.Join(dest, "cheap", "dummy")) + got, err := os.ReadFile(filepath.Join(dest, "cheap", "dummy")) if err != nil { return err } @@ -561,7 +560,7 @@ func TestInteropRemoteDaemonAuthorizedSSHFail(t *testing.T) { } authorizedKeysPath := filepath.Join(tmp, "authorized_keys") - if err := ioutil.WriteFile(authorizedKeysPath, []byte("# no keys authorized"), 0644); err != nil { + if err := os.WriteFile(authorizedKeysPath, []byte("# no keys authorized"), 0644); err != nil { t.Fatal(err) } @@ -611,11 +610,11 @@ func TestInteropRemoteDaemonAuthorizedSSHPass(t *testing.T) { } authorizedKeysPath := filepath.Join(tmp, "authorized_keys") - pubKey, err := ioutil.ReadFile(privKeyPath + ".pub") + pubKey, err := os.ReadFile(privKeyPath + ".pub") if err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(authorizedKeysPath, pubKey, 0644); err != nil { + if err := os.WriteFile(authorizedKeysPath, pubKey, 0644); err != nil { t.Fatal(err) } diff --git a/receiver_listing_test.go b/receiver_listing_test.go index 530a952..041570d 100644 --- a/receiver_listing_test.go +++ b/receiver_listing_test.go @@ -2,7 +2,7 @@ package rsync_test import ( "bytes" - "io/ioutil" + "os" "path/filepath" "testing" @@ -27,7 +27,7 @@ func TestReceiverListing(t *testing.T) { t.Fatal(err) } hello := filepath.Join(source, "hello") - if err := ioutil.WriteFile(hello, []byte("world"), 0644); err != nil { + if err := os.WriteFile(hello, []byte("world"), 0644); err != nil { t.Fatal(err) } mtime, err := time.Parse(time.RFC3339, "2009-11-10T23:00:00Z") diff --git a/receiver_test.go b/receiver_test.go index 0f36a6a..0a33733 100644 --- a/receiver_test.go +++ b/receiver_test.go @@ -1,7 +1,6 @@ package rsync_test import ( - "io/ioutil" "os" "os/exec" "os/user" @@ -56,7 +55,7 @@ func TestReceiver(t *testing.T) { t.Fatal(err) } hello := filepath.Join(source, "hello") - if err := ioutil.WriteFile(hello, []byte("world"), 0644); err != nil { + if err := os.WriteFile(hello, []byte("world"), 0644); err != nil { t.Fatal(err) } mtime, err := time.Parse(time.RFC3339, "2009-11-10T23:00:00Z") @@ -75,7 +74,7 @@ func TestReceiver(t *testing.T) { } no := filepath.Join(source, "no") - if err := ioutil.WriteFile(no, []byte("no"), 0666); err != nil { + if err := os.WriteFile(no, []byte("no"), 0666); err != nil { t.Fatal(err) } uid, gid, verifyUid := setUid(t, no) @@ -101,7 +100,7 @@ func TestReceiver(t *testing.T) { { want := []byte("world") - got, err := ioutil.ReadFile(filepath.Join(dest, "hello")) + got, err := os.ReadFile(filepath.Join(dest, "hello")) if err != nil { t.Fatal(err) } @@ -146,7 +145,7 @@ func TestReceiver(t *testing.T) { // Make a change that is invisible with our current settings: // change the file contents without changing size and mtime. - if err := ioutil.WriteFile(hello, []byte("moon!"), 0644); err != nil { + if err := os.WriteFile(hello, []byte("moon!"), 0644); err != nil { t.Fatal(err) } if err := os.Chtimes(hello, mtime, mtime); err != nil { @@ -166,7 +165,7 @@ func TestReceiver(t *testing.T) { { want := []byte("world") - got, err := ioutil.ReadFile(filepath.Join(dest, "hello")) + got, err := os.ReadFile(filepath.Join(dest, "hello")) if err != nil { t.Fatal(err) } @@ -240,7 +239,7 @@ func TestReceiverSSH(t *testing.T) { if err := os.MkdirAll(source, 0755); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(filepath.Join(source, "hello"), []byte("world"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(source, "hello"), []byte("world"), 0644); err != nil { t.Fatal(err) } @@ -278,7 +277,7 @@ func TestReceiverSSH(t *testing.T) { { want := []byte("world") - got, err := ioutil.ReadFile(filepath.Join(dest, "hello")) + got, err := os.ReadFile(filepath.Join(dest, "hello")) if err != nil { t.Fatal(err) } @@ -296,7 +295,7 @@ func TestReceiverCommand(t *testing.T) { if err := os.MkdirAll(source, 0755); err != nil { t.Fatal(err) } - if err := ioutil.WriteFile(filepath.Join(source, "hello"), []byte("world"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(source, "hello"), []byte("world"), 0644); err != nil { t.Fatal(err) } @@ -331,7 +330,7 @@ func TestReceiverCommand(t *testing.T) { { want := []byte("world") - got, err := ioutil.ReadFile(filepath.Join(dest, "hello")) + got, err := os.ReadFile(filepath.Join(dest, "hello")) if err != nil { t.Fatal(err) }