Increasded regex robustness

kubernetes · Sep 6, 2023 · df10b09 · df10b09
1 parent 7f75e80
commit df10b09
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 12 deletions.
diff --git a/pkg/minikube/node/config.go b/pkg/minikube/node/config.go
@@ -43,13 +43,30 @@ import (
 
 func maskProxyPassword(v string) string {
 	parts := strings.Split(v, "=")
+	// Is it an attribution variable?
 	if len(parts) == 2 {
 		key := strings.ToUpper(parts[0])
+		// Is it a proxy setting?
 		if key == "HTTP_PROXY" || key == "HTTPS_PROXY" {
-			pattern := `//([^:]+):[^\@]+@`
-			regexpPattern := regexp.MustCompile(pattern)
-			value := regexpPattern.ReplaceAllString(parts[1], "//$1:*****@")
-			v = key + "=" + value
+			proxyValue := parts[1]
+			// Proxy variable values SHOULD have a value like
+			// https(s)://<whatever>
+			proxyAddressParts := strings.Split(proxyValue, "://")
+			if len(proxyAddressParts) == 2 {
+				proxyURL := ""
+				proxyURL = proxyAddressParts[1]
+				// Let's store the username, the URL and and optional port address
+				pattern := `([^:]+):.+(@[\w\.]+)(:\d+)?`
+				regexpPattern := regexp.MustCompile(pattern)
+				matches := regexpPattern.FindStringSubmatch(proxyURL)
+				mask := "*****"
+				if len(matches) == 4 {
+					proxyValue = fmt.Sprintf("%s://%s:%s%s%s", proxyAddressParts[0], matches[1], mask, matches[2], matches[3])
+				} else if len(matches) == 3 {
+					proxyValue = fmt.Sprintf("%s//%s:%s@%s", proxyAddressParts[0], matches[1], mask, matches[2])
+				}
+			}
+			v = key + "=" + proxyValue
 		}
 	}
 	return v

diff --git a/pkg/minikube/node/config_test.go b/pkg/minikube/node/config_test.go
@@ -35,20 +35,32 @@ func Test_maskProxyPassword(t *testing.T) {
 			output: "myDockerOption=value",
 		},
 		{
-			input:  "http_proxy=http://myproxy.company.com",
-			output: "HTTP_PROXY=http://myproxy.company.com",
+			input:  "http_proxy=http://minikube.sigs.k8s.io",
+			output: "HTTP_PROXY=http://minikube.sigs.k8s.io",
 		},
 		{
-			input:  "https_proxy=http://jdoe@myproxy.company.com:8080",
-			output: "HTTPS_PROXY=http://jdoe@myproxy.company.com:8080",
+			input:  "https_proxy=http://jdoe@minikube.sigs.k8s.io:8080",
+			output: "HTTPS_PROXY=http://jdoe@minikube.sigs.k8s.io:8080",
 		},
 		{
-			input:  "https_proxy=https://mary:am$uT8zB(rP@myproxy.company.com:8080",
-			output: "HTTPS_PROXY=https://mary:*****@myproxy.company.com:8080",
+			input:  "https_proxy=https://mary:iam$Fake!password@minikube.sigs.k8s.io:8080",
+			output: "HTTPS_PROXY=https://mary:*****@minikube.sigs.k8s.io:8080",
 		},
 		{
-			input:  "http_proxy=http://jdoe:mPu3z9uT#!@myproxy.company.com:8080",
-			output: "HTTP_PROXY=http://jdoe:*****@myproxy.company.com:8080",
+			input:  "http_proxy=http://jdoe:%n0tRe@al:Password!@minikube.sigs.k8s.io:8080",
+			output: "HTTP_PROXY=http://jdoe:*****@minikube.sigs.k8s.io:8080",
+		},
+		{
+			input:  "http_proxy=http://jo@han:n0tRe@al:&Password!@minikube.sigs.k8s.io:8080",
+			output: "HTTP_PROXY=http://jo@han:*****@minikube.sigs.k8s.io:8080",
+		},
+		{
+			input:  "http_proxy=http://k@r3n!:an0th3erF@akeP@55word@minikube.sigs.k8s.io",
+			output: "HTTP_PROXY=http://k@r3n!:*****@minikube.sigs.k8s.io",
+		},
+		{
+			input:  "https_proxy=https://fr@ank5t3in:an0th3erF@akeP@55word@minikube.sigs.k8s.io",
+			output: "HTTPS_PROXY=https://fr@ank5t3in:*****@minikube.sigs.k8s.io",
 		},
 	}
 	for _, test := range tests {