forked from TrueCloudLab/certificates
parent
567d96c771
commit
f0a24bd8ca
4 changed files with 16 additions and 2 deletions
|
@ -112,9 +112,13 @@ type MockProvisioner struct {
|
||||||
MauthorizeOrderIdentifier func(ctx context.Context, identifier provisioner.ACMEIdentifier) error
|
MauthorizeOrderIdentifier func(ctx context.Context, identifier provisioner.ACMEIdentifier) error
|
||||||
MauthorizeSign func(ctx context.Context, ott string) ([]provisioner.SignOption, error)
|
MauthorizeSign func(ctx context.Context, ott string) ([]provisioner.SignOption, error)
|
||||||
MauthorizeRevoke func(ctx context.Context, token string) error
|
MauthorizeRevoke func(ctx context.Context, token string) error
|
||||||
|
<<<<<<< HEAD
|
||||||
MisChallengeEnabled func(ctx context.Context, challenge provisioner.ACMEChallenge) bool
|
MisChallengeEnabled func(ctx context.Context, challenge provisioner.ACMEChallenge) bool
|
||||||
MisAttFormatEnabled func(ctx context.Context, format provisioner.ACMEAttestationFormat) bool
|
MisAttFormatEnabled func(ctx context.Context, format provisioner.ACMEAttestationFormat) bool
|
||||||
MgetAttestationRoots func() (*x509.CertPool, bool)
|
MgetAttestationRoots func() (*x509.CertPool, bool)
|
||||||
|
=======
|
||||||
|
MauthorizeChallenge func(Ctx context.Context, challenge string) error
|
||||||
|
>>>>>>> 0f84b333 (Add acme property to enable challenges)
|
||||||
MdefaultTLSCertDuration func() time.Duration
|
MdefaultTLSCertDuration func() time.Duration
|
||||||
MgetOptions func() *provisioner.Options
|
MgetOptions func() *provisioner.Options
|
||||||
}
|
}
|
||||||
|
@ -151,6 +155,7 @@ func (m *MockProvisioner) AuthorizeRevoke(ctx context.Context, token string) err
|
||||||
return m.Merr
|
return m.Merr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
// IsChallengeEnabled mock
|
// IsChallengeEnabled mock
|
||||||
func (m *MockProvisioner) IsChallengeEnabled(ctx context.Context, challenge provisioner.ACMEChallenge) bool {
|
func (m *MockProvisioner) IsChallengeEnabled(ctx context.Context, challenge provisioner.ACMEChallenge) bool {
|
||||||
if m.MisChallengeEnabled != nil {
|
if m.MisChallengeEnabled != nil {
|
||||||
|
@ -172,6 +177,14 @@ func (m *MockProvisioner) GetAttestationRoots() (*x509.CertPool, bool) {
|
||||||
return m.MgetAttestationRoots()
|
return m.MgetAttestationRoots()
|
||||||
}
|
}
|
||||||
return m.Mret1.(*x509.CertPool), m.Mret1 != nil
|
return m.Mret1.(*x509.CertPool), m.Mret1 != nil
|
||||||
|
=======
|
||||||
|
// AuthorizeChallenge mock
|
||||||
|
func (m *MockProvisioner) AuthorizeChallenge(ctx context.Context, challenge string) error {
|
||||||
|
if m.MauthorizeChallenge != nil {
|
||||||
|
return m.MauthorizeChallenge(ctx, challenge)
|
||||||
|
}
|
||||||
|
return m.Merr
|
||||||
|
>>>>>>> 0f84b333 (Add acme property to enable challenges)
|
||||||
}
|
}
|
||||||
|
|
||||||
// DefaultTLSCertDuration mock
|
// DefaultTLSCertDuration mock
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
cpackage acme
|
package acme
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
|
|
@ -217,6 +217,7 @@ type ACMEIdentifier struct {
|
||||||
// AuthorizeOrderIdentifier verifies the provisioner is allowed to issue a
|
// AuthorizeOrderIdentifier verifies the provisioner is allowed to issue a
|
||||||
// certificate for an ACME Order Identifier.
|
// certificate for an ACME Order Identifier.
|
||||||
func (p *ACME) AuthorizeOrderIdentifier(ctx context.Context, identifier ACMEIdentifier) error {
|
func (p *ACME) AuthorizeOrderIdentifier(ctx context.Context, identifier ACMEIdentifier) error {
|
||||||
|
|
||||||
x509Policy := p.ctl.getPolicy().getX509()
|
x509Policy := p.ctl.getPolicy().getX509()
|
||||||
|
|
||||||
// identifier is allowed if no policy is configured
|
// identifier is allowed if no policy is configured
|
||||||
|
|
|
@ -145,6 +145,7 @@ func (a *Authority) generateProvisionerConfig(ctx context.Context) (provisioner.
|
||||||
AuthorizeRenewFunc: a.authorizeRenewFunc,
|
AuthorizeRenewFunc: a.authorizeRenewFunc,
|
||||||
AuthorizeSSHRenewFunc: a.authorizeSSHRenewFunc,
|
AuthorizeSSHRenewFunc: a.authorizeSSHRenewFunc,
|
||||||
}, nil
|
}, nil
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// StoreProvisioner stores a provisioner to the authority.
|
// StoreProvisioner stores a provisioner to the authority.
|
||||||
|
@ -529,7 +530,6 @@ func durationsToLinkedca(d *provisioner.Duration) string {
|
||||||
// certifictes claims type.
|
// certifictes claims type.
|
||||||
func claimsToCertificates(c *linkedca.Claims) (*provisioner.Claims, error) {
|
func claimsToCertificates(c *linkedca.Claims) (*provisioner.Claims, error) {
|
||||||
if c == nil {
|
if c == nil {
|
||||||
//nolint:nilnil // legacy
|
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue