Skip to content
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

feat: blob sign command #1128

Merged
merged 30 commits into from
Jan 13, 2025
Merged

feat: blob sign command #1128

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1619d18
blob signing
Two-Hearts Dec 24, 2024
5870423
blob signing
Two-Hearts Dec 25, 2024
c6da7dc
update
Two-Hearts Dec 26, 2024
c13744e
Merge branch 'notaryproject:main' into blobsign
Two-Hearts Dec 26, 2024
97c3fcd
add tests
Two-Hearts Dec 26, 2024
f0db92f
fix test
Two-Hearts Dec 26, 2024
9cf65b8
fix test
Two-Hearts Dec 26, 2024
e8fe8c6
fix e2e test
Two-Hearts Dec 26, 2024
cb997c7
add e2e tests
Two-Hearts Dec 26, 2024
07d0ffb
add e2e tests
Two-Hearts Dec 26, 2024
cf40ba2
fix e2e tests
Two-Hearts Dec 26, 2024
1051ad4
fix e2e test
Two-Hearts Dec 26, 2024
cf5fecb
add more e2e tests
Two-Hearts Dec 27, 2024
fc4dcfc
add more e2e tests
Two-Hearts Dec 27, 2024
576a286
fix e2e test
Two-Hearts Dec 27, 2024
0c984a0
add more tests
Two-Hearts Dec 27, 2024
8474d58
Merge branch 'notaryproject:main' into blobsign
Two-Hearts Dec 31, 2024
14a1f3e
update
Two-Hearts Dec 31, 2024
752afe6
fix e2e test
Two-Hearts Dec 31, 2024
c30e199
resolve conflicts
Two-Hearts Jan 6, 2025
bc8f710
update
Two-Hearts Jan 6, 2025
9777ada
update
Two-Hearts Jan 8, 2025
b858af6
bump up dependencies
Two-Hearts Jan 8, 2025
ac5f3b7
update
Two-Hearts Jan 9, 2025
767e216
update
Two-Hearts Jan 10, 2025
5cf2aaa
update e2e tests
Two-Hearts Jan 10, 2025
5318f7d
fix e2e test
Two-Hearts Jan 10, 2025
26e6982
update
Two-Hearts Jan 10, 2025
a86854f
update
Two-Hearts Jan 10, 2025
d7e881c
update
Two-Hearts Jan 10, 2025
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
5 changes: 2 additions & 3 deletions test/e2e/internal/utils/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ import (
// VirtualHost is a virtualized host machine isolated by environment variable.
type VirtualHost struct {
Executor *ExecOpts

userDir string
env map[string]string
userDir string
env map[string]string
}

// NewVirtualHost creates a temporary user-level directory and updates
Expand Down
29 changes: 13 additions & 16 deletions test/e2e/suite/command/blob/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ import (

const tsaURL = "http://timestamp.digicert.com"

var _ = Describe("notation blob sign", func() {
var _ = Describe("notation blob sign", Serial, func() {
Two-Hearts marked this conversation as resolved.
Show resolved Hide resolved
// Success cases
It("with blob sign", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
notation.Exec("blob", "sign", "--force", blobPath).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords("Signature file written to")
})
})

It("with COSE format", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
notation.Exec("blob", "sign", "--signature-format", "cose", "--force", blobPath).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--signature-format", "cose", blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords("Signature file written to")
})
})

It("with specified media-type", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
notation.Exec("blob", "sign", "--force", "--media-type", "other-media-type", blobPath).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--media-type", "other-media-type", blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords("Signature file written to")
})
Expand All @@ -55,43 +55,42 @@ var _ = Describe("notation blob sign", func() {
It("with specific key", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
const keyName = "sKey"
notation.Exec("cert", "generate-test", keyName).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("cert", "generate-test", keyName).
MatchKeyWords(fmt.Sprintf("notation/localkeys/%s.crt", keyName))

notation.Exec("blob", "sign", "--force", "--key", keyName, blobPath).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--key", keyName, blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords("Signature file written to")
})
})

It("with expiry in 24h", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
notation.Exec("blob", "sign", "--expiry", "24h", "--force", blobPath).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--expiry", "24h", blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords("Signature file written to")
})
})

It("with signature directory", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
blobDir := filepath.Dir(blobPath)
notation.Exec("blob", "sign", "--force", "--signature-directory", blobDir, blobPath).
notation.Exec("blob", "sign", "--force", "--signature-directory", vhost.AbsolutePath(), blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords(fmt.Sprintf("Signature file written to %s", filepath.Join(blobDir, "blobFile.jws.sig")))
MatchKeyWords(fmt.Sprintf("Signature file written to %s", filepath.Join(vhost.AbsolutePath(), "blobFile.jws.sig")))
Two-Hearts marked this conversation as resolved.
Show resolved Hide resolved
})
})

It("with user metadata", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
notation.Exec("blob", "sign", "--force", "--user-metadata", "k1=v1", "--user-metadata", "k2=v2", blobPath).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--user-metadata", "k1=v1", "--user-metadata", "k2=v2", blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords("Signature file written to")
})
})

It("with timestamping", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
notation.Exec("blob", "sign", "--force", "--timestamp-url", tsaURL, "--timestamp-root-cert", filepath.Join(NotationE2EConfigPath, "timestamp", "DigiCertTSARootSHA384.cer"), blobPath).
notation.WithWorkDir(vhost.AbsolutePath()).Exec("blob", "sign", "--timestamp-url", tsaURL, "--timestamp-root-cert", filepath.Join(NotationE2EConfigPath, "timestamp", "DigiCertTSARootSHA384.cer"), blobPath).
MatchKeyWords(SignSuccessfully).
MatchKeyWords("Signature file written to")
})
Expand Down Expand Up @@ -128,8 +127,7 @@ var _ = Describe("notation blob sign", func() {

It("with no permission to read the blob file", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
blobDir := filepath.Dir(blobPath)
noPermissionBlobPath := filepath.Join(blobDir, "noPermissionBlob")
noPermissionBlobPath := filepath.Join(vhost.AbsolutePath(), "noPermissionBlob")
Two-Hearts marked this conversation as resolved.
Show resolved Hide resolved
newBlobFile, err := os.Create(noPermissionBlobPath)
if err != nil {
Fail(err.Error())
Expand All @@ -148,8 +146,7 @@ var _ = Describe("notation blob sign", func() {

It("with no permission to write the signature file", func() {
HostWithBlob(BaseOptions(), func(notation *utils.ExecOpts, blobPath string, vhost *utils.VirtualHost) {
blobDir := filepath.Dir(blobPath)
sigDir := filepath.Join(blobDir, "signature")
sigDir := filepath.Join(vhost.AbsolutePath(), "signature")
Two-Hearts marked this conversation as resolved.
Show resolved Hide resolved
if err := os.MkdirAll(sigDir, 0000); err != nil {
Fail(err.Error())
}
Expand Down
Loading