Skip to content

Commit

Permalink
Merge pull request #5557 from spiritNO1/release-1.9
Browse files Browse the repository at this point in the history
fix: remove extra slash when constructing member cluster URL to adapt…
  • Loading branch information
karmada-bot authored Oct 9, 2024
2 parents fc32934 + 9c063bb commit 0806039
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pkg/registry/cluster/storage/aggregate.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/apiserver/pkg/endpoints/request"
apirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/registry/rest"
restclient "k8s.io/client-go/rest"
"k8s.io/klog/v2"
Expand Down Expand Up @@ -147,7 +146,7 @@ func requestWithResourceNameHandlerFunc(
klog.Errorf("failed to get impersonateToken for cluster %s: %v", cluster.Name, err)
return
}
statusCode, err := doClusterRequest(req.Method, requestURLStr(location.String(), proxyRequestInfo), transport, requester, impersonateToken)
statusCode, err := doClusterRequest(req.Method, requestURLStr(location, proxyRequestInfo), transport, requester, impersonateToken)
if err != nil {
klog.Errorf("failed to do request for cluster %s: %v", cluster.Name, err)
return
Expand Down Expand Up @@ -356,7 +355,7 @@ func doClusterRequest(
}

// requestURLStr returns the request resource url string.
func requestURLStr(urlStr string, requestInfo *apirequest.RequestInfo) string {
func requestURLStr(location *url.URL, requestInfo *request.RequestInfo) string {
parts := []string{requestInfo.APIPrefix}
if requestInfo.APIGroup != "" {
parts = append(parts, requestInfo.APIGroup)
Expand All @@ -375,7 +374,7 @@ func requestURLStr(urlStr string, requestInfo *apirequest.RequestInfo) string {
requestInfo.Subresource != "exec" && requestInfo.Subresource != "log" {
parts = append(parts, requestInfo.Subresource)
}
return fmt.Sprintf("%s/%s", urlStr, strings.Join(parts, "/"))
return location.ResolveReference(&url.URL{Path: strings.Join(parts, "/")}).String()
}

func setRequestHeader(req *http.Request, userInfo user.Info, impersonateToken string) {
Expand Down
68 changes: 68 additions & 0 deletions pkg/registry/cluster/storage/aggregate_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
Copyright 2022 The Karmada Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package storage

import (
"net/http"
"net/url"
"testing"

"github.com/stretchr/testify/require"

"github.com/karmada-io/karmada/pkg/util/lifted"
)

func TestRequestURL(t *testing.T) {
tests := []struct {
name string
urlString string
request http.Request
want string
}{
{
name: "without slash in the end",
urlString: "https://0.0.0.0:6443",
request: http.Request{
Method: "GET",
URL: &url.URL{
Path: "/api/v1/namespaces/test/pods/",
},
},
want: "https://0.0.0.0:6443/api/v1/namespaces/test/pods",
},
{
name: "with slash in the end",
urlString: "https://0.0.0.0:6443/",
request: http.Request{
Method: "GET",
URL: &url.URL{
Path: "/api/v1/namespaces/test/pods/",
},
},
want: "https://0.0.0.0:6443/api/v1/namespaces/test/pods",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
request := tt.request
proxyRequestInfo := lifted.NewRequestInfo(&request)
location, _ := url.Parse(tt.urlString)
requestURL := requestURLStr(location, proxyRequestInfo)
require.Equal(t, tt.want, requestURL)
})
}
}

0 comments on commit 0806039

Please sign in to comment.