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 #74454 from bart0sh/PR0064-kubeadm-1419-fix-ValidateURLs

Browse Source 
kubeadm: fix url validation code
This commit is contained in:
Kubernetes Prow Robot 2019-02-23 09:09:18 -08:00 committed by GitHub
commit 1cfaf2bdc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View File

@ -321,12 +321,16 @@ func ValidateURLs(urls []string, requireHTTPS bool, fldPath *field.Path) field.E
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
for _, urlstr := range urls { for _, urlstr := range urls {
u, err := url.Parse(urlstr) u, err := url.Parse(urlstr)
if err != nil || u.Scheme == "" { if err != nil {
allErrs = append(allErrs, field.Invalid(fldPath, urlstr, "not a valid URL")) allErrs = append(allErrs, field.Invalid(fldPath, urlstr, fmt.Sprintf("URL parse error: %v", err)))
continue
} }
if requireHTTPS && u.Scheme != "https" { if requireHTTPS && u.Scheme != "https" {
allErrs = append(allErrs, field.Invalid(fldPath, urlstr, "the URL must be using the HTTPS scheme")) allErrs = append(allErrs, field.Invalid(fldPath, urlstr, "the URL must be using the HTTPS scheme"))
} }
if u.Scheme == "" {
allErrs = append(allErrs, field.Invalid(fldPath, urlstr, "the URL without scheme is not allowed"))
}
} }
return allErrs return allErrs
} }
@ -476,7 +480,7 @@ func ValidateSocketPath(socket string, fldPath *field.Path) field.ErrorList {
u, err := url.Parse(socket) u, err := url.Parse(socket)
if err != nil { if err != nil {
return append(allErrs, field.Invalid(fldPath, socket, fmt.Sprintf("url parsing error: %v", err))) return append(allErrs, field.Invalid(fldPath, socket, fmt.Sprintf("URL parsing error: %v", err)))
} }
if u.Scheme == "" { if u.Scheme == "" {
@ -484,7 +488,7 @@ func ValidateSocketPath(socket string, fldPath *field.Path) field.ErrorList {
return append(allErrs, field.Invalid(fldPath, socket, fmt.Sprintf("path is not absolute: %s", socket))) return append(allErrs, field.Invalid(fldPath, socket, fmt.Sprintf("path is not absolute: %s", socket)))
} }
} else if u.Scheme != kubeadmapiv1beta1.DefaultUrlScheme { } else if u.Scheme != kubeadmapiv1beta1.DefaultUrlScheme {
return append(allErrs, field.Invalid(fldPath, socket, fmt.Sprintf("url scheme %s is not supported", u.Scheme))) return append(allErrs, field.Invalid(fldPath, socket, fmt.Sprintf("URL scheme %s is not supported", u.Scheme)))
} }
return allErrs return allErrs