Skip to content

Fix: Ensure step ca rekey --daemon generates new keys as expected #1441

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Ensure step ca rekey --daemon generates new keys as expected #1441

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
53 changes: 31 additions & 22 deletions command/ca/rekey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,10 @@ func rekeyCertificateAction(ctx *cli.Context) error {
// Force is always enabled when daemon mode is used
ctx.Set("force", "true")
next := nextRenewDuration(leaf, expiresIn, rekeyPeriod)
return renewer.Daemon(outCert, next, expiresIn, rekeyPeriod, afterRekey)
rekeyFunc := func() error {
return renewer.RekeyAndWrite(ctx, outCert, outKey, givenPrivate, passFile, kmsURI)
}
return renewer.Daemon(outCert,next,expiresIn,rekeyPeriod, afterRekey, rekeyFunc)
}

// Do not rekey if (cert.notAfter - now) > (expiresIn + jitter)
Expand All @@ -353,27 +356,7 @@ func rekeyCertificateAction(ctx *cli.Context) error {
}
}

var signer crypto.Signer
if givenPrivate == "" {
kty, crv, size, err := utils.GetKeyDetailsFromCLI(ctx, false, "kty", "curve", "size")
if err != nil {
return err
}
signer, err = keyutil.GenerateSigner(kty, crv, size)
if err != nil {
return err
}
} else {
opts := []pemutil.Options{pemutil.WithFilename(givenPrivate)}
if passFile != "" {
opts = append(opts, pemutil.WithPasswordFile(passFile))
}
signer, err = cryptoutil.CreateSigner(kmsURI, givenPrivate, opts...)
if err != nil {
return err
}
}
if _, err := renewer.Rekey(signer, outCert, outKey, ctx.IsSet("out-key") || givenPrivate == ""); err != nil {
if err := renewer.RekeyAndWrite(ctx, outCert, outKey, givenPrivate, passFile, kmsURI); err != nil {
return err
}

Expand All @@ -386,3 +369,29 @@ func rekeyCertificateAction(ctx *cli.Context) error {
}
return afterRekey()
}
func (r *renewer) RekeyAndWrite(ctx *cli.Context, outCert, outKey, givenPrivate, passFile, kmsURI string) error {
signer, err := generateSigner(ctx, givenPrivate, passFile, kmsURI)
if err != nil {
return err
}
if _, err := r.Rekey(signer, outCert, outKey, ctx.IsSet("out-key") || givenPrivate == ""); err != nil {
return err
}
return nil
}

func generateSigner(ctx *cli.Context, givenPrivate, passFile, kmsURI string) (crypto.Signer, error) {
if givenPrivate == "" {
kty, crv, size, err := utils.GetKeyDetailsFromCLI(ctx, false, "kty", "curve", "size")
if err != nil {
return nil, err
}
return keyutil.GenerateSigner(kty, crv, size)
} else {
opts := []pemutil.Options{pemutil.WithFilename(givenPrivate)}
if passFile != "" {
opts = append(opts, pemutil.WithPasswordFile(passFile))
}
return cryptoutil.CreateSigner(kmsURI, givenPrivate, opts...)
}
}
14 changes: 12 additions & 2 deletions command/ca/renew.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func renewCertificateAction(ctx *cli.Context) error {
// Force is always enabled when daemon mode is used
ctx.Set("force", "true")
next := nextRenewDuration(cert.Leaf, expiresIn, renewPeriod)
return renewer.Daemon(outFile, next, expiresIn, renewPeriod, afterRenew)
return renewer.Daemon(outFile, next, expiresIn, renewPeriod, afterRenew, nil)
}

// Do not renew if (cert.notAfter - now) > (expiresIn + jitter)
Expand Down Expand Up @@ -578,7 +578,7 @@ func (r *renewer) RenewAndPrepareNext(outFile string, expiresIn, renewPeriod tim
return next, nil
}

func (r *renewer) Daemon(outFile string, next, expiresIn, renewPeriod time.Duration, afterRenew func() error) error {
func (r *renewer) Daemon(outFile string, next, expiresIn, renewPeriod time.Duration, afterRenew func() error, rekeyFunc func() error) error {
// Loggers
infoLog := log.New(os.Stdout, "INFO: ", log.LstdFlags)
errLog := log.New(os.Stderr, "ERROR: ", log.LstdFlags)
Expand All @@ -600,6 +600,11 @@ func (r *renewer) Daemon(outFile string, next, expiresIn, renewPeriod time.Durat
} else if err := afterRenew(); err != nil {
errLog.Println(err)
}
if rekeyFunc != nil {
if err := rekeyFunc(); err != nil {
errLog.Println(err)
}
}
case syscall.SIGINT, syscall.SIGTERM:
return nil
}
Expand All @@ -609,6 +614,11 @@ func (r *renewer) Daemon(outFile string, next, expiresIn, renewPeriod time.Durat
} else if err := afterRenew(); err != nil {
errLog.Println(err)
}
if rekeyFunc != nil {
if err := rekeyFunc(); err != nil {
errLog.Println(err)
}
}
}
}
}
Expand Down