From 43d833924c7524b3341780716d175c296dd5ac1d Mon Sep 17 00:00:00 2001
From: Bob Callaway <bcallaway@google.com>
Date: Thu, 21 Nov 2024 16:28:29 -0500
Subject: [PATCH] log request body on 500 error to aid debugging

Signed-off-by: Bob Callaway <bcallaway@google.com>
---
 pkg/api/error.go | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkg/api/error.go b/pkg/api/error.go
index e0a04fc93..49f2c66e6 100644
--- a/pkg/api/error.go
+++ b/pkg/api/error.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/strfmt"
-	"github.com/mitchellh/mapstructure"
 
 	"github.com/sigstore/rekor/pkg/generated/models"
 	"github.com/sigstore/rekor/pkg/generated/restapi/operations/entries"
@@ -67,18 +66,15 @@ func handleRekorAPIError(params interface{}, code int, err error, message string
 	typeStr := fmt.Sprintf("%T", params)
 	handler := re.FindStringSubmatch(typeStr)[1]
 
-	logMsg := func(r *http.Request) {
+	logMsg := func(r *http.Request, inputs ...interface{}) {
 		ctx := r.Context()
 		fields := append([]interface{}{"handler", handler, "statusCode", code, "clientMessage", message}, fields...)
 		if code >= 500 {
+			fields = append(fields, inputs...)
 			log.ContextLogger(ctx).Errorw(err.Error(), fields...)
 		} else {
 			log.ContextLogger(ctx).Warnw(err.Error(), fields...)
 		}
-		paramsFields := map[string]interface{}{}
-		if err := mapstructure.Decode(params, &paramsFields); err == nil {
-			log.ContextLogger(ctx).Debug(paramsFields)
-		}
 	}
 
 	switch params := params.(type) {
@@ -119,11 +115,16 @@ func handleRekorAPIError(params interface{}, code int, err error, message string
 			}
 			return resp
 		default:
-			logMsg(params.HTTPRequest)
+			requestFields := []interface{}{"requestBody", params.ProposedEntry}
+			logMsg(params.HTTPRequest, requestFields...)
 			return entries.NewCreateLogEntryDefault(code).WithPayload(errorMsg(message, code))
 		}
 	case entries.SearchLogQueryParams:
-		logMsg(params.HTTPRequest)
+		requestFields := []interface{}{}
+		if params.Entry != nil {
+			requestFields = append(requestFields, "requestBody", *params.Entry)
+		}
+		logMsg(params.HTTPRequest, requestFields...)
 		switch code {
 		case http.StatusBadRequest:
 			return entries.NewSearchLogQueryBadRequest().WithPayload(errorMsg(message, code))
@@ -147,7 +148,11 @@ func handleRekorAPIError(params interface{}, code int, err error, message string
 		logMsg(params.HTTPRequest)
 		return pubkey.NewGetPublicKeyDefault(code).WithPayload(errorMsg(message, code))
 	case index.SearchIndexParams:
-		logMsg(params.HTTPRequest)
+		requestFields := []interface{}{}
+		if params.Query != nil {
+			requestFields = append(requestFields, "requestBody", *params.Query)
+		}
+		logMsg(params.HTTPRequest, requestFields...)
 		switch code {
 		case http.StatusBadRequest:
 			return index.NewSearchIndexBadRequest().WithPayload(errorMsg(message, code))