fix: inspect cluster without privilegedUsername (#2183)

Co-authored-by: xdonggao <xdonggao@tencent.com>
tkestack · Dec 5, 2022 · 6e1a4a9 · 6e1a4a9
1 parent 4eebafd
commit 6e1a4a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/pkg/auth/filter/filter.go b/pkg/auth/filter/filter.go
@@ -21,7 +21,6 @@ package filter
 import (
 	"fmt"
 	"net/http"
-	"net/http/httputil"
 	"strconv"
 	"strings"
 	"unicode"
@@ -79,11 +78,14 @@ func ExtractClusterNames(ctx context.Context, req *http.Request, resource string
 		clusterNames.Insert(clusterName)
 	}
 
-	clusterNames.Insert(cluster.NamePattern.FindAllString(resource, -1)...)
+	filterResourceClusterNames := cluster.ClusterPattern.FindAllString(resource, -1)
+	for _, filterClusterName := range filterResourceClusterNames {
+		clusterNames.Insert(cluster.NamePattern.FindAllString(filterClusterName, -1)...)
+	}
 
-	data, err := httputil.DumpRequest(req, true)
-	if err == nil {
-		clusterNames.Insert(cluster.NamePattern.FindAllString(string(data), -1)...)
+	filterURLClusterNames := cluster.ClusterPattern.FindAllString(req.URL.String(), -1)
+	for _, filterClusterName := range filterURLClusterNames {
+		clusterNames.Insert(cluster.NamePattern.FindAllString(filterClusterName, -1)...)
 	}
 
 	return clusterNames.List()

diff --git a/pkg/platform/registry/cluster/strategy.go b/pkg/platform/registry/cluster/strategy.go
@@ -50,7 +50,8 @@ const (
 )
 
 var (
-	NamePattern = regexp.MustCompile(`(cls-[a-z0-9]+|global)`)
+	ClusterPattern = regexp.MustCompile(`(/clusters/cls-[a-z0-9]+|/clusters/global)`)
+	NamePattern    = regexp.MustCompile(`(cls-[a-z0-9]+|global)`)
 )
 
 // Strategy implements verification logic for cluster.