Skip to content

Add password prompt for P12 files #9

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
merged 1 commit into from
Oct 16, 2022
Merged

Add password prompt for P12 files #9

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
10 changes: 10 additions & 0 deletions internal/bus/bus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/wagoodman/go-partybus"

"github.com/anchore/quill/quill/event"
"github.com/anchore/quill/quill/event/monitor"
)

var publisher partybus.Publisher
Expand Down Expand Up @@ -57,3 +58,12 @@ func Notify(message string) {
Value: message,
})
}

func PromptForInput(message string, sensitive bool, validators ...func(string) error) *monitor.Prompter {
p := monitor.NewPrompter(message, sensitive, validators...)
Publish(partybus.Event{
Type: event.InputPrompt,
Value: monitor.PromptWriter(p),
})
return p
}
38 changes: 24 additions & 14 deletions quill/pem/load_p12.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,43 @@
package pem

import (
"context"
"crypto"
"crypto/x509"
"errors"
"fmt"

"software.sslmate.com/src/go-pkcs12"

"github.com/anchore/quill/internal/bus"
"github.com/anchore/quill/internal/log"
)

func LoadP12(path, password string) (crypto.PrivateKey, []*x509.Certificate, error) {
func LoadP12(path, password string) (crypto.PrivateKey, *x509.Certificate, []*x509.Certificate, error) {
by, err := LoadBytesFromFileOrEnv(path)
if err != nil {
return nil, nil, fmt.Errorf("unable to read p12 file: %w", err)
return nil, nil, nil, fmt.Errorf("unable to read p12 file: %w", err)
}

key, cert, certs, err := pkcs12.DecodeChain(by, password)
if err != nil {
return nil, nil, fmt.Errorf("unable to decode p12 file: %w", err)
}

if key == nil {
return nil, nil, fmt.Errorf("no private key found in the p12")
if errors.Is(err, pkcs12.ErrIncorrectPassword) && password == "" {
prompter := bus.PromptForInput("Enter P12 password:", true)
newPassword, err := prompter.GetPromptResponse(context.Background())
if err != nil {
return nil, nil, nil, fmt.Errorf("unable to get password from prompt: %w", err)
}

log.Redact(newPassword)

key, cert, certs, err = pkcs12.DecodeChain(by, newPassword)
if err != nil {
return nil, nil, nil, fmt.Errorf("unable to decode p12 file: %w", err)
}
} else {
return nil, nil, nil, fmt.Errorf("unable to decode p12 file: %w", err)
}
}

if cert == nil {
return nil, nil, fmt.Errorf("no signing certificate found in the p12")
}

allCerts := append([]*x509.Certificate{cert}, certs...)

return key.(crypto.PrivateKey), allCerts, nil
return key.(crypto.PrivateKey), cert, certs, nil
}
20 changes: 15 additions & 5 deletions quill/pem/signing_material.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,35 @@ func NewSigningMaterialFromPEMs(certFile, privateKeyPath, password string) (*Sig
}

func NewSigningMaterialFromP12(p12Path, password string) (*SigningMaterial, error) {
privateKey, certs, err := LoadP12(p12Path, password)
privateKey, cert, certs, err := LoadP12(p12Path, password)
if err != nil {
return nil, err
return nil, fmt.Errorf("unable to decode p12 file: %w", err)
}

if privateKey == nil {
return nil, fmt.Errorf("no private key found in the p12")
}

if cert == nil {
return nil, fmt.Errorf("no signing certificate found in the p12")
}

allCerts := append([]*x509.Certificate{cert}, certs...)

signer, ok := privateKey.(crypto.Signer)
if !ok {
return nil, fmt.Errorf("unable to derive signer from private key")
}

if len(certs) > 0 {
if err := verifyCertificateChain(certs); err != nil {
if len(allCerts) > 0 {
if err := verifyCertificateChain(allCerts); err != nil {
return nil, err
}
}

return &SigningMaterial{
Signer: signer,
Certs: sortCertificates(certs),
Certs: sortCertificates(allCerts),
}, nil
}

Expand Down