Skip to content

[SCAN] Fix local image export with bare SHA256 IDs #591

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

Closed
zhanglt wants to merge 1 commit into from
Closed

[SCAN] Fix local image export with bare SHA256 IDs #591

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
14 changes: 13 additions & 1 deletion cvetools/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ func parseSocketFromRepo(repo string) (string, string) {
return "", repo
}

func dockerImageSaveRef(id string) string {
if len(id) != goDigest.SHA256.Size()*2 {
return id
}

digest := goDigest.Digest(goDigest.SHA256.String() + ":" + id)
if err := digest.Validate(); err != nil {
return id
}
return digest.String()
}

Comment on lines +64 to +75

@pohanhuang pohanhuang Sep 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
func dockerImageSaveRef(id string) string {
if len(id) != goDigest.SHA256.Size()*2 {
return id
}
digest := goDigest.Digest(goDigest.SHA256.String() + ":" + id)
if err := digest.Validate(); err != nil {
return id
}
return digest.String()
}
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(dockerImageSaveRef(meta.ID))
if err != nil {
log.WithFields(log.Fields{"error": err}).Error("Failed to get image")
if errdefs.IsNotFound(err) {
Expand Down
43 changes: 43 additions & 0 deletions cvetools/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package cvetools

import (
"strings"
"testing"

"github.com/stretchr/testify/require"
)

func TestDockerImageSaveRef(t *testing.T) {
tests := []struct {
name string
id string
want string
}{
{
name: "bare sha256 digest",
id: strings.Repeat("a", 64),
want: "sha256:" + strings.Repeat("a", 64),
},
{
name: "prefixed sha256 digest",
id: "sha256:" + strings.Repeat("b", 64),
want: "sha256:" + strings.Repeat("b", 64),
},
{
name: "image name",
id: "nginx:latest",
want: "nginx:latest",
},
{
name: "invalid bare digest",
id: strings.Repeat("z", 64),
want: strings.Repeat("z", 64),
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
require.Equal(t, tt.want, dockerImageSaveRef(tt.id))
})
}
}