fix: match kv adapt glob expression (#110)

Author: alkaidchen

pkg/tools/tools.go

@@ -21,6 +21,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/gobwas/glob"
+
 	"github.com/TencentBlueKing/bk-bscp/pkg/i18n"
 	"github.com/TencentBlueKing/bk-bscp/pkg/kit"
 )
@@ -287,8 +289,11 @@ func MatchPattern(name string, match []string) bool {
 	}
 
 	for _, m := range match {
-		ok, _ := path.Match(m, name)
-		if ok {
+		g, err := glob.Compile(m)
+		if err != nil {
+			continue
+		}
+		if g.Match(name) {
 			return true
 		}
 	}

pkg/tools/tools_test.go

@@ -141,3 +141,26 @@ func TestSplitPathAndName(t *testing.T) {
 		}
 	}
 }
+
+func TestMatch(t *testing.T) {
+	tests := []struct {
+		input    string
+		patterns []string
+		expected bool
+	}{
+		{"file.txt", []string{"*.txt"}, true},
+		{"file.txt", []string{"file.txt"}, true},
+		{"file.txt", []string{"file.*"}, true},
+		{"file.txt", []string{"file"}, false},
+		{"file.txt", []string{"file.txt*"}, true},
+		{"key1", []string{"{key1,key2}"}, true},
+		{"key2", []string{"{key1,key2}"}, true},
+		{"key3", []string{"key1", "key2", "key3"}, true},
+	}
+	for _, test := range tests {
+		result := MatchPattern(test.input, test.patterns)
+		if result != test.expected {
+			t.Errorf("MatchPattern(%s, %v) = %t, want %t", test.input, test.patterns, result, test.expected)
+		}
+	}
+}

pkg/types/cache.go

@@ -14,10 +14,10 @@ package types
 
 import (
 	"fmt"
-	"path"
 	"strings"
 	"time"
 
+	"github.com/gobwas/glob"
 	"github.com/samber/lo"
 
 	"github.com/TencentBlueKing/bk-bscp/pkg/dal/table"
@@ -175,12 +175,12 @@ func (c *CredentialCache) MatchKv(app, key string) bool {
 		return false
 	}
 
-	for _, v := range scopes {
-		ok, err := path.Match(v, key)
+	for _, s := range scopes {
+		g, err := glob.Compile(s)
 		if err != nil {
-			return false
+			continue
 		}
-		if ok {
+		if g.Match(key) {
 			return true
 		}
 	}