Skip to content

Default to standard library when validating zip file #1238

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

Merged
jromero merged 1 commit into from
Aug 11, 2021
Merged

Default to standard library when validating zip file #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,13 +559,7 @@ func (c *Client) processAppPath(appPath string) (string, error) {
}

if !fi.IsDir() {
fh, err := os.Open(filepath.Clean(resolvedAppPath))
if err != nil {
return "", errors.Wrap(err, "read file")
}
defer fh.Close()

isZip, err := archive.IsZip(fh)
isZip, err := archive.IsZip(filepath.Clean(resolvedAppPath))
if err != nil {
return "", errors.Wrap(err, "check zip")
}
Expand Down
19 changes: 10 additions & 9 deletions pkg/archive/archive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package archive // import "github.com/buildpacks/pack/pkg/archive"
import (
"archive/tar"
"archive/zip"
"bytes"
"io"
"io/ioutil"
"os"
Expand Down Expand Up @@ -368,14 +367,16 @@ func NormalizeHeader(header *tar.Header, normalizeModTime bool) {
}

// IsZip detects whether or not a File is a zip directory
func IsZip(file io.Reader) (bool, error) {
b := make([]byte, 4)
_, err := file.Read(b)
if err != nil && err != io.EOF {
return false, err
} else if err == io.EOF {
func IsZip(path string) (bool, error) {
r, err := zip.OpenReader(path)

switch {
case err == nil:
r.Close()
return true, nil
case err == zip.ErrFormat:
return false, nil
default:
return false, err
}

return bytes.Equal(b, []byte("\x50\x4B\x03\x04")), nil
}
31 changes: 4 additions & 27 deletions pkg/archive/archive_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,12 +574,7 @@ func testArchive(t *testing.T, when spec.G, it spec.S) {
when("file is a zip file", func() {
it("returns true", func() {
path := filepath.Join("testdata", "zip-to-tar.zip")

file, err := os.Open(path)
h.AssertNil(t, err)
defer file.Close()

isZip, err := archive.IsZip(file)
isZip, err := archive.IsZip(path)
h.AssertNil(t, err)
h.AssertTrue(t, isZip)
})
Expand All @@ -588,12 +583,7 @@ func testArchive(t *testing.T, when spec.G, it spec.S) {
when("file is a jar file", func() {
it("returns true", func() {
path := filepath.Join("testdata", "jar-file.jar")

file, err := os.Open(path)
h.AssertNil(t, err)
defer file.Close()

isZip, err := archive.IsZip(file)
isZip, err := archive.IsZip(path)
h.AssertNil(t, err)
h.AssertTrue(t, isZip)
})
Expand All @@ -609,7 +599,7 @@ func testArchive(t *testing.T, when spec.G, it spec.S) {
err = ioutil.WriteFile(file.Name(), []byte("content"), os.ModePerm)
h.AssertNil(t, err)

isZip, err := archive.IsZip(file)
isZip, err := archive.IsZip(file.Name())
h.AssertNil(t, err)
h.AssertFalse(t, isZip)
})
Expand All @@ -621,25 +611,12 @@ func testArchive(t *testing.T, when spec.G, it spec.S) {
h.AssertNil(t, err)
defer file.Close()

isZip, err := archive.IsZip(file)
isZip, err := archive.IsZip(file.Name())
h.AssertNil(t, err)
h.AssertFalse(t, isZip)
})
})
})

when("reader is closed", func() {
it("returns error", func() {
file, err := ioutil.TempFile(tmpDir, "file.txt")
h.AssertNil(t, err)
err = file.Close()
h.AssertNil(t, err)

isZip, err := archive.IsZip(file)
h.AssertError(t, err, os.ErrClosed.Error())
h.AssertFalse(t, isZip)
})
})
})
}

Expand Down