github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(libhttp): capitalize http error responses for better display [EE-6698] (#11114)

pull/11231/head
Matt Hook 2024-02-21 07:51:46 +13:00 committed by GitHub
parent 76fdfeaafc
commit 76aa086d79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/libhttp/error/error.go
View File

@ -4,6 +4,7 @@ package error
import (
"errors"
"net/http"
"unicode"
"github.com/rs/zerolog/log"
"github.com/segmentio/encoding/json"
@ -26,9 +27,19 @@ func (handler LoggerHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request)
}
}
func capitalize(s string) string {
if len(s) == 0 {
return s
}
// Capitalize the first letter of the word or sentence
firstLetter := unicode.ToUpper(rune(s[0]))
return string(firstLetter) + s[1:]
}
func writeErrorResponse(rw http.ResponseWriter, err *HandlerError) {
if err.Err == nil {
err.Err = errors.New(err.Message)
err.Err = errors.New(capitalize(err.Message))
}
log.Debug().CallerSkipFrame(2).Err(err.Err).Int("status_code", err.StatusCode).Str("msg", err.Message).Msg("HTTP error")
@ -40,7 +51,7 @@ func writeErrorResponse(rw http.ResponseWriter, err *HandlerError) {
enc.SetSortMapKeys(false)
enc.SetAppendNewline(false)
enc.Encode(&errorResponse{Message: err.Message, Details: err.Err.Error()})
enc.Encode(&errorResponse{Message: err.Message, Details: capitalize(err.Err.Error())})
}
// WriteError is a convenience function that creates a new HandlerError before calling writeErrorResponse.