3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-04-30 19:06:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

httputil: ignore errors < 400 (#3781)

Browse source
This commit is contained in:
Caleb Doxsey 2022-12-05 09:00:25 -07:00 • committed by GitHub
parent 090601873f
commit a5082f60e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/httputil/errors.go
View file

@ -69,12 +69,14 @@ func (e *HTTPError) ErrorResponse(ctx context.Context, w http.ResponseWriter, r
// indicate to clients that the error originates from Pomerium, not the app // indicate to clients that the error originates from Pomerium, not the app
w.Header().Set(HeaderPomeriumResponse, "true") w.Header().Set(HeaderPomeriumResponse, "true")
if e.Status >= 400 {
log.Error(ctx). log.Error(ctx).
Err(e.Err). Err(e.Err).
Int("status", e.Status). Int("status", e.Status).
Str("status-text", StatusText(e.Status)). Str("status-text", StatusText(e.Status)).
Str("request-id", reqID). Str("request-id", reqID).
Msg("httputil: error") Msg("httputil: error")
}
if r.Header.Get("Accept") == "application/json" { if r.Header.Get("Accept") == "application/json" {
RenderJSON(w, e.Status, response) RenderJSON(w, e.Status, response)

1
internal/httputil/errors_test.go
View file

@ -21,6 +21,7 @@ func TestHTTPError_ErrorResponse(t *testing.T) {
}{ }{
{"404 json", http.StatusNotFound, errors.New("route not known"), "application/json", http.StatusNotFound, "{\"Status\":404}\n"}, {"404 json", http.StatusNotFound, errors.New("route not known"), "application/json", http.StatusNotFound, "{\"Status\":404}\n"},
{"404 html", http.StatusNotFound, errors.New("route not known"), "", http.StatusNotFound, ""}, {"404 html", http.StatusNotFound, errors.New("route not known"), "", http.StatusNotFound, ""},
{"302 found", http.StatusFound, errors.New("redirect"), "", http.StatusFound, ""},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {