mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-11-03 18:01:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use ECDSA-SHA512 when generating certs for Talos < 0.13

Browse Source 
Due to the way our crypto library is implemented, it can't generate a
key from CA with ECDSA-SHA256 on older versions of Talos.

Talos >= 0.13: ECDSA-SHA256 with P-256
Talos < 0.13: ECDSA-SHA512 with P-256

Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
This commit is contained in:
Andrey Smirnov 2021-10-08 21:25:49 +03:00
parent 7137166d1d
commit 997873b6d3
No known key found for this signature in database
GPG Key ID: 7B26396447AB6DFD
7 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -72,7 +72,7 @@ require (
github.com/smira/go-xz v0.0.0-20201019130106-9921ed7a9935
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
github.com/talos-systems/crypto v0.3.3
github.com/talos-systems/crypto v0.3.4
github.com/talos-systems/discovery-service v0.1.0
github.com/talos-systems/go-blockdevice v0.2.4
github.com/talos-systems/go-cmd v0.1.0

4
go.sum
View File

@ -1040,8 +1040,8 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69
github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
github.com/talos-systems/crypto v0.3.3 h1:MvYJY0Tg8+/QDfRj2JJ/m54INsi1ZXbwyc6H+7ea/v8=
github.com/talos-systems/crypto v0.3.3/go.mod h1:xaNCB2/Bxaj+qrkdeodhRv5eKQVvKOGBBMj58MrIPY8=
github.com/talos-systems/crypto v0.3.4 h1:bg4N27CH1MvUBasr70BlZObPXQYEhUTwOOm/jhCRFxg=
github.com/talos-systems/crypto v0.3.4/go.mod h1:xaNCB2/Bxaj+qrkdeodhRv5eKQVvKOGBBMj58MrIPY8=
github.com/talos-systems/discovery-service v0.1.0 h1:mfFElRIetj6+rit+WnrKjSZMA0CTzUesSVJhqLSnddk=
github.com/talos-systems/discovery-service v0.1.0/go.mod h1:+9VWFbTcUChtlE0qc2fQ3Lyj1kj2AakFQ/ITnaB8Pd0=
github.com/talos-systems/go-blockdevice v0.2.4 h1:/E5I95byCxfdmQIiBEyWgdUo+6vPBbbOJQIF9+yeysU=

5
pkg/machinery/config/contract.go
View File

@ -86,3 +86,8 @@ func (contract *VersionContract) SupportsRBACFeature() bool {
func (contract *VersionContract) SupportsDynamicCertSANs() bool {
return contract.Greater(TalosVersion0_12)
}
// SupportsECDSASHA256 returns true if version of Talos supports ECDSA-SHA256 for Kubernetes certificates.
func (contract *VersionContract) SupportsECDSASHA256() bool {
return contract.Greater(TalosVersion0_12)
}

7
pkg/machinery/config/contract_test.go
View File

@ -49,6 +49,7 @@ func TestContractCurrent(t *testing.T) {
assert.True(t, config.TalosVersionCurrent.SupportsServiceAccount())
assert.True(t, config.TalosVersionCurrent.SupportsRBACFeature())
assert.True(t, config.TalosVersionCurrent.SupportsDynamicCertSANs())
assert.True(t, config.TalosVersionCurrent.SupportsECDSASHA256())
}
func TestContract0_13(t *testing.T) {
@ -57,6 +58,7 @@ func TestContract0_13(t *testing.T) {
assert.True(t, config.TalosVersion0_13.SupportsServiceAccount())
assert.True(t, config.TalosVersion0_13.SupportsRBACFeature())
assert.True(t, config.TalosVersion0_13.SupportsDynamicCertSANs())
assert.True(t, config.TalosVersion0_13.SupportsECDSASHA256())
}
func TestContract0_12(t *testing.T) {
@ -65,6 +67,7 @@ func TestContract0_12(t *testing.T) {
assert.True(t, config.TalosVersion0_12.SupportsServiceAccount())
assert.True(t, config.TalosVersion0_12.SupportsRBACFeature())
assert.False(t, config.TalosVersion0_12.SupportsDynamicCertSANs())
assert.False(t, config.TalosVersion0_12.SupportsECDSASHA256())
}
func TestContract0_11(t *testing.T) {
@ -73,6 +76,7 @@ func TestContract0_11(t *testing.T) {
assert.True(t, config.TalosVersion0_11.SupportsServiceAccount())
assert.True(t, config.TalosVersion0_11.SupportsRBACFeature())
assert.False(t, config.TalosVersion0_11.SupportsDynamicCertSANs())
assert.False(t, config.TalosVersion0_11.SupportsECDSASHA256())
}
func TestContract0_10(t *testing.T) {
@ -81,6 +85,7 @@ func TestContract0_10(t *testing.T) {
assert.True(t, config.TalosVersion0_10.SupportsServiceAccount())
assert.False(t, config.TalosVersion0_10.SupportsRBACFeature())
assert.False(t, config.TalosVersion0_10.SupportsDynamicCertSANs())
assert.False(t, config.TalosVersion0_10.SupportsECDSASHA256())
}
func TestContract0_9(t *testing.T) {
@ -89,6 +94,7 @@ func TestContract0_9(t *testing.T) {
assert.True(t, config.TalosVersion0_9.SupportsServiceAccount())
assert.False(t, config.TalosVersion0_9.SupportsRBACFeature())
assert.False(t, config.TalosVersion0_9.SupportsDynamicCertSANs())
assert.False(t, config.TalosVersion0_9.SupportsECDSASHA256())
}
func TestContract0_8(t *testing.T) {
@ -97,4 +103,5 @@ func TestContract0_8(t *testing.T) {
assert.False(t, config.TalosVersion0_8.SupportsServiceAccount())
assert.False(t, config.TalosVersion0_8.SupportsRBACFeature())
assert.False(t, config.TalosVersion0_8.SupportsDynamicCertSANs())
assert.False(t, config.TalosVersion0_8.SupportsECDSASHA256())
}

34
pkg/machinery/config/types/v1alpha1/generate/generate.go
View File

@ -212,18 +212,18 @@ func NewSecretsBundle(clock Clock, opts ...GenOption) (*SecretsBundle, error) {
err error
)
etcd, err = NewEtcdCA(clock.Now(), !options.VersionContract.SupportsECDSAKeys())
etcd, err = NewEtcdCA(clock.Now(), options.VersionContract)
if err != nil {
return nil, err
}
kubernetesCA, err = NewKubernetesCA(clock.Now(), !options.VersionContract.SupportsECDSAKeys())
kubernetesCA, err = NewKubernetesCA(clock.Now(), options.VersionContract)
if err != nil {
return nil, err
}
if options.VersionContract.SupportsAggregatorCA() {
aggregatorCA, err = NewAggregatorCA(clock.Now())
aggregatorCA, err = NewAggregatorCA(clock.Now(), options.VersionContract)
if err != nil {
return nil, err
}
@ -352,41 +352,49 @@ func NewSecretsBundleFromConfig(clock Clock, c config.Provider) *SecretsBundle {
}
// NewEtcdCA generates a CA for the Etcd PKI.
func NewEtcdCA(currentTime time.Time, useRSA bool) (ca *x509.CertificateAuthority, err error) {
func NewEtcdCA(currentTime time.Time, contract *config.VersionContract) (ca *x509.CertificateAuthority, err error) {
opts := []x509.Option{
x509.Organization("etcd"),
x509.NotAfter(currentTime.Add(87600 * time.Hour)),
x509.NotBefore(currentTime),
}
if useRSA {
if !contract.SupportsECDSAKeys() {
opts = append(opts, x509.RSA(true))
} else {
opts = append(opts, x509.ECDSA(true))
if contract.SupportsECDSASHA256() {
opts = append(opts, x509.ECDSA(true))
} else {
opts = append(opts, x509.ECDSASHA512(true))
}
}
return x509.NewSelfSignedCertificateAuthority(opts...)
}
// NewKubernetesCA generates a CA for the Kubernetes PKI.
func NewKubernetesCA(currentTime time.Time, useRSA bool) (ca *x509.CertificateAuthority, err error) {
func NewKubernetesCA(currentTime time.Time, contract *config.VersionContract) (ca *x509.CertificateAuthority, err error) {
opts := []x509.Option{
x509.Organization("kubernetes"),
x509.NotAfter(currentTime.Add(87600 * time.Hour)),
x509.NotBefore(currentTime),
}
if useRSA {
if !contract.SupportsECDSAKeys() {
opts = append(opts, x509.RSA(true))
} else {
opts = append(opts, x509.ECDSA(true))
if contract.SupportsECDSASHA256() {
opts = append(opts, x509.ECDSA(true))
} else {
opts = append(opts, x509.ECDSASHA512(true))
}
}
return x509.NewSelfSignedCertificateAuthority(opts...)
}
// NewAggregatorCA generates a CA for the Kubernetes aggregator/front-proxy.
func NewAggregatorCA(currentTime time.Time) (ca *x509.CertificateAuthority, err error) {
func NewAggregatorCA(currentTime time.Time, contract *config.VersionContract) (ca *x509.CertificateAuthority, err error) {
opts := []x509.Option{
x509.ECDSA(true),
x509.CommonName("front-proxy"),
@ -394,6 +402,12 @@ func NewAggregatorCA(currentTime time.Time) (ca *x509.CertificateAuthority, err
x509.NotBefore(currentTime),
}
if contract.SupportsECDSASHA256() {
opts = append(opts, x509.ECDSA(true))
} else {
opts = append(opts, x509.ECDSASHA512(true))
}
return x509.NewSelfSignedCertificateAuthority(opts...)
}

2
pkg/machinery/go.mod
View File

@ -19,7 +19,7 @@ require (
github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
github.com/stretchr/testify v1.7.0
github.com/talos-systems/crypto v0.3.3
github.com/talos-systems/crypto v0.3.4
github.com/talos-systems/go-blockdevice v0.2.4
github.com/talos-systems/go-debug v0.2.1
github.com/talos-systems/net v0.3.0

4
pkg/machinery/go.sum
View File

@ -154,8 +154,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/talos-systems/crypto v0.3.3 h1:MvYJY0Tg8+/QDfRj2JJ/m54INsi1ZXbwyc6H+7ea/v8=
github.com/talos-systems/crypto v0.3.3/go.mod h1:xaNCB2/Bxaj+qrkdeodhRv5eKQVvKOGBBMj58MrIPY8=
github.com/talos-systems/crypto v0.3.4 h1:bg4N27CH1MvUBasr70BlZObPXQYEhUTwOOm/jhCRFxg=
github.com/talos-systems/crypto v0.3.4/go.mod h1:xaNCB2/Bxaj+qrkdeodhRv5eKQVvKOGBBMj58MrIPY8=
github.com/talos-systems/go-blockdevice v0.2.4 h1:/E5I95byCxfdmQIiBEyWgdUo+6vPBbbOJQIF9+yeysU=
github.com/talos-systems/go-blockdevice v0.2.4/go.mod h1:qnn/zDc09I1DA2BUDDCOSA2D0P8pIDjN8pGiRoRaQig=
github.com/talos-systems/go-cmd v0.0.0-20210216164758-68eb0067e0f0/go.mod h1:kf+rZzTEmlDiYQ6ulslvRONnKLQH8x83TowltGMhO+k=