Skip to content

image: Port to go-digest #104

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
coolljt0725 merged 2 commits into from
Feb 9, 2017
+33 −31
Merged

image: Port to go-digest #104

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
2bc432e
image: Port to go-digest
wking Jan 20, 2017
adb0766
glide.yaml: Lock go-digest to v1.0.0-rc0
wking Jan 20, 2017
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 glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package: github.com/opencontainers/image-tools
import:
- package: github.com/opencontainers/go-digest
version: v1.0.0-rc0
- package: github.com/opencontainers/image-spec
version: v1.0.0-rc4
subpackages:
Expand Down
16 changes: 9 additions & 7 deletions image/descriptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
package image

import (
"crypto/sha256"
"encoding/hex"
"encoding/json"
"fmt"
"io"
"os"
"path/filepath"
"strings"

"github.com/opencontainers/go-digest"
"github.com/pkg/errors"
)

Expand Down Expand Up @@ -116,8 +115,13 @@ func (d *descriptor) validate(w walker, mts []string) error {
}

func (d *descriptor) validateContent(r io.Reader) error {
h := sha256.New()
n, err := io.Copy(h, r)
parsed, err := digest.Parse(d.Digest)
Copy link
Contributor

@stevvooe stevvooe Feb 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just use the OCI descriptor type.

Copy link
Contributor Author

@wking wking Feb 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd love to (and I do that in #5). However, as I pointed out earlier, that would require making this PR larger (and therefore harder to review). I'll gladly file a follow up PR with that change if we can land this initial go-digest consuming code first.

if err != nil {
return err
}

verifier := parsed.Verifier()
n, err := io.Copy(verifier, r)
if err != nil {
return errors.Wrap(err, "error generating hash")
}
Expand All @@ -126,9 +130,7 @@ func (d *descriptor) validateContent(r io.Reader) error {
return errors.New("size mismatch")
}

digest := "sha256:" + hex.EncodeToString(h.Sum(nil))

if digest != d.Digest {
if !verifier.Verified() {
return errors.New("digest mismatch")
}

Expand Down
20 changes: 10 additions & 10 deletions image/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ import (
"archive/tar"
"bytes"
"compress/gzip"
"crypto/sha256"
"fmt"
"io"
"io/ioutil"
"os"
Expand All @@ -28,6 +26,7 @@ import (
"strings"
"testing"

"github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/specs-go/v1"
)

Expand Down Expand Up @@ -298,14 +297,16 @@ func createHashedBlob(name string) (descriptor, error) {
return descriptor{}, err
}

// Rename the file to hashed-digest name.
err = os.Rename(name, filepath.Join(filepath.Dir(name), desc.Digest))
parsed, err := digest.Parse(desc.Digest)
if err != nil {
return descriptor{}, err
}

//Normalize the hashed digest.
desc.Digest = "sha256:" + desc.Digest
// Rename the file to hashed-digest name.
err = os.Rename(name, filepath.Join(filepath.Dir(name), parsed.Hex()))
if err != nil {
return descriptor{}, err
}

return desc, nil
}
Expand All @@ -317,15 +318,14 @@ func newDescriptor(name string) (descriptor, error) {
}
defer file.Close()

// generate sha256 hash
hash := sha256.New()
size, err := io.Copy(hash, file)
digester := digest.SHA256.Digester()
size, err := io.Copy(digester.Hash(), file)
if err != nil {
return descriptor{}, err
}

return descriptor{
Digest: fmt.Sprintf("%x", hash.Sum(nil)),
Digest: digester.Digest().String(),
Size: size,
}, nil
}
22 changes: 10 additions & 12 deletions image/manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ import (
"archive/tar"
"bytes"
"compress/gzip"
"crypto/sha256"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"

"github.com/opencontainers/go-digest"
)

func TestUnpackLayerDuplicateEntries(t *testing.T) {
Expand Down Expand Up @@ -90,26 +90,25 @@ func TestUnpackLayer(t *testing.T) {
gw.Close()
f.Close()

// generate sha256 hash
h := sha256.New()
digester := digest.SHA256.Digester()
file, err := os.Open(tarfile)
if err != nil {
t.Fatal(err)
}
defer file.Close()
_, err = io.Copy(h, file)
_, err = io.Copy(digester.Hash(), file)
if err != nil {
t.Fatal(err)
}
err = os.Rename(tarfile, filepath.Join(tmp1, "blobs", "sha256", fmt.Sprintf("%x", h.Sum(nil))))
err = os.Rename(tarfile, filepath.Join(tmp1, "blobs", "sha256", digester.Digest().Hex()))
if err != nil {
t.Fatal(err)
}

testManifest := manifest{
Layers: []descriptor{descriptor{
MediaType: "application/vnd.oci.image.layer.v1.tar+gzip",
Digest: fmt.Sprintf("sha256:%s", fmt.Sprintf("%x", h.Sum(nil))),
Digest: digester.Digest().String(),
}},
}
err = testManifest.unpack(newPathWalker(tmp1), filepath.Join(tmp1, "rootfs"))
Expand Down Expand Up @@ -151,26 +150,25 @@ func TestUnpackLayerRemovePartialyUnpackedFile(t *testing.T) {
gw.Close()
f.Close()

// generate sha256 hash
h := sha256.New()
digester := digest.SHA256.Digester()
file, err := os.Open(tarfile)
if err != nil {
t.Fatal(err)
}
defer file.Close()
_, err = io.Copy(h, file)
_, err = io.Copy(digester.Hash(), file)
if err != nil {
t.Fatal(err)
}
err = os.Rename(tarfile, filepath.Join(tmp1, "blobs", "sha256", fmt.Sprintf("%x", h.Sum(nil))))
err = os.Rename(tarfile, filepath.Join(tmp1, "blobs", "sha256", digester.Digest().Hex()))
if err != nil {
t.Fatal(err)
}

testManifest := manifest{
Layers: []descriptor{descriptor{
MediaType: "application/vnd.oci.image.layer.v1.tar+gzip",
Digest: fmt.Sprintf("sha256:%s", fmt.Sprintf("%x", h.Sum(nil))),
Digest: digester.Digest().String(),
}},
}
err = testManifest.unpack(newPathWalker(tmp1), filepath.Join(tmp1, "rootfs"))
Expand Down