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

Merge pull request #41857 from apprenda/kubeadm_update_token_separator

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41857, 41864, 40522, 41835, 41991)

kubeadm: update token separator to '.'

**What this PR does / why we need it**: From SIG meetings, it was agreed upon to have '.' be the separator for tokens. This PR updates that. 

**Special notes for your reviewer**: /cc @luxas @jbeda

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-26 11:13:52 -08:00 committed by GitHub
commit 1b3a9fe10d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/token_test.go
View File

@ -23,7 +23,7 @@ import (
) )
const ( const (
TokenExpectedRegex = "^\\S{6}\\:\\S{16}\n$" TokenExpectedRegex = "^\\S{6}\\.\\S{16}\n$"
) )
func TestRunGenerateToken(t *testing.T) { func TestRunGenerateToken(t *testing.T) {

6
cmd/kubeadm/app/util/token/tokens.go
View File

@ -34,7 +34,7 @@ const (
var ( var (
tokenIDRegexpString = "^([a-z0-9]{6})$" tokenIDRegexpString = "^([a-z0-9]{6})$"
tokenIDRegexp = regexp.MustCompile(tokenIDRegexpString) tokenIDRegexp = regexp.MustCompile(tokenIDRegexpString)
tokenRegexpString = "^([a-z0-9]{6})\\:([a-z0-9]{16})$" tokenRegexpString = "^([a-z0-9]{6})\\.([a-z0-9]{16})$"
tokenRegexp = regexp.MustCompile(tokenRegexpString) tokenRegexp = regexp.MustCompile(tokenRegexpString)
) )
@ -87,13 +87,13 @@ func ParseToken(s string) (string, string, error) {
// BearerToken returns a string representation of the passed token. // BearerToken returns a string representation of the passed token.
func BearerToken(d *kubeadmapi.TokenDiscovery) string { func BearerToken(d *kubeadmapi.TokenDiscovery) string {
return fmt.Sprintf("%s:%s", d.ID, d.Secret) return fmt.Sprintf("%s.%s", d.ID, d.Secret)
} }
// ValidateToken validates whether a token is well-formed. // ValidateToken validates whether a token is well-formed.
// In case it's not, the corresponding error is returned as well. // In case it's not, the corresponding error is returned as well.
func ValidateToken(d *kubeadmapi.TokenDiscovery) (bool, error) { func ValidateToken(d *kubeadmapi.TokenDiscovery) (bool, error) {
if _, _, err := ParseToken(d.ID + ":" + d.Secret); err != nil { if _, _, err := ParseToken(d.ID + "." + d.Secret); err != nil {
return false, err return false, err
} }
return true, nil return true, nil

14
cmd/kubeadm/app/util/token/tokens_test.go
View File

@ -28,14 +28,14 @@ func TestTokenParse(t *testing.T) {
expected bool expected bool
}{ }{
{token: "1234567890123456789012", expected: false}, // invalid parcel size {token: "1234567890123456789012", expected: false}, // invalid parcel size
{token: "12345:1234567890123456", expected: false}, // invalid parcel size {token: "12345.1234567890123456", expected: false}, // invalid parcel size
{token: ".1234567890123456", expected: false}, // invalid parcel size {token: ".1234567890123456", expected: false}, // invalid parcel size
{token: "123456:1234567890.123456", expected: false}, // invalid separation {token: "123456:1234567890.123456", expected: false}, // invalid separation
{token: "abcdef.1234567890123456", expected: false}, // invalid separation {token: "abcdef:1234567890123456", expected: false}, // invalid separation
{token: "Abcdef:1234567890123456", expected: false}, // invalid token id {token: "Abcdef.1234567890123456", expected: false}, // invalid token id
{token: "123456:AABBCCDDEEFFGGHH", expected: false}, // invalid token secret {token: "123456.AABBCCDDEEFFGGHH", expected: false}, // invalid token secret
{token: "abcdef:1234567890123456", expected: true}, {token: "abcdef.1234567890123456", expected: true},
{token: "123456:aabbccddeeffgghh", expected: true}, {token: "123456.aabbccddeeffgghh", expected: true},
} }
for _, rt := range tests { for _, rt := range tests {
@ -154,7 +154,7 @@ func TestBearerToken(t *testing.T) {
token *kubeadmapi.TokenDiscovery token *kubeadmapi.TokenDiscovery
expected string expected string
}{ }{
{token: &kubeadmapi.TokenDiscovery{ID: "foo", Secret: "bar"}, expected: "foo:bar"}, // should use default {token: &kubeadmapi.TokenDiscovery{ID: "foo", Secret: "bar"}, expected: "foo.bar"}, // should use default
} }
for _, rt := range tests { for _, rt := range tests {
actual := BearerToken(rt.token) actual := BearerToken(rt.token)

2
cmd/kubeadm/test/cmd/token_test.go
View File

@ -25,7 +25,7 @@ import (
) )
const ( const (
TokenExpectedRegex = "^\\S{6}\\:\\S{16}\n$" TokenExpectedRegex = "^\\S{6}\\.\\S{16}\n$"
) )
var kubeadmPath = flag.String("kubeadm-path", filepath.Join(os.Getenv("KUBE_ROOT"), "cluster/kubeadm.sh"), "Location of kubeadm") var kubeadmPath = flag.String("kubeadm-path", filepath.Join(os.Getenv("KUBE_ROOT"), "cluster/kubeadm.sh"), "Location of kubeadm")