
This change updates the CSR API to add a new, optional field called expirationSeconds. This field is a request to the signer for the maximum duration the client wishes the cert to have. The signer is free to ignore this request based on its own internal policy. The signers built-in to KCM will honor this field if it is not set to a value greater than --cluster-signing-duration. The minimum allowed value for this field is 600 seconds (ten minutes). This change will help enforce safer durations for certificates in the Kube ecosystem and will help related projects such as cert-manager with their migration to the Kube CSR API. Future enhancements may update the Kubelet to take advantage of this field when it is configured in a way that can tolerate shorter certificate lifespans with regular rotation. Signed-off-by: Monis Khan <mok@vmware.com>
443 lines
14 KiB
Go
443 lines
14 KiB
Go
/*
|
|
Copyright 2019 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package signer
|
|
|
|
import (
|
|
"crypto/ecdsa"
|
|
"crypto/elliptic"
|
|
"crypto/x509"
|
|
"crypto/x509/pkix"
|
|
"encoding/pem"
|
|
"io/ioutil"
|
|
"math/rand"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
|
|
capi "k8s.io/api/certificates/v1"
|
|
"k8s.io/apimachinery/pkg/util/clock"
|
|
"k8s.io/apimachinery/pkg/util/diff"
|
|
utilfeature "k8s.io/apiserver/pkg/util/feature"
|
|
"k8s.io/client-go/kubernetes/fake"
|
|
testclient "k8s.io/client-go/testing"
|
|
"k8s.io/client-go/util/cert"
|
|
"k8s.io/client-go/util/certificate/csr"
|
|
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
|
capihelper "k8s.io/kubernetes/pkg/apis/certificates/v1"
|
|
"k8s.io/kubernetes/pkg/controller/certificates"
|
|
"k8s.io/kubernetes/pkg/features"
|
|
)
|
|
|
|
func TestSigner(t *testing.T) {
|
|
fakeClock := clock.FakeClock{}
|
|
|
|
s, err := newSigner("kubernetes.io/legacy-unknown", "./testdata/ca.crt", "./testdata/ca.key", nil, 1*time.Hour)
|
|
if err != nil {
|
|
t.Fatalf("failed to create signer: %v", err)
|
|
}
|
|
|
|
csrb, err := ioutil.ReadFile("./testdata/kubelet.csr")
|
|
if err != nil {
|
|
t.Fatalf("failed to read CSR: %v", err)
|
|
}
|
|
x509cr, err := capihelper.ParseCSR(csrb)
|
|
if err != nil {
|
|
t.Fatalf("failed to parse CSR: %v", err)
|
|
}
|
|
|
|
certData, err := s.sign(x509cr, []capi.KeyUsage{
|
|
capi.UsageSigning,
|
|
capi.UsageKeyEncipherment,
|
|
capi.UsageServerAuth,
|
|
capi.UsageClientAuth,
|
|
},
|
|
// requesting a duration that is greater than TTL is ignored
|
|
csr.DurationToExpirationSeconds(3*time.Hour),
|
|
fakeClock.Now,
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("failed to sign CSR: %v", err)
|
|
}
|
|
if len(certData) == 0 {
|
|
t.Fatalf("expected a certificate after signing")
|
|
}
|
|
|
|
certs, err := cert.ParseCertsPEM(certData)
|
|
if err != nil {
|
|
t.Fatalf("failed to parse certificate: %v", err)
|
|
}
|
|
if len(certs) != 1 {
|
|
t.Fatalf("expected one certificate")
|
|
}
|
|
|
|
want := x509.Certificate{
|
|
Version: 3,
|
|
Subject: pkix.Name{
|
|
CommonName: "system:node:k-a-node-s36b",
|
|
Organization: []string{"system:nodes"},
|
|
},
|
|
KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
|
|
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
|
|
BasicConstraintsValid: true,
|
|
NotBefore: fakeClock.Now().Add(-5 * time.Minute),
|
|
NotAfter: fakeClock.Now().Add(1 * time.Hour),
|
|
PublicKeyAlgorithm: x509.ECDSA,
|
|
SignatureAlgorithm: x509.SHA256WithRSA,
|
|
MaxPathLen: -1,
|
|
}
|
|
|
|
if !cmp.Equal(*certs[0], want, diff.IgnoreUnset()) {
|
|
t.Errorf("unexpected diff: %v", cmp.Diff(certs[0], want, diff.IgnoreUnset()))
|
|
}
|
|
}
|
|
|
|
func TestHandle(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
// parameters to be set on the generated CSR
|
|
commonName string
|
|
dnsNames []string
|
|
org []string
|
|
usages []capi.KeyUsage
|
|
// whether the generated CSR should be marked as approved
|
|
approved bool
|
|
// whether the generated CSR should be marked as failed
|
|
failed bool
|
|
// the signerName to be set on the generated CSR
|
|
signerName string
|
|
// if true, expect an error to be returned
|
|
err bool
|
|
// if true, expect an error to be returned during construction
|
|
constructionErr bool
|
|
// additional verification function
|
|
verify func(*testing.T, []testclient.Action)
|
|
}{
|
|
{
|
|
name: "should sign if signerName is kubernetes.io/kube-apiserver-client",
|
|
signerName: "kubernetes.io/kube-apiserver-client",
|
|
commonName: "hello-world",
|
|
org: []string{"some-org"},
|
|
usages: []capi.KeyUsage{capi.UsageClientAuth, capi.UsageDigitalSignature, capi.UsageKeyEncipherment},
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 1 {
|
|
t.Errorf("expected one Update action but got %d", len(as))
|
|
return
|
|
}
|
|
csr := as[0].(testclient.UpdateAction).GetObject().(*capi.CertificateSigningRequest)
|
|
if len(csr.Status.Certificate) == 0 {
|
|
t.Errorf("expected certificate to be issued but it was not")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should refuse to sign if signerName is kubernetes.io/kube-apiserver-client and contains an unexpected usage",
|
|
signerName: "kubernetes.io/kube-apiserver-client",
|
|
commonName: "hello-world",
|
|
org: []string{"some-org"},
|
|
usages: []capi.KeyUsage{capi.UsageServerAuth, capi.UsageClientAuth, capi.UsageDigitalSignature, capi.UsageKeyEncipherment},
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 1 {
|
|
t.Errorf("expected one Update action but got %d", len(as))
|
|
return
|
|
}
|
|
csr := as[0].(testclient.UpdateAction).GetObject().(*capi.CertificateSigningRequest)
|
|
if len(csr.Status.Certificate) != 0 {
|
|
t.Errorf("expected no certificate to be issued")
|
|
}
|
|
if !certificates.HasTrueCondition(csr, capi.CertificateFailed) {
|
|
t.Errorf("expected Failed condition")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should sign if signerName is kubernetes.io/kube-apiserver-client-kubelet",
|
|
signerName: "kubernetes.io/kube-apiserver-client-kubelet",
|
|
commonName: "system:node:hello-world",
|
|
org: []string{"system:nodes"},
|
|
usages: []capi.KeyUsage{capi.UsageClientAuth, capi.UsageDigitalSignature, capi.UsageKeyEncipherment},
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 1 {
|
|
t.Errorf("expected one Update action but got %d", len(as))
|
|
return
|
|
}
|
|
csr := as[0].(testclient.UpdateAction).GetObject().(*capi.CertificateSigningRequest)
|
|
if len(csr.Status.Certificate) == 0 {
|
|
t.Errorf("expected certificate to be issued but it was not")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should sign if signerName is kubernetes.io/legacy-unknown",
|
|
signerName: "kubernetes.io/legacy-unknown",
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 1 {
|
|
t.Errorf("expected one Update action but got %d", len(as))
|
|
return
|
|
}
|
|
csr := as[0].(testclient.UpdateAction).GetObject().(*capi.CertificateSigningRequest)
|
|
if len(csr.Status.Certificate) == 0 {
|
|
t.Errorf("expected certificate to be issued but it was not")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should sign if signerName is kubernetes.io/kubelet-serving",
|
|
signerName: "kubernetes.io/kubelet-serving",
|
|
commonName: "system:node:testnode",
|
|
org: []string{"system:nodes"},
|
|
usages: []capi.KeyUsage{capi.UsageServerAuth, capi.UsageDigitalSignature, capi.UsageKeyEncipherment},
|
|
dnsNames: []string{"example.com"},
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 1 {
|
|
t.Errorf("expected one Update action but got %d", len(as))
|
|
return
|
|
}
|
|
csr := as[0].(testclient.UpdateAction).GetObject().(*capi.CertificateSigningRequest)
|
|
if len(csr.Status.Certificate) == 0 {
|
|
t.Errorf("expected certificate to be issued but it was not")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should do nothing if failed",
|
|
signerName: "kubernetes.io/kubelet-serving",
|
|
commonName: "system:node:testnode",
|
|
org: []string{"system:nodes"},
|
|
usages: []capi.KeyUsage{capi.UsageServerAuth, capi.UsageDigitalSignature, capi.UsageKeyEncipherment},
|
|
dnsNames: []string{"example.com"},
|
|
approved: true,
|
|
failed: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 0 {
|
|
t.Errorf("expected no action to be taken")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should do nothing if an unrecognised signerName is used",
|
|
signerName: "kubernetes.io/not-recognised",
|
|
constructionErr: true,
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 0 {
|
|
t.Errorf("expected no action to be taken")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should do nothing if not approved",
|
|
signerName: "kubernetes.io/kubelet-serving",
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 0 {
|
|
t.Errorf("expected no action to be taken")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should do nothing if signerName does not start with kubernetes.io",
|
|
signerName: "example.com/sample-name",
|
|
constructionErr: true,
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 0 {
|
|
t.Errorf("expected no action to be taken")
|
|
}
|
|
},
|
|
},
|
|
{
|
|
name: "should do nothing if signerName starts with kubernetes.io but is unrecognised",
|
|
signerName: "kubernetes.io/not-a-real-signer",
|
|
constructionErr: true,
|
|
approved: true,
|
|
verify: func(t *testing.T, as []testclient.Action) {
|
|
if len(as) != 0 {
|
|
t.Errorf("expected no action to be taken")
|
|
}
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
client := &fake.Clientset{}
|
|
s, err := newSigner(c.signerName, "./testdata/ca.crt", "./testdata/ca.key", client, 1*time.Hour)
|
|
switch {
|
|
case c.constructionErr && err != nil:
|
|
return
|
|
case c.constructionErr && err == nil:
|
|
t.Fatalf("expected failure during construction of controller")
|
|
case !c.constructionErr && err != nil:
|
|
t.Fatalf("failed to create signer: %v", err)
|
|
|
|
case !c.constructionErr && err == nil:
|
|
// continue with rest of test
|
|
}
|
|
|
|
csr := makeTestCSR(csrBuilder{cn: c.commonName, signerName: c.signerName, approved: c.approved, failed: c.failed, usages: c.usages, org: c.org, dnsNames: c.dnsNames})
|
|
if err := s.handle(csr); err != nil && !c.err {
|
|
t.Errorf("unexpected err: %v", err)
|
|
}
|
|
c.verify(t, client.Actions())
|
|
})
|
|
}
|
|
}
|
|
|
|
// noncryptographic for faster testing
|
|
// DO NOT COPY THIS CODE
|
|
var insecureRand = rand.New(rand.NewSource(0))
|
|
|
|
type csrBuilder struct {
|
|
cn string
|
|
dnsNames []string
|
|
org []string
|
|
signerName string
|
|
approved bool
|
|
failed bool
|
|
usages []capi.KeyUsage
|
|
}
|
|
|
|
func makeTestCSR(b csrBuilder) *capi.CertificateSigningRequest {
|
|
pk, err := ecdsa.GenerateKey(elliptic.P256(), insecureRand)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
csrb, err := x509.CreateCertificateRequest(insecureRand, &x509.CertificateRequest{
|
|
Subject: pkix.Name{
|
|
CommonName: b.cn,
|
|
Organization: b.org,
|
|
},
|
|
DNSNames: b.dnsNames,
|
|
}, pk)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
csr := &capi.CertificateSigningRequest{
|
|
Spec: capi.CertificateSigningRequestSpec{
|
|
Request: pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE REQUEST", Bytes: csrb}),
|
|
Usages: b.usages,
|
|
},
|
|
}
|
|
if b.signerName != "" {
|
|
csr.Spec.SignerName = b.signerName
|
|
}
|
|
if b.approved {
|
|
csr.Status.Conditions = append(csr.Status.Conditions, capi.CertificateSigningRequestCondition{
|
|
Type: capi.CertificateApproved,
|
|
})
|
|
}
|
|
if b.failed {
|
|
csr.Status.Conditions = append(csr.Status.Conditions, capi.CertificateSigningRequestCondition{
|
|
Type: capi.CertificateFailed,
|
|
})
|
|
}
|
|
return csr
|
|
}
|
|
|
|
func Test_signer_duration(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
certTTL time.Duration
|
|
expirationSeconds *int32
|
|
wantGateEnabled time.Duration
|
|
wantGateDisabled time.Duration
|
|
}{
|
|
{
|
|
name: "can request shorter duration than TTL",
|
|
certTTL: time.Hour,
|
|
expirationSeconds: csr.DurationToExpirationSeconds(30 * time.Minute),
|
|
wantGateEnabled: 30 * time.Minute,
|
|
wantGateDisabled: time.Hour,
|
|
},
|
|
{
|
|
name: "cannot request longer duration than TTL",
|
|
certTTL: time.Hour,
|
|
expirationSeconds: csr.DurationToExpirationSeconds(3 * time.Hour),
|
|
wantGateEnabled: time.Hour,
|
|
wantGateDisabled: time.Hour,
|
|
},
|
|
{
|
|
name: "cannot request negative duration",
|
|
certTTL: time.Hour,
|
|
expirationSeconds: csr.DurationToExpirationSeconds(-time.Minute),
|
|
wantGateEnabled: 10 * time.Minute,
|
|
wantGateDisabled: time.Hour,
|
|
},
|
|
{
|
|
name: "cannot request duration less than 10 mins",
|
|
certTTL: time.Hour,
|
|
expirationSeconds: csr.DurationToExpirationSeconds(10*time.Minute - time.Second),
|
|
wantGateEnabled: 10 * time.Minute,
|
|
wantGateDisabled: time.Hour,
|
|
},
|
|
{
|
|
name: "can request duration of exactly 10 mins",
|
|
certTTL: time.Hour,
|
|
expirationSeconds: csr.DurationToExpirationSeconds(10 * time.Minute),
|
|
wantGateEnabled: 10 * time.Minute,
|
|
wantGateDisabled: time.Hour,
|
|
},
|
|
{
|
|
name: "can request duration equal to the default",
|
|
certTTL: time.Hour,
|
|
expirationSeconds: csr.DurationToExpirationSeconds(time.Hour),
|
|
wantGateEnabled: time.Hour,
|
|
wantGateDisabled: time.Hour,
|
|
},
|
|
{
|
|
name: "can choose not to request a duration to get the default",
|
|
certTTL: time.Hour,
|
|
expirationSeconds: nil,
|
|
wantGateEnabled: time.Hour,
|
|
wantGateDisabled: time.Hour,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
tt := tt
|
|
|
|
f := func(t *testing.T, want time.Duration) {
|
|
s := &signer{
|
|
certTTL: tt.certTTL,
|
|
}
|
|
if got := s.duration(tt.expirationSeconds); got != want {
|
|
t.Errorf("duration() = %v, want %v", got, want)
|
|
}
|
|
}
|
|
|
|
// regular tests
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel() // these are safe to run in parallel but not the feature gate disabled tests
|
|
|
|
f(t, tt.wantGateEnabled)
|
|
})
|
|
|
|
// same tests with the feature gate disabled
|
|
t.Run("feature gate disabled - "+tt.name, func(t *testing.T) {
|
|
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSRDuration, false)()
|
|
f(t, tt.wantGateDisabled)
|
|
})
|
|
|
|
}
|
|
}
|