Merge pull request #174 from ibihim/pre-acceptance

Minor Pre-Acceptance: Set default method, return 500s on broken path regex.
brancz · Jun 28, 2022 · 50a7e88 · 50a7e88
2 parents a716929 + 52101a2
commit 50a7e88
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/main.go b/main.go
@@ -265,6 +265,11 @@ func main() {
 		for _, pathAllowed := range cfg.allowPaths {
 			found, err = path.Match(pathAllowed, req.URL.Path)
 			if err != nil {
+				http.Error(
+					w,
+					http.StatusText(http.StatusInternalServerError),
+					http.StatusInternalServerError,
+				)
 				return
 			}
 			if found {
@@ -280,6 +285,11 @@ func main() {
 		for _, pathIgnored := range cfg.ignorePaths {
 			ignorePathFound, err = path.Match(pathIgnored, req.URL.Path)
 			if err != nil {
+				http.Error(
+					w,
+					http.StatusText(http.StatusInternalServerError),
+					http.StatusInternalServerError,
+				)
 				return
 			}
 			if ignorePathFound {

diff --git a/pkg/proxy/proxy.go b/pkg/proxy/proxy.go
@@ -127,7 +127,7 @@ type krpAuthorizerAttributesGetter struct {
 
 // GetRequestAttributes populates authorizer attributes for the requests to kube-rbac-proxy.
 func (n krpAuthorizerAttributesGetter) GetRequestAttributes(u user.Info, r *http.Request) []authorizer.Attributes {
-	apiVerb := ""
+	apiVerb := "*"
 	switch r.Method {
 	case "POST":
 		apiVerb = "create"