2018-10-05 21:48:36 +00:00
|
|
|
package authority
|
|
|
|
|
|
|
|
import (
|
|
|
|
"crypto/rand"
|
|
|
|
"crypto/sha1"
|
|
|
|
"crypto/x509"
|
|
|
|
"crypto/x509/pkix"
|
2018-10-26 06:49:23 +00:00
|
|
|
"encoding/asn1"
|
2018-10-05 21:48:36 +00:00
|
|
|
"fmt"
|
|
|
|
"net/http"
|
2019-02-15 00:44:36 +00:00
|
|
|
"reflect"
|
2018-10-05 21:48:36 +00:00
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/smallstep/assert"
|
2019-03-08 03:30:17 +00:00
|
|
|
"github.com/smallstep/certificates/authority/provisioner"
|
2018-10-05 21:48:36 +00:00
|
|
|
"github.com/smallstep/cli/crypto/keys"
|
|
|
|
"github.com/smallstep/cli/crypto/tlsutil"
|
|
|
|
"github.com/smallstep/cli/crypto/x509util"
|
2019-02-15 03:17:42 +00:00
|
|
|
stepx509 "github.com/smallstep/cli/pkg/x509"
|
2018-10-05 21:48:36 +00:00
|
|
|
)
|
|
|
|
|
2019-02-07 00:26:25 +00:00
|
|
|
func getCSR(t *testing.T, priv interface{}, opts ...func(*x509.CertificateRequest)) *x509.CertificateRequest {
|
2018-10-05 21:48:36 +00:00
|
|
|
_csr := &x509.CertificateRequest{
|
2019-02-07 00:26:25 +00:00
|
|
|
Subject: pkix.Name{CommonName: "smallstep test"},
|
2018-10-05 21:48:36 +00:00
|
|
|
DNSNames: []string{"test.smallstep.com"},
|
|
|
|
}
|
2019-02-07 00:26:25 +00:00
|
|
|
for _, opt := range opts {
|
|
|
|
opt(_csr)
|
|
|
|
}
|
2018-10-05 21:48:36 +00:00
|
|
|
csrBytes, err := x509.CreateCertificateRequest(rand.Reader, _csr, priv)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
csr, err := x509.ParseCertificateRequest(csrBytes)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
return csr
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestSign(t *testing.T) {
|
|
|
|
pub, priv, err := keys.GenerateDefaultKeyPair()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
|
|
|
a := testAuthority(t)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
a.config.AuthorityConfig.Template = &x509util.ASN1DN{
|
|
|
|
Country: "Tazmania",
|
|
|
|
Organization: "Acme Co",
|
|
|
|
Locality: "Landscapes",
|
|
|
|
Province: "Sudden Cliffs",
|
|
|
|
StreetAddress: "TNT",
|
2018-10-19 05:26:39 +00:00
|
|
|
CommonName: "test.smallstep.com",
|
2018-10-05 21:48:36 +00:00
|
|
|
}
|
|
|
|
|
2018-10-19 05:26:39 +00:00
|
|
|
nb := time.Now()
|
2019-03-08 03:30:17 +00:00
|
|
|
signOpts := provisioner.Options{
|
2018-10-19 05:26:39 +00:00
|
|
|
NotBefore: nb,
|
|
|
|
NotAfter: nb.Add(time.Minute * 5),
|
|
|
|
}
|
2018-10-05 21:48:36 +00:00
|
|
|
|
2019-03-08 03:30:17 +00:00
|
|
|
p := a.config.AuthorityConfig.Provisioners[1].(*provisioner.JWK)
|
|
|
|
extraOpts := []provisioner.SignOption{
|
|
|
|
// &commonNameClaim{"smallstep test"},
|
|
|
|
// &dnsNamesClaim{[]string{"test.smallstep.com"}},
|
|
|
|
// &ipAddressesClaim{[]net.IP{}},
|
|
|
|
// p,
|
2019-02-07 00:26:25 +00:00
|
|
|
}
|
2018-10-26 06:49:23 +00:00
|
|
|
|
2018-10-05 21:48:36 +00:00
|
|
|
type signTest struct {
|
2018-10-19 05:26:39 +00:00
|
|
|
auth *Authority
|
|
|
|
csr *x509.CertificateRequest
|
2019-03-08 03:30:17 +00:00
|
|
|
signOpts provisioner.Options
|
|
|
|
extraOpts []provisioner.SignOption
|
2018-10-19 05:26:39 +00:00
|
|
|
err *apiError
|
2018-10-05 21:48:36 +00:00
|
|
|
}
|
|
|
|
tests := map[string]func(*testing.T) *signTest{
|
2018-10-19 05:26:39 +00:00
|
|
|
"fail invalid extra option": func(t *testing.T) *signTest {
|
2018-10-05 21:48:36 +00:00
|
|
|
csr := getCSR(t, priv)
|
2018-10-19 05:26:39 +00:00
|
|
|
csr.Raw = []byte("foo")
|
2018-10-05 21:48:36 +00:00
|
|
|
return &signTest{
|
2018-10-26 06:49:23 +00:00
|
|
|
auth: a,
|
|
|
|
csr: csr,
|
2019-02-07 00:26:25 +00:00
|
|
|
extraOpts: append(extraOpts, "42"),
|
2018-10-26 06:49:23 +00:00
|
|
|
signOpts: signOpts,
|
2018-10-19 05:26:39 +00:00
|
|
|
err: &apiError{errors.New("sign: invalid extra option type string"),
|
|
|
|
http.StatusInternalServerError,
|
|
|
|
context{"csr": csr, "signOptions": signOpts},
|
2018-10-05 21:48:36 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
2018-10-19 05:26:39 +00:00
|
|
|
"fail convert csr to step format": func(t *testing.T) *signTest {
|
2018-10-05 21:48:36 +00:00
|
|
|
csr := getCSR(t, priv)
|
|
|
|
csr.Raw = []byte("foo")
|
|
|
|
return &signTest{
|
2018-10-26 06:49:23 +00:00
|
|
|
auth: a,
|
|
|
|
csr: csr,
|
2019-02-07 00:26:25 +00:00
|
|
|
extraOpts: extraOpts,
|
2018-10-26 06:49:23 +00:00
|
|
|
signOpts: signOpts,
|
2018-10-19 05:26:39 +00:00
|
|
|
err: &apiError{errors.New("sign: error converting x509 csr to stepx509 csr"),
|
|
|
|
http.StatusInternalServerError,
|
|
|
|
context{"csr": csr, "signOptions": signOpts},
|
2018-10-05 21:48:36 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
2018-10-19 05:26:39 +00:00
|
|
|
"fail merge default ASN1DN": func(t *testing.T) *signTest {
|
2018-10-05 21:48:36 +00:00
|
|
|
_a := testAuthority(t)
|
|
|
|
_a.config.AuthorityConfig.Template = nil
|
|
|
|
csr := getCSR(t, priv)
|
|
|
|
return &signTest{
|
2018-10-26 06:49:23 +00:00
|
|
|
auth: _a,
|
|
|
|
csr: csr,
|
2019-02-07 00:26:25 +00:00
|
|
|
extraOpts: extraOpts,
|
2018-10-26 06:49:23 +00:00
|
|
|
signOpts: signOpts,
|
2018-10-19 05:26:39 +00:00
|
|
|
err: &apiError{errors.New("sign: default ASN1DN template cannot be nil"),
|
|
|
|
http.StatusInternalServerError,
|
|
|
|
context{"csr": csr, "signOptions": signOpts},
|
2018-10-05 21:48:36 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
2018-10-19 05:26:39 +00:00
|
|
|
"fail create cert": func(t *testing.T) *signTest {
|
2018-10-05 21:48:36 +00:00
|
|
|
_a := testAuthority(t)
|
|
|
|
_a.intermediateIdentity.Key = nil
|
|
|
|
csr := getCSR(t, priv)
|
|
|
|
return &signTest{
|
2018-10-26 06:49:23 +00:00
|
|
|
auth: _a,
|
|
|
|
csr: csr,
|
2019-03-08 03:30:17 +00:00
|
|
|
extraOpts: []provisioner.SignOption{p},
|
2018-10-26 06:49:23 +00:00
|
|
|
signOpts: signOpts,
|
2018-10-19 05:26:39 +00:00
|
|
|
err: &apiError{errors.New("sign: error creating new leaf certificate"),
|
|
|
|
http.StatusInternalServerError,
|
|
|
|
context{"csr": csr, "signOptions": signOpts},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"fail provisioner duration claim": func(t *testing.T) *signTest {
|
|
|
|
csr := getCSR(t, priv)
|
2019-03-08 03:30:17 +00:00
|
|
|
_signOpts := provisioner.Options{
|
2018-10-19 05:26:39 +00:00
|
|
|
NotBefore: nb,
|
|
|
|
NotAfter: nb.Add(time.Hour * 25),
|
|
|
|
}
|
|
|
|
return &signTest{
|
2018-10-26 06:49:23 +00:00
|
|
|
auth: a,
|
|
|
|
csr: csr,
|
2019-02-07 00:26:25 +00:00
|
|
|
extraOpts: extraOpts,
|
2018-10-26 06:49:23 +00:00
|
|
|
signOpts: _signOpts,
|
2018-10-19 05:26:39 +00:00
|
|
|
err: &apiError{errors.New("sign: requested duration of 25h0m0s is more than the authorized maximum certificate duration of 24h0m0s"),
|
|
|
|
http.StatusUnauthorized,
|
|
|
|
context{"csr": csr, "signOptions": _signOpts},
|
2018-10-05 21:48:36 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
2019-02-07 00:26:25 +00:00
|
|
|
"fail validate sans when adding common name not in claims": func(t *testing.T) *signTest {
|
|
|
|
csr := getCSR(t, priv, func(csr *x509.CertificateRequest) {
|
|
|
|
csr.DNSNames = append(csr.DNSNames, csr.Subject.CommonName)
|
|
|
|
})
|
|
|
|
return &signTest{
|
|
|
|
auth: a,
|
|
|
|
csr: csr,
|
|
|
|
extraOpts: extraOpts,
|
|
|
|
signOpts: signOpts,
|
|
|
|
err: &apiError{errors.New("sign: DNS names claim failed - got [test.smallstep.com smallstep test], want [test.smallstep.com]"),
|
|
|
|
http.StatusUnauthorized,
|
|
|
|
context{"csr": csr, "signOptions": signOpts},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
},
|
2018-10-19 05:26:39 +00:00
|
|
|
"ok": func(t *testing.T) *signTest {
|
2018-10-05 21:48:36 +00:00
|
|
|
csr := getCSR(t, priv)
|
|
|
|
return &signTest{
|
2018-10-26 06:49:23 +00:00
|
|
|
auth: a,
|
|
|
|
csr: csr,
|
2019-02-07 00:26:25 +00:00
|
|
|
extraOpts: extraOpts,
|
2018-10-26 06:49:23 +00:00
|
|
|
signOpts: signOpts,
|
2018-10-05 21:48:36 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for name, genTestCase := range tests {
|
|
|
|
t.Run(name, func(t *testing.T) {
|
|
|
|
tc := genTestCase(t)
|
|
|
|
|
2018-10-19 05:26:39 +00:00
|
|
|
leaf, intermediate, err := tc.auth.Sign(tc.csr, tc.signOpts, tc.extraOpts...)
|
2018-10-05 21:48:36 +00:00
|
|
|
if err != nil {
|
|
|
|
if assert.NotNil(t, tc.err) {
|
|
|
|
switch v := err.(type) {
|
|
|
|
case *apiError:
|
|
|
|
assert.HasPrefix(t, v.err.Error(), tc.err.Error())
|
|
|
|
assert.Equals(t, v.code, tc.err.code)
|
|
|
|
assert.Equals(t, v.context, tc.err.context)
|
|
|
|
default:
|
|
|
|
t.Errorf("unexpected error type: %T", v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if assert.Nil(t, tc.err) {
|
2018-10-19 05:26:39 +00:00
|
|
|
assert.Equals(t, leaf.NotBefore, signOpts.NotBefore.UTC().Truncate(time.Second))
|
|
|
|
assert.Equals(t, leaf.NotAfter, signOpts.NotAfter.UTC().Truncate(time.Second))
|
2018-10-05 21:48:36 +00:00
|
|
|
tmplt := a.config.AuthorityConfig.Template
|
|
|
|
assert.Equals(t, fmt.Sprintf("%v", leaf.Subject),
|
|
|
|
fmt.Sprintf("%v", &pkix.Name{
|
|
|
|
Country: []string{tmplt.Country},
|
|
|
|
Organization: []string{tmplt.Organization},
|
|
|
|
Locality: []string{tmplt.Locality},
|
|
|
|
StreetAddress: []string{tmplt.StreetAddress},
|
|
|
|
Province: []string{tmplt.Province},
|
2019-02-07 00:26:25 +00:00
|
|
|
CommonName: "smallstep test",
|
2018-10-05 21:48:36 +00:00
|
|
|
}))
|
|
|
|
assert.Equals(t, leaf.Issuer, intermediate.Subject)
|
|
|
|
|
|
|
|
assert.Equals(t, leaf.SignatureAlgorithm, x509.ECDSAWithSHA256)
|
|
|
|
assert.Equals(t, leaf.PublicKeyAlgorithm, x509.ECDSA)
|
|
|
|
assert.Equals(t, leaf.ExtKeyUsage,
|
|
|
|
[]x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth})
|
2018-10-19 05:26:39 +00:00
|
|
|
assert.Equals(t, leaf.DNSNames, []string{"test.smallstep.com"})
|
2018-10-05 21:48:36 +00:00
|
|
|
|
|
|
|
pubBytes, err := x509.MarshalPKIXPublicKey(pub)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
hash := sha1.Sum(pubBytes)
|
|
|
|
assert.Equals(t, leaf.SubjectKeyId, hash[:])
|
|
|
|
|
|
|
|
assert.Equals(t, leaf.AuthorityKeyId, a.intermediateIdentity.Crt.SubjectKeyId)
|
|
|
|
|
2018-10-26 06:49:23 +00:00
|
|
|
// Verify Provisioner OID
|
|
|
|
found := 0
|
|
|
|
for _, ext := range leaf.Extensions {
|
|
|
|
id := ext.Id.String()
|
2018-10-26 21:24:16 +00:00
|
|
|
if id != stepOIDProvisioner.String() {
|
2018-10-26 06:49:23 +00:00
|
|
|
continue
|
|
|
|
}
|
|
|
|
found++
|
2018-10-26 21:24:16 +00:00
|
|
|
val := stepProvisionerASN1{}
|
|
|
|
_, err := asn1.Unmarshal(ext.Value, &val)
|
2018-10-26 06:49:23 +00:00
|
|
|
assert.FatalError(t, err)
|
2018-10-26 21:24:16 +00:00
|
|
|
assert.Equals(t, val.Type, provisionerTypeJWK)
|
2018-10-30 01:00:30 +00:00
|
|
|
assert.Equals(t, val.Name, []byte(p.Name))
|
2018-10-26 21:24:16 +00:00
|
|
|
assert.Equals(t, val.CredentialID, []byte(p.Key.KeyID))
|
2018-10-26 06:49:23 +00:00
|
|
|
}
|
2018-10-26 21:24:16 +00:00
|
|
|
assert.Equals(t, found, 1)
|
2018-10-26 06:49:23 +00:00
|
|
|
|
2018-10-05 21:48:36 +00:00
|
|
|
realIntermediate, err := x509.ParseCertificate(a.intermediateIdentity.Crt.Raw)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
assert.Equals(t, intermediate, realIntermediate)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRenew(t *testing.T) {
|
|
|
|
pub, _, err := keys.GenerateDefaultKeyPair()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
|
|
|
a := testAuthority(t)
|
|
|
|
a.config.AuthorityConfig.Template = &x509util.ASN1DN{
|
|
|
|
Country: "Tazmania",
|
|
|
|
Organization: "Acme Co",
|
|
|
|
Locality: "Landscapes",
|
|
|
|
Province: "Sudden Cliffs",
|
|
|
|
StreetAddress: "TNT",
|
|
|
|
CommonName: "renew",
|
|
|
|
}
|
|
|
|
|
|
|
|
now := time.Now().UTC()
|
|
|
|
nb1 := now.Add(-time.Minute * 7)
|
|
|
|
na1 := now
|
2019-03-08 03:30:17 +00:00
|
|
|
so := &provisioner.Options{
|
2018-10-05 21:48:36 +00:00
|
|
|
NotBefore: nb1,
|
|
|
|
NotAfter: na1,
|
|
|
|
}
|
|
|
|
|
|
|
|
leaf, err := x509util.NewLeafProfile("renew", a.intermediateIdentity.Crt,
|
|
|
|
a.intermediateIdentity.Key,
|
2018-10-19 05:26:39 +00:00
|
|
|
x509util.WithNotBeforeAfterDuration(so.NotBefore, so.NotAfter, 0),
|
2018-10-05 21:48:36 +00:00
|
|
|
withDefaultASN1DN(a.config.AuthorityConfig.Template),
|
2019-02-15 00:44:36 +00:00
|
|
|
x509util.WithPublicKey(pub), x509util.WithHosts("test.smallstep.com,test"),
|
2019-03-08 03:30:17 +00:00
|
|
|
withProvisionerOID("Max", a.config.AuthorityConfig.Provisioners[0].(*provisioner.JWK).Key.KeyID))
|
2018-10-05 21:48:36 +00:00
|
|
|
assert.FatalError(t, err)
|
|
|
|
crtBytes, err := leaf.CreateCertificate()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
crt, err := x509.ParseCertificate(crtBytes)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
2018-11-01 22:43:24 +00:00
|
|
|
leafNoRenew, err := x509util.NewLeafProfile("norenew", a.intermediateIdentity.Crt,
|
|
|
|
a.intermediateIdentity.Key,
|
|
|
|
x509util.WithNotBeforeAfterDuration(so.NotBefore, so.NotAfter, 0),
|
|
|
|
withDefaultASN1DN(a.config.AuthorityConfig.Template),
|
|
|
|
x509util.WithPublicKey(pub), x509util.WithHosts("test.smallstep.com,test"),
|
2019-03-08 03:30:17 +00:00
|
|
|
withProvisionerOID("dev", a.config.AuthorityConfig.Provisioners[2].(*provisioner.JWK).Key.KeyID),
|
2018-11-01 22:43:24 +00:00
|
|
|
)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
crtBytesNoRenew, err := leafNoRenew.CreateCertificate()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
crtNoRenew, err := x509.ParseCertificate(crtBytesNoRenew)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
2018-10-05 21:48:36 +00:00
|
|
|
type renewTest struct {
|
|
|
|
auth *Authority
|
|
|
|
crt *x509.Certificate
|
|
|
|
err *apiError
|
|
|
|
}
|
|
|
|
tests := map[string]func() (*renewTest, error){
|
|
|
|
"fail-conversion-stepx509": func() (*renewTest, error) {
|
|
|
|
return &renewTest{
|
|
|
|
crt: &x509.Certificate{Raw: []byte("foo")},
|
|
|
|
err: &apiError{errors.New("error converting x509.Certificate to stepx509.Certificate"),
|
|
|
|
http.StatusInternalServerError, context{}},
|
|
|
|
}, nil
|
|
|
|
},
|
|
|
|
"fail-create-cert": func() (*renewTest, error) {
|
|
|
|
_a := testAuthority(t)
|
|
|
|
_a.intermediateIdentity.Key = nil
|
|
|
|
return &renewTest{
|
|
|
|
auth: _a,
|
|
|
|
crt: crt,
|
|
|
|
err: &apiError{errors.New("error renewing certificate from existing server certificate"),
|
|
|
|
http.StatusInternalServerError, context{}},
|
|
|
|
}, nil
|
|
|
|
},
|
2018-11-01 22:43:24 +00:00
|
|
|
"fail-unauthorized": func() (*renewTest, error) {
|
|
|
|
ctx := map[string]interface{}{
|
|
|
|
"serialNumber": crtNoRenew.SerialNumber.String(),
|
|
|
|
}
|
|
|
|
return &renewTest{
|
|
|
|
crt: crtNoRenew,
|
|
|
|
err: &apiError{errors.New("renew disabled"),
|
|
|
|
http.StatusUnauthorized, ctx},
|
|
|
|
}, nil
|
|
|
|
},
|
2018-10-05 21:48:36 +00:00
|
|
|
"success": func() (*renewTest, error) {
|
|
|
|
return &renewTest{
|
2019-02-15 03:17:42 +00:00
|
|
|
auth: a,
|
|
|
|
crt: crt,
|
|
|
|
}, nil
|
|
|
|
},
|
|
|
|
"success-new-intermediate": func() (*renewTest, error) {
|
|
|
|
newRootProfile, err := x509util.NewRootProfile("new-root")
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
newRootBytes, err := newRootProfile.CreateCertificate()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
newRootCrt, err := stepx509.ParseCertificate(newRootBytes)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
|
|
|
newIntermediateProfile, err := x509util.NewIntermediateProfile("new-intermediate",
|
|
|
|
newRootCrt, newRootProfile.SubjectPrivateKey())
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
newIntermediateBytes, err := newIntermediateProfile.CreateCertificate()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
newIntermediateCrt, err := stepx509.ParseCertificate(newIntermediateBytes)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
|
|
|
_a := testAuthority(t)
|
|
|
|
_a.intermediateIdentity.Key = newIntermediateProfile.SubjectPrivateKey()
|
|
|
|
_a.intermediateIdentity.Crt = newIntermediateCrt
|
|
|
|
return &renewTest{
|
|
|
|
auth: _a,
|
|
|
|
crt: crt,
|
2018-10-05 21:48:36 +00:00
|
|
|
}, nil
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for name, genTestCase := range tests {
|
|
|
|
t.Run(name, func(t *testing.T) {
|
|
|
|
tc, err := genTestCase()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
|
|
|
var leaf, intermediate *x509.Certificate
|
|
|
|
if tc.auth != nil {
|
|
|
|
leaf, intermediate, err = tc.auth.Renew(tc.crt)
|
|
|
|
} else {
|
|
|
|
leaf, intermediate, err = a.Renew(tc.crt)
|
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
if assert.NotNil(t, tc.err) {
|
|
|
|
switch v := err.(type) {
|
|
|
|
case *apiError:
|
|
|
|
assert.HasPrefix(t, v.err.Error(), tc.err.Error())
|
|
|
|
assert.Equals(t, v.code, tc.err.code)
|
|
|
|
assert.Equals(t, v.context, tc.err.context)
|
|
|
|
default:
|
|
|
|
t.Errorf("unexpected error type: %T", v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if assert.Nil(t, tc.err) {
|
2019-02-15 03:17:42 +00:00
|
|
|
assert.Equals(t, leaf.NotAfter.Sub(leaf.NotBefore), tc.crt.NotAfter.Sub(crt.NotBefore))
|
2018-10-05 21:48:36 +00:00
|
|
|
|
|
|
|
assert.True(t, leaf.NotBefore.After(now.Add(-time.Minute)))
|
|
|
|
assert.True(t, leaf.NotBefore.Before(now.Add(time.Minute)))
|
|
|
|
|
|
|
|
expiry := now.Add(time.Minute * 7)
|
|
|
|
assert.True(t, leaf.NotAfter.After(expiry.Add(-time.Minute)))
|
|
|
|
assert.True(t, leaf.NotAfter.Before(expiry.Add(time.Minute)))
|
|
|
|
|
|
|
|
tmplt := a.config.AuthorityConfig.Template
|
|
|
|
assert.Equals(t, fmt.Sprintf("%v", leaf.Subject),
|
|
|
|
fmt.Sprintf("%v", &pkix.Name{
|
|
|
|
Country: []string{tmplt.Country},
|
|
|
|
Organization: []string{tmplt.Organization},
|
|
|
|
Locality: []string{tmplt.Locality},
|
|
|
|
StreetAddress: []string{tmplt.StreetAddress},
|
|
|
|
Province: []string{tmplt.Province},
|
|
|
|
CommonName: tmplt.CommonName,
|
|
|
|
}))
|
|
|
|
assert.Equals(t, leaf.Issuer, intermediate.Subject)
|
|
|
|
|
|
|
|
assert.Equals(t, leaf.SignatureAlgorithm, x509.ECDSAWithSHA256)
|
|
|
|
assert.Equals(t, leaf.PublicKeyAlgorithm, x509.ECDSA)
|
|
|
|
assert.Equals(t, leaf.ExtKeyUsage,
|
|
|
|
[]x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth})
|
|
|
|
assert.Equals(t, leaf.DNSNames, []string{"test.smallstep.com", "test"})
|
|
|
|
|
|
|
|
pubBytes, err := x509.MarshalPKIXPublicKey(pub)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
hash := sha1.Sum(pubBytes)
|
|
|
|
assert.Equals(t, leaf.SubjectKeyId, hash[:])
|
|
|
|
|
2019-02-15 03:17:42 +00:00
|
|
|
// We did not change the intermediate before renewing.
|
|
|
|
if a.intermediateIdentity.Crt.SerialNumber == tc.auth.intermediateIdentity.Crt.SerialNumber {
|
|
|
|
assert.Equals(t, leaf.AuthorityKeyId, a.intermediateIdentity.Crt.SubjectKeyId)
|
|
|
|
// Compare extensions: they can be in a different order
|
|
|
|
for _, ext1 := range tc.crt.Extensions {
|
|
|
|
found := false
|
|
|
|
for _, ext2 := range leaf.Extensions {
|
|
|
|
if reflect.DeepEqual(ext1, ext2) {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
t.Errorf("x509 extension %s not found in renewed certificate", ext1.Id.String())
|
2019-02-15 00:44:36 +00:00
|
|
|
}
|
|
|
|
}
|
2019-02-15 03:17:42 +00:00
|
|
|
} else {
|
|
|
|
// We did change the intermediate before renewing.
|
|
|
|
assert.Equals(t, leaf.AuthorityKeyId, tc.auth.intermediateIdentity.Crt.SubjectKeyId)
|
|
|
|
// Compare extensions: they can be in a different order
|
|
|
|
for _, ext1 := range tc.crt.Extensions {
|
|
|
|
// The authority key id extension should be different b/c the intermediates are different.
|
|
|
|
if ext1.Id.Equal(oidAuthorityKeyIdentifier) {
|
|
|
|
for _, ext2 := range leaf.Extensions {
|
|
|
|
assert.False(t, reflect.DeepEqual(ext1, ext2))
|
|
|
|
}
|
|
|
|
continue
|
|
|
|
} else {
|
|
|
|
found := false
|
|
|
|
for _, ext2 := range leaf.Extensions {
|
|
|
|
if reflect.DeepEqual(ext1, ext2) {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
|
|
|
t.Errorf("x509 extension %s not found in renewed certificate", ext1.Id.String())
|
|
|
|
}
|
|
|
|
}
|
2019-02-15 00:44:36 +00:00
|
|
|
}
|
|
|
|
}
|
2019-02-15 03:17:42 +00:00
|
|
|
|
|
|
|
realIntermediate, err := x509.ParseCertificate(tc.auth.intermediateIdentity.Crt.Raw)
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
assert.Equals(t, intermediate, realIntermediate)
|
2018-10-05 21:48:36 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestGetTLSOptions(t *testing.T) {
|
|
|
|
type renewTest struct {
|
|
|
|
auth *Authority
|
|
|
|
opts *tlsutil.TLSOptions
|
|
|
|
}
|
|
|
|
tests := map[string]func() (*renewTest, error){
|
|
|
|
"default": func() (*renewTest, error) {
|
|
|
|
a := testAuthority(t)
|
|
|
|
return &renewTest{auth: a, opts: &DefaultTLSOptions}, nil
|
|
|
|
},
|
|
|
|
"non-default": func() (*renewTest, error) {
|
|
|
|
a := testAuthority(t)
|
|
|
|
a.config.TLS = &tlsutil.TLSOptions{
|
|
|
|
CipherSuites: x509util.CipherSuites{
|
|
|
|
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305",
|
|
|
|
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
|
|
|
|
},
|
|
|
|
MinVersion: 1.0,
|
|
|
|
MaxVersion: 1.1,
|
|
|
|
Renegotiation: true,
|
|
|
|
}
|
|
|
|
return &renewTest{auth: a, opts: a.config.TLS}, nil
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for name, genTestCase := range tests {
|
|
|
|
t.Run(name, func(t *testing.T) {
|
|
|
|
tc, err := genTestCase()
|
|
|
|
assert.FatalError(t, err)
|
|
|
|
|
|
|
|
opts := tc.auth.GetTLSOptions()
|
|
|
|
assert.Equals(t, opts, tc.opts)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|