feat: skip json parsing if allowedUser or ignoredUser are empty stakater#84

Author: maxisam

pkg/proxy/proxy.go

@@ -143,14 +143,16 @@ func (p *Proxy) proxyRequest(w http.ResponseWriter, r *http.Request, params http
 		return
 	}
 
-	if event := provider.GetEventType(*hook); provider.IsCommitterCheckEvent(event) {
-		committer := provider.GetCommitter(*hook, event)
-		log.Printf("Incoming request from user: %s", committer)
-		if p.isIgnoredUser(committer) || (!p.isAllowedUser(committer)) {
-			log.Printf("Ignoring request for user: %s", committer)
-			w.WriteHeader(http.StatusOK)
-			w.Write([]byte(fmt.Sprintf("Ignoring request for user: %s", committer)))
-			return
+	if len(p.ignoredUsers) > 0 || len(p.allowedUsers) > 0 {
+		if event := provider.GetEventType(*hook); provider.IsCommitterCheckEvent(event) {
+			committer := provider.GetCommitter(*hook, event)
+			log.Printf("Incoming request from user: %s", committer)
+			if p.isIgnoredUser(committer) || (!p.isAllowedUser(committer)) {
+				log.Printf("Ignoring request for user: %s", committer)
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(fmt.Sprintf("Ignoring request for user: %s", committer)))
+				return
+			}
 		}
 	}
 

pkg/proxy/proxy_test.go

@@ -15,7 +15,7 @@ import (
 
 const (
 	proxyGitlabTestSecret = "testSecret"
-	proxyGitlabTestEvent  = "testEvent"
+	proxyGitlabTestEvent  = "Push Hook"
 	proxyGitlabTestBody   = "testBody"
 	httpBinURL            = "httpbin.org"
 	httpBinURLInsecure    = "http://" + httpBinURL
@@ -468,6 +468,7 @@ func TestProxy_proxyRequest(t *testing.T) {
 		upstreamURL  string
 		allowedPaths []string
 		secret       string
+		allowedUsers []string
 	}
 	type args struct {
 		request *http.Request
@@ -603,6 +604,35 @@ func TestProxy_proxyRequest(t *testing.T) {
 			},
 			wantStatusCode: http.StatusMethodNotAllowed,
 		},
+		{
+			name: "TestProxyRequestShouldNotParseJsonWithoutAllowedOrIgnoredUsersConfigured",
+			fields: fields{
+				provider:     providers.GitlabProviderKind,
+				upstreamURL:  httpBinURLSecure,
+				allowedPaths: []string{},
+				secret:       "",
+			},
+			args: args{
+				request: createGitlabRequestWithPayload(http.MethodPost, "/post",
+					proxyGitlabTestSecret, proxyGitlabTestEvent, []byte("{}")),
+			},
+			wantStatusCode: http.StatusOK,
+		},
+		{
+			name: "TestProxyRequestShouldParseJsonWithAllowedOrIgnoredUsersConfigured",
+			fields: fields{
+				provider:     providers.GitlabProviderKind,
+				upstreamURL:  httpBinURLSecure,
+				allowedPaths: []string{},
+				secret:       "",
+				allowedUsers: []string{"jsmith"},
+			},
+			args: args{
+				request: createGitlabRequestWithPayload(http.MethodPost, "/post",
+					proxyGitlabTestSecret, proxyGitlabTestEvent, proxyGitlabTestPayload),
+			},
+			wantStatusCode: http.StatusOK,
+		},
 		{
 			name: "TestProxyRequestWithInvalidHttpMethod",
 			fields: fields{
@@ -737,6 +767,7 @@ func TestProxy_proxyRequest(t *testing.T) {
 				upstreamURL:  tt.fields.upstreamURL,
 				allowedPaths: tt.fields.allowedPaths,
 				secret:       tt.fields.secret,
+				allowedUsers: tt.fields.allowedUsers,
 			}
 			router := httprouter.New()
 			router.POST("/*path", p.proxyRequest)