Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix server join issues

Browse Source
This commit is contained in:
Darren Shepherd 2019-11-08 20:58:50 +00:00
parent c29a31931f
commit 91cacb3a14
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/daemons/control/server.go
View File

@ -21,6 +21,7 @@ import (
_ "github.com/rancher/k3s/pkg/cloudprovider" _ "github.com/rancher/k3s/pkg/cloudprovider"
certutil "github.com/rancher/dynamiclistener/cert" certutil "github.com/rancher/dynamiclistener/cert"
"github.com/rancher/k3s/pkg/clientaccess"
"github.com/rancher/k3s/pkg/cluster" "github.com/rancher/k3s/pkg/cluster"
"github.com/rancher/k3s/pkg/daemons/config" "github.com/rancher/k3s/pkg/daemons/config"
"github.com/rancher/k3s/pkg/passwd" "github.com/rancher/k3s/pkg/passwd"
@ -364,7 +365,7 @@ func readTokens(runtime *config.ControlRuntime) error {
runtime.AgentToken = "node:" + nodeToken runtime.AgentToken = "node:" + nodeToken
} }
if serverToken, ok := tokens.Pass("server"); ok { if serverToken, ok := tokens.Pass("server"); ok {
runtime.AgentToken = "server:" + serverToken runtime.ServerToken = "server:" + serverToken
} }
if clientToken, ok := tokens.Pass("admin"); ok { if clientToken, ok := tokens.Pass("admin"); ok {
runtime.ClientToken = "admin:" + clientToken runtime.ClientToken = "admin:" + clientToken
@ -426,6 +427,9 @@ func getServerPass(passwd *passwd.Passwd, config *config.Control) (string, error
func getNodePass(config *config.Control, serverPass string) string { func getNodePass(config *config.Control, serverPass string) string {
if config.AgentToken == "" { if config.AgentToken == "" {
if _, passwd, ok := clientaccess.ParseUsernamePassword(serverPass); ok {
return passwd
}
return serverPass return serverPass
} }
return config.AgentToken return config.AgentToken
@ -621,9 +625,17 @@ func genRequestHeaderCerts(config *config.Control, runtime *config.ControlRuntim
} }
func createClientCertKey(regen bool, commonName string, organization []string, altNames *certutil.AltNames, extKeyUsage []x509.ExtKeyUsage, caCertFile, caKeyFile, certFile, keyFile string) (bool, error) { func createClientCertKey(regen bool, commonName string, organization []string, altNames *certutil.AltNames, extKeyUsage []x509.ExtKeyUsage, caCertFile, caKeyFile, certFile, keyFile string) (bool, error) {
caBytes, err := ioutil.ReadFile(caCertFile)
if err != nil {
return false, err
}
pool := x509.NewCertPool()
pool.AppendCertsFromPEM(caBytes)
// check for certificate expiration // check for certificate expiration
if !regen { if !regen {
regen = expired(certFile) regen = expired(certFile, pool)
} }
if !regen { if !regen {
@ -642,15 +654,11 @@ func createClientCertKey(regen bool, commonName string, organization []string, a
return false, err return false, err
} }
caBytes, err := ioutil.ReadFile(caCertFile)
if err != nil {
return false, err
}
caCert, err := certutil.ParseCertsPEM(caBytes) caCert, err := certutil.ParseCertsPEM(caBytes)
if err != nil { if err != nil {
return false, err return false, err
} }
keyBytes, _, err := certutil.LoadOrGenerateKeyFile(keyFile, regen) keyBytes, _, err := certutil.LoadOrGenerateKeyFile(keyFile, regen)
if err != nil { if err != nil {
return false, err return false, err
@ -770,7 +778,7 @@ func setupStorageBackend(argsMap map[string]string, cfg *config.Control) {
} }
} }
func expired(certFile string) bool { func expired(certFile string, pool *x509.CertPool) bool {
certBytes, err := ioutil.ReadFile(certFile) certBytes, err := ioutil.ReadFile(certFile)
if err != nil { if err != nil {
return false return false
@ -779,6 +787,15 @@ func expired(certFile string) bool {
if err != nil { if err != nil {
return false return false
} }
_, err = certificates[0].Verify(x509.VerifyOptions{
Roots: pool,
KeyUsages: []x509.ExtKeyUsage{
x509.ExtKeyUsageAny,
},
})
if err != nil {
return true
}
return certutil.IsCertExpired(certificates[0]) return certutil.IsCertExpired(certificates[0])
} }

4
pkg/server/server.go
View File

@ -200,9 +200,9 @@ func printTokens(advertiseIP string, config *config.Control) error {
advertiseIP = "127.0.0.1" advertiseIP = "127.0.0.1"
} }
if len(config.Runtime.AgentToken) > 0 { if len(config.Runtime.ServerToken) > 0 {
p := filepath.Join(config.DataDir, "token") p := filepath.Join(config.DataDir, "token")
if err := writeToken(config.Runtime.AgentToken, p, config.Runtime.ServerCA); err == nil { if err := writeToken(config.Runtime.ServerToken, p, config.Runtime.ServerCA); err == nil {
logrus.Infof("Node token is available at %s", p) logrus.Infof("Node token is available at %s", p)
nodeFile = p nodeFile = p
} }