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

kubeadm: make sure URL is valid for token discovery.

Browse Source
This commit is contained in:
Paulo Pires 2017-01-04 14:32:41 +00:00
parent f143ce01e9
commit a6cdfdef4b
No known key found for this signature in database
GPG Key ID: F3F6ED5C522EAA71
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/discovery/flags.go
View File

@ -76,6 +76,15 @@ func ParseURL(d *kubeadm.Discovery, s string) error {
case "file":
return file.Parse(u, d)
case "token":
// Make sure a valid RFC 3986 URL has been passed and parsed.
// See https://github.com/kubernetes/kubeadm/issues/95#issuecomment-270431296 for more details.
if !strings.Contains(s, "@") {
s := s + "@"
u, err = url.Parse(s)
if err != nil {
return err
}
}
return token.Parse(u, d)
default:
return fmt.Errorf("unknown discovery scheme")

20
cmd/kubeadm/app/discovery/flags_test.go
View File

@ -37,6 +37,24 @@ func TestParseURL(t *testing.T) {
Token: &kubeadm.TokenDiscovery{},
},
},
{
url: "token://c05de9:ab224260fb3cd718",
expect: kubeadm.Discovery{
Token: &kubeadm.TokenDiscovery{
ID: "c05de9",
Secret: "ab224260fb3cd718",
},
},
},
{
url: "token://c05de9:ab224260fb3cd718@",
expect: kubeadm.Discovery{
Token: &kubeadm.TokenDiscovery{
ID: "c05de9",
Secret: "ab224260fb3cd718",
},
},
},
{
url: "token://c05de9:ab224260fb3cd718@192.168.0.1:6555,191.168.0.2:6443",
expect: kubeadm.Discovery{
@ -76,7 +94,7 @@ func TestParseURL(t *testing.T) {
continue
}
if !reflect.DeepEqual(d, c.expect) {
t.Errorf("expected discovery config to be equeal but got:\n\ta: %s\n\tb: %s", spew.Sdump(d), spew.Sdump(c.expect))
t.Errorf("expected discovery config to be equal but got:\n\tactual: %s\n\texpected: %s", spew.Sdump(d), spew.Sdump(c.expect))
}
}