github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

sync code from copy destination

Browse Source
This commit is contained in:
zouyee 2018-01-20 14:38:16 +08:00
parent f9bb978ad6
commit eedf638072
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugin/pkg/auth/authenticator/token/bootstrap/bootstrap.go
View File

@ -152,13 +152,12 @@ func (t *TokenAuthenticator) AuthenticateToken(token string) (user.Info, bool, e
// Copied from k8s.io/client-go/tools/bootstrap/token/api // Copied from k8s.io/client-go/tools/bootstrap/token/api
func getSecretString(secret *api.Secret, key string) string { func getSecretString(secret *api.Secret, key string) string {
if secret.Data == nil { data, ok := secret.Data[key]
if !ok {
return "" return ""
} }
if val, ok := secret.Data[key]; ok {
return string(val) return string(data)
}
return ""
} }
// Copied from k8s.io/client-go/tools/bootstrap/token/api // Copied from k8s.io/client-go/tools/bootstrap/token/api
@ -167,11 +166,13 @@ func isSecretExpired(secret *api.Secret) bool {
if len(expiration) > 0 { if len(expiration) > 0 {
expTime, err2 := time.Parse(time.RFC3339, expiration) expTime, err2 := time.Parse(time.RFC3339, expiration)
if err2 != nil { if err2 != nil {
tokenErrorf(secret, "has unparsable expiration time (%s). Treating as expired.", expiration) glog.V(3).Infof("Unparseable expiration time (%s) in %s/%s Secret: %v. Treating as expired.",
expiration, secret.Namespace, secret.Name, err2)
return true return true
} }
if time.Now().After(expTime) { if time.Now().After(expTime) {
tokenErrorf(secret, "has expired.", expiration) glog.V(3).Infof("Expired bootstrap token in %s/%s Secret: %v",
secret.Namespace, secret.Name, expiration)
return true return true
} }
} }
@ -181,8 +182,10 @@ func isSecretExpired(secret *api.Secret) bool {
// Copied from kubernetes/cmd/kubeadm/app/util/token // Copied from kubernetes/cmd/kubeadm/app/util/token
var ( var (
// tokenRegexpString defines id.secret regular expression pattern
tokenRegexpString = "^([a-z0-9]{6})\\.([a-z0-9]{16})$" tokenRegexpString = "^([a-z0-9]{6})\\.([a-z0-9]{16})$"
tokenRegexp = regexp.MustCompile(tokenRegexpString) // tokenRegexp is a compiled regular expression of TokenRegexpString
tokenRegexp = regexp.MustCompile(tokenRegexpString)
) )
// parseToken tries and parse a valid token from a string. // parseToken tries and parse a valid token from a string.