From aef7ba081e86e17875ebc3b55be65f2e2bcf2b53 Mon Sep 17 00:00:00 2001
From: Guilherme Cassolato <guicassolato@gmail.com>
Date: Mon, 25 Mar 2024 11:10:03 +0100
Subject: [PATCH 1/2] Handle invalid ext_authz request

---
 pkg/service/auth.go      | 21 +++++++++++++++++++--
 pkg/service/auth_test.go | 10 ++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/pkg/service/auth.go b/pkg/service/auth.go
index 800588f6..1e62afd2 100644
--- a/pkg/service/auth.go
+++ b/pkg/service/auth.go
@@ -3,6 +3,7 @@ package service
 import (
 	"encoding/json"
 	"encoding/pem"
+	"fmt"
 	"io"
 	"net/http"
 	"net/url"
@@ -51,6 +52,7 @@ var (
 	statusCodeMapping = map[rpc.Code]envoy_type.StatusCode{
 		rpc.OK:                  envoy_type.StatusCode_OK,
 		rpc.FAILED_PRECONDITION: envoy_type.StatusCode_BadRequest,
+		rpc.INVALID_ARGUMENT:    envoy_type.StatusCode_BadRequest,
 		rpc.NOT_FOUND:           envoy_type.StatusCode_NotFound,
 		rpc.UNAUTHENTICATED:     envoy_type.StatusCode_Unauthorized,
 		rpc.PERMISSION_DENIED:   envoy_type.StatusCode_Forbidden,
@@ -235,7 +237,22 @@ func (a *AuthService) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
 // Check performs authorization check based on the attributes associated with the incoming request,
 // and returns status `OK` or not `OK`.
 func (a *AuthService) Check(parentContext gocontext.Context, req *envoy_auth.CheckRequest) (*envoy_auth.CheckResponse, error) {
-	requestData := req.Attributes.Request.Http
+	logger := log.WithName("service").WithName("auth")
+
+	var requestData *envoy_auth.AttributeContext_HttpRequest
+	if req != nil && req.Attributes != nil && req.Attributes.Request != nil && req.Attributes.Request.Http != nil {
+		requestData = req.Attributes.Request.Http
+	} else {
+		requestId := ensureRequestId()
+		_, span := trace.NewAuthorizationRequestSpan(parentContext, "AuthService", "Check", requestId, "")
+		defer span.End()
+		err := fmt.Errorf("invalid authorization request")
+		logger.Error(err, "missing http attributes", "request", req, "request id", requestId)
+		span.RecordError(err)
+		span.SetStatus(otel_codes.Error, err.Error())
+		result := auth.AuthResult{Code: rpc.INVALID_ARGUMENT, Message: RESPONSE_MESSAGE_INVALID_REQUEST}
+		return a.deniedResponse(result), nil
+	}
 
 	propagationRequestId := requestData.Headers[strings.ToLower(ENVOY_TRACE_REQUEST_ID_HEADER)]
 	requestId := ensureRequestId(propagationRequestId, requestData.GetId())
@@ -244,7 +261,7 @@ func (a *AuthService) Check(parentContext gocontext.Context, req *envoy_auth.Che
 	ctx, span := trace.NewAuthorizationRequestSpan(parentContext, "AuthService", "Check", requestId, propagationRequestId)
 	defer span.End()
 
-	requestLogger := log.WithName("service").WithName("auth").WithValues("request id", requestId)
+	requestLogger := logger.WithValues("request id", requestId)
 	ctx = log.IntoContext(context.New(context.WithParent(ctx), context.WithTimeout(a.Timeout)), requestLogger)
 
 	a.logAuthRequest(req, ctx)
diff --git a/pkg/service/auth_test.go b/pkg/service/auth_test.go
index 5e1c55e5..26366e04 100644
--- a/pkg/service/auth_test.go
+++ b/pkg/service/auth_test.go
@@ -143,6 +143,16 @@ func TestBuildDynamicEnvoyMetadata(t *testing.T) {
 	assert.NilError(t, err)
 }
 
+func TestInvalidCheckRequest(t *testing.T) {
+	authService := AuthService{Index: index.NewIndex()}
+	resp, err := authService.Check(context.TODO(), &envoy_auth.CheckRequest{})
+	assert.NilError(t, err)
+	assert.Equal(t, resp.Status.Code, int32(rpc.INVALID_ARGUMENT))
+	denied := resp.GetDeniedResponse()
+	assert.Equal(t, denied.Status.Code, envoy_type.StatusCode_BadRequest)
+	assert.Equal(t, getHeader(denied.GetHeaders(), X_EXT_AUTH_REASON_HEADER), "Invalid request")
+}
+
 func TestAuthServiceRawHTTPAuthorization_Post(t *testing.T) {
 	mockController := gomock.NewController(t)
 	defer mockController.Finish()

From 9a4e4d4ba5214f07f13c4c412a70c6acac84736c Mon Sep 17 00:00:00 2001
From: Guilherme Cassolato <guicassolato@gmail.com>
Date: Mon, 25 Mar 2024 12:49:48 +0100
Subject: [PATCH 2/2] Fix setup-envtest version to avoid requiring bumping to
 go 1.22

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c2f62680..4f4081b9 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ kustomize: ## Installs kustomize in $PROJECT_DIR/bin
 
 ENVTEST = $(PROJECT_DIR)/bin/setup-envtest
 envtest: ## Installs setup-envtest in $PROJECT_DIR/bin
-	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
+	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.16)
 
 MOCKGEN = $(PROJECT_DIR)/bin/mockgen
 mockgen: ## Installs mockgen in $PROJECT_DIR/bin