feat: create certificates with os:admin role

Minimal change for backporting into 0.10. Refs siderolabs#3421. Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
AlekSi · May 25, 2021 · 7a84995 · 7a84995
1 parent 828772c
commit 7a84995
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/cmd/talosctl/cmd/mgmt/gen.go b/cmd/talosctl/cmd/mgmt/gen.go
@@ -18,6 +18,7 @@ import (
 	"github.com/talos-systems/crypto/x509"
 
 	"github.com/talos-systems/talos/pkg/cli"
+	"github.com/talos-systems/talos/pkg/machinery/constants"
 )
 
 var (
@@ -124,6 +125,7 @@ var csrCmd = &cobra.Command{
 		}
 
 		ips := []net.IP{parsed}
+		opts = append(opts, x509.Organization(constants.RoleAdmin))
 		opts = append(opts, x509.IPAddresses(ips))
 		opts = append(opts, x509.NotAfter(time.Now().Add(time.Duration(crtHours)*time.Hour)))
 

diff --git a/pkg/machinery/config/types/v1alpha1/generate/generate.go b/pkg/machinery/config/types/v1alpha1/generate/generate.go
@@ -381,11 +381,12 @@ func NewTalosCA(currentTime time.Time) (ca *x509.CertificateAuthority, err error
 	return x509.NewSelfSignedCertificateAuthority(opts...)
 }
 
-// NewAdminCertificateAndKey generates the admin Talos certifiate and key.
+// NewAdminCertificateAndKey generates the admin Talos certificate and key.
 func NewAdminCertificateAndKey(currentTime time.Time, ca *x509.PEMEncodedCertificateAndKey, loopback string) (p *x509.PEMEncodedCertificateAndKey, err error) {
 	ips := []net.IP{net.ParseIP(loopback)}
 
 	opts := []x509.Option{
+		x509.Organization(constants.RoleAdmin),
 		x509.IPAddresses(ips),
 		x509.NotAfter(currentTime.Add(87600 * time.Hour)),
 		x509.NotBefore(currentTime),

diff --git a/pkg/machinery/config/types/v1alpha1/generate/generate_test.go b/pkg/machinery/config/types/v1alpha1/generate/generate_test.go
@@ -5,10 +5,12 @@
 package generate_test
 
 import (
+	"crypto/x509"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
 
+	"github.com/talos-systems/talos/pkg/machinery/client"
 	"github.com/talos-systems/talos/pkg/machinery/config"
 	genv1alpha1 "github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/generate"
 	"github.com/talos-systems/talos/pkg/machinery/config/types/v1alpha1/machine"
@@ -73,6 +75,16 @@ func (suite *GenerateSuite) TestGenerateWorkerSuccess() {
 }
 
 func (suite *GenerateSuite) TestGenerateTalosconfigSuccess() {
-	_, err := genv1alpha1.Talosconfig(suite.input)
+	cfg, err := genv1alpha1.Talosconfig(suite.input)
 	suite.Require().NoError(err)
+
+	creds, err := client.CredentialsFromConfigContext(cfg.Contexts[cfg.Context])
+	suite.Require().NoError(err)
+	suite.Require().Nil(creds.Crt.Leaf)
+	suite.Require().Len(creds.Crt.Certificate, 1)
+
+	cert, err := x509.ParseCertificate(creds.Crt.Certificate[0])
+	suite.Require().NoError(err)
+
+	suite.Equal([]string{constants.RoleAdmin}, cert.Subject.Organization)
 }
diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go
@@ -413,6 +413,9 @@ const (
 	// TODO: Once we get naming sorted we need to apply for a project specific address
 	// https://manage.ntppool.org/manage/vendor
 	DefaultNTPServer = "pool.ntp.org"
+
+	// RoleAdmin defines Talos role for admins. It matches Organization value of Talos client certificate.
+	RoleAdmin = "os:admin"
 )
 
 // See https://linux.die.net/man/3/klogctl