Skip to content

K
k3s
Commit a5cd171c authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #25064 from Clarifai/httpheaders-querystring

Automatic merge from submit-queue Preserve query strings in HTTP probes instead of escaping them Fixes a problem reported on Slack by devth. ```release-note * Allow the use of query strings and URI fragments in HTTP probes ``` This might also preserve fragments, for those crazy enough to pass them. I am using url.Parse() on the path in order to get path/query/fragment and also deliberately avoiding the addition of more fields to the API.
parents 5a5c490a a2051b2d
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 4 deletions
pkg/kubelet/prober/prober.go
View file @ a5cd171c
...@@ -208,11 +208,16 @@ func findPortByName(container api.Container, portName string) (int, error) { ...@@ -208,11 +208,16 @@ func findPortByName(container api.Container, portName string) (int, error) {
// formatURL formats a URL from args. For testability. // formatURL formats a URL from args. For testability.
func formatURL(scheme string, host string, port int, path string) *url.URL { func formatURL(scheme string, host string, port int, path string) *url.URL {
return &url.URL{ u, err := url.Parse(path)
Scheme: scheme, // Something is busted with the path, but it's too late to reject it. Pass it along as is.
Host: net.JoinHostPort(host, strconv.Itoa(port)), if err != nil {
Path: path, u = &url.URL{
Path: path,
}
} }
u.Scheme = scheme
u.Host = net.JoinHostPort(host, strconv.Itoa(port))
return u
} }
type execInContainer struct { type execInContainer struct {
......
pkg/kubelet/prober/prober_test.go
View file @ a5cd171c
...@@ -41,6 +41,8 @@ func TestFormatURL(t *testing.T) { ...@@ -41,6 +41,8 @@ func TestFormatURL(t *testing.T) {
}{ }{
{"http", "localhost", 93, "", "http://localhost:93"}, {"http", "localhost", 93, "", "http://localhost:93"},
{"https", "localhost", 93, "/path", "https://localhost:93/path"}, {"https", "localhost", 93, "/path", "https://localhost:93/path"},
{"http", "localhost", 93, "?foo", "http://localhost:93?foo"},
{"https", "localhost", 93, "/path?bar", "https://localhost:93/path?bar"},
} }
for _, test := range testCases { for _, test := range testCases {
url := formatURL(test.scheme, test.host, test.port, test.path) url := formatURL(test.scheme, test.host, test.port, test.path)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment