Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion cvetools/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ func parseSocketFromRepo(repo string) (string, string) {
return "", repo
}

const sha256Prefix = "sha256:"

func dockerImageSaveID(id string) string {
if d, err := goDigest.Parse(id); err == nil {
return d.String()
}
if d, err := goDigest.Parse(sha256Prefix + id); err == nil {
return d.String()
}

return id
}
func (s *ScanTools) GetLocalImageMeta(ctx context.Context, repository, tag string) (*container.ImageMeta, share.ScanErrorCode) {
sock, repo := parseSocketFromRepo(repository)
if sock == "" {
Expand Down Expand Up @@ -119,7 +131,7 @@ func (s *ScanTools) LoadLocalImage(ctx context.Context, repository, tag, imgPath
return nil, nil, nil, share.ScanErrorCode_ScanErrContainerAPI
}

file, err := rt.GetImageFile(meta.ID)
file, err := rt.GetImageFile(dockerImageSaveID(meta.ID))
if err != nil {
log.WithFields(log.Fields{"error": err}).Error("Failed to get image")
if errdefs.IsNotFound(err) {
Expand Down
35 changes: 35 additions & 0 deletions cvetools/image_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package cvetools

import "testing"

func TestDockerImageSaveID(t *testing.T) {
tests := []struct {
name string
id string
want string
}{
{
name: "bare sha256",
id: "fd791d74b68913cbb027c6546007b3f0d3bc45125f797758156952bc2d6daf40",
want: "sha256:fd791d74b68913cbb027c6546007b3f0d3bc45125f797758156952bc2d6daf40",
},
{
name: "canonical sha256",
id: "sha256:fd791d74b68913cbb027c6546007b3f0d3bc45125f797758156952bc2d6daf40",
want: "sha256:fd791d74b68913cbb027c6546007b3f0d3bc45125f797758156952bc2d6daf40",
},
{
name: "short image ID",
id: "fd791d74b689",
want: "fd791d74b689",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := dockerImageSaveID(tt.id); got != tt.want {
t.Fatalf("dockerImageSaveID(%q) = %q, want %q", tt.id, got, tt.want)
}
})
}
}
Loading