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

Jump to bottom

Update sign output to note when signatures are pushed #1117

Merged
merged 1 commit into from
Dec 1, 2021
Merged

Update sign output to note when signatures are pushed #1117

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
2 changes: 1 addition & 1 deletion cmd/cosign/cli/generate/generate_key_pair.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ func isTerminal() bool {
func getPassFromTerm(confirm bool) ([]byte, error) {
fmt.Fprint(os.Stderr, "Enter password for private key: ")
pw1, err := term.ReadPassword(0)
fmt.Fprintln(os.Stderr)
if err != nil {
return nil, err
}
if !confirm {
return pw1, nil
}
fmt.Fprintln(os.Stderr)
fmt.Fprint(os.Stderr, "Enter password for private key again: ")
pw2, err := term.ReadPassword(0)
fmt.Fprintln(os.Stderr)
Expand Down
24 changes: 13 additions & 11 deletions cmd/cosign/cli/sign/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,6 @@ func signDigest(ctx context.Context, digest name.Digest, payload []byte, ko KeyO
}
}

out := os.Stdout
if output != "" {
out, err = os.Create(output)
if err != nil {
return errors.Wrap(err, "create signature file")
}
defer out.Close()
}

var s icos.Signer
s = ipayload.NewSigner(sv, nil, nil)
s = ifulcio.NewSigner(s, sv.Cert, sv.Chain)
Expand All @@ -232,8 +223,17 @@ func signDigest(ctx context.Context, digest name.Digest, payload []byte, ko KeyO
if err != nil {
return err
}
if _, err := out.Write([]byte(b64sig)); err != nil {
return errors.Wrap(err, "write signature to file")

if output != "" {
out, err := os.Create(output)
if err != nil {
return errors.Wrap(err, "create signature file")
}
defer out.Close()

if _, err := out.Write([]byte(b64sig)); err != nil {
return errors.Wrap(err, "write signature to file")
}
}

if !upload {
Expand All @@ -252,6 +252,8 @@ func signDigest(ctx context.Context, digest name.Digest, payload []byte, ko KeyO
return errors.Wrap(err, "constructing client options")
}

fmt.Fprintln(os.Stderr, "Pushing signature to:", digest.Repository)

// Publish the signatures associated with this entity
if err := ociremote.WriteSignatures(digest.Repository, newSE, walkOpts...); err != nil {
return err
Expand Down