Skip to content

K
k3s
Commit 4372b437 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #44513 from mml/windows

Automatic merge from submit-queue (batch tested with PRs 44519, 43194, 44513) Use regexp instead of substring to do search and replace. enisoc pointed out how ToLower can change (lengthen even!) the length of a string given arbitrary input. Follow-up to #44421 for #44419
parents 99b2ab07 fe202fcf
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
View file @ 4372b437
...@@ -20,6 +20,7 @@ import ( ...@@ -20,6 +20,7 @@ import (
"bufio" "bufio"
"net" "net"
"net/http" "net/http"
"regexp"
"strconv" "strconv"
"strings" "strings"
"time" "time"
...@@ -58,6 +59,7 @@ var ( ...@@ -58,6 +59,7 @@ var (
}, },
[]string{"verb", "resource"}, []string{"verb", "resource"},
) )
kubectlExeRegexp = regexp.MustCompile(`^.*((?i:kubectl\.exe))`)
) )
// Register all metrics. // Register all metrics.
...@@ -114,9 +116,7 @@ func cleanUserAgent(ua string) string { ...@@ -114,9 +116,7 @@ func cleanUserAgent(ua string) string {
return "Browser" return "Browser"
} }
// If an old "kubectl.exe" has passed us its full path, we discard the path portion. // If an old "kubectl.exe" has passed us its full path, we discard the path portion.
if exeIdx := strings.LastIndex(strings.ToLower(ua), "kubectl.exe"); exeIdx != -1 { ua = kubectlExeRegexp.ReplaceAllString(ua, "$1")
return ua[exeIdx:]
}
return ua return ua
} }
......
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics_test.go
View file @ 4372b437
...@@ -19,6 +19,8 @@ package metrics ...@@ -19,6 +19,8 @@ package metrics
import "testing" import "testing"
func TestCleanUserAgent(t *testing.T) { func TestCleanUserAgent(t *testing.T) {
panicBuf := []byte{198, 73, 129, 133, 90, 216, 104, 29, 13, 134, 209, 233, 30, 0, 22}
for _, tc := range []struct { for _, tc := range []struct {
In string In string
Out string Out string
...@@ -39,6 +41,11 @@ func TestCleanUserAgent(t *testing.T) { ...@@ -39,6 +41,11 @@ func TestCleanUserAgent(t *testing.T) {
In: `C:\Program Files\kubectl.exe/v1.5.4`, In: `C:\Program Files\kubectl.exe/v1.5.4`,
Out: "kubectl.exe/v1.5.4", Out: "kubectl.exe/v1.5.4",
}, },
{
// This malicious input courtesy of enisoc.
In: string(panicBuf) + "kubectl.exe",
Out: "kubectl.exe",
},
} { } {
if cleanUserAgent(tc.In) != tc.Out { if cleanUserAgent(tc.In) != tc.Out {
t.Errorf("Failed to clean User-Agent: %s", tc.In) t.Errorf("Failed to clean User-Agent: %s", tc.In)
......
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