pass input to log even if checkrequest times out

open-policy-agent · Oct 24, 2023 · 1af6ac8 · 1af6ac8
1 parent 064d640
commit 1af6ac8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/internal/internal.go b/internal/internal.go
@@ -384,11 +384,6 @@ func (p *envoyExtAuthzGrpcServer) check(ctx context.Context, req interface{}) (*
 		return nil
 	}
 
-	if ctx.Err() != nil {
-		err = errors.Wrap(ctx.Err(), "check request timed out before query execution")
-		return nil, stop, err
-	}
-
 	input, err = envoyauth.RequestToInput(req, logger, p.cfg.protoSet, p.cfg.SkipRequestBodyParse)
 	if err != nil {
 		return nil, stop, err
@@ -400,6 +395,11 @@ func (p *envoyExtAuthzGrpcServer) check(ctx context.Context, req interface{}) (*
 		return nil, stop, err
 	}
 
+	if ctx.Err() != nil {
+		err = errors.Wrap(ctx.Err(), "check request timed out before query execution")
+		return nil, stop, err
+	}
+
 	if err = envoyauth.Eval(ctx, p, inputValue, result); err != nil {
 		evalErr = err
 		return nil, stop, err

diff --git a/internal/internal_test.go b/internal/internal_test.go
@@ -520,6 +520,10 @@ func TestCheckContextTimeout(t *testing.T) {
 	if event.Error.Error() != expectedErrMsg {
 		t.Fatalf("Expected error message %v but got %v", expectedErrMsg, event.Error.Error())
 	}
+
+	if len((*event.Input).(map[string]interface{})) == 0 {
+		t.Fatalf("Expected non empty input but got %v", *event.Input)
+	}
 }
 
 func TestCheckIllegalDecisionWithLogger(t *testing.T) {