5733c71c50
We were ignoring quite a few error cases, and had one case where we weren't actually updating state where we wanted to. Unfortunately, if the linter doesn't pass, nobody has any reason to actually check lint failures in CI. There are three remaining XXXs marked in the code for lint.
96 lines
1.8 KiB
Go
96 lines
1.8 KiB
Go
package tarutil
|
|
|
|
import (
|
|
"archive/tar"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"golang.org/x/xerrors"
|
|
|
|
logging "github.com/ipfs/go-log/v2"
|
|
)
|
|
|
|
var log = logging.Logger("tarutil") // nolint
|
|
|
|
func ExtractTar(body io.Reader, dir string) error {
|
|
if err := os.MkdirAll(dir, 0755); err != nil { // nolint
|
|
return xerrors.Errorf("mkdir: %w", err)
|
|
}
|
|
|
|
tr := tar.NewReader(body)
|
|
for {
|
|
header, err := tr.Next()
|
|
switch err {
|
|
default:
|
|
return err
|
|
case io.EOF:
|
|
return nil
|
|
|
|
case nil:
|
|
}
|
|
|
|
f, err := os.Create(filepath.Join(dir, header.Name))
|
|
if err != nil {
|
|
return xerrors.Errorf("creating file %s: %w", filepath.Join(dir, header.Name), err)
|
|
}
|
|
|
|
// This data is coming from a trusted source, no need to check the size.
|
|
//nolint:gosec
|
|
if _, err := io.Copy(f, tr); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := f.Close(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
|
|
func TarDirectory(dir string) (io.ReadCloser, error) {
|
|
r, w := io.Pipe()
|
|
|
|
go func() {
|
|
_ = w.CloseWithError(writeTarDirectory(dir, w))
|
|
}()
|
|
|
|
return r, nil
|
|
}
|
|
|
|
func writeTarDirectory(dir string, w io.Writer) error {
|
|
tw := tar.NewWriter(w)
|
|
|
|
files, err := ioutil.ReadDir(dir)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, file := range files {
|
|
h, err := tar.FileInfoHeader(file, "")
|
|
if err != nil {
|
|
return xerrors.Errorf("getting header for file %s: %w", file.Name(), err)
|
|
}
|
|
|
|
if err := tw.WriteHeader(h); err != nil {
|
|
return xerrors.Errorf("wiritng header for file %s: %w", file.Name(), err)
|
|
}
|
|
|
|
f, err := os.OpenFile(filepath.Join(dir, file.Name()), os.O_RDONLY, 644) // nolint
|
|
if err != nil {
|
|
return xerrors.Errorf("opening %s for reading: %w", file.Name(), err)
|
|
}
|
|
|
|
if _, err := io.Copy(tw, f); err != nil {
|
|
return xerrors.Errorf("copy data for file %s: %w", file.Name(), err)
|
|
}
|
|
|
|
if err := f.Close(); err != nil {
|
|
return err
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
}
|