Skip to content

Commit 2ed2139

Browse files
authored
Merge pull request #33 from pedramktb/fix/taggederror-http-handler
fix: use consistent error responses
2 parents b537694 + d306a06 commit 2ed2139

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

evasion/error_handler.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ var evasiveError = taggederror.NewRoot(
1616
)
1717

1818
func ErrorHandler(err error, trusted bool, w http.ResponseWriter, r *http.Request) {
19-
if trusted {
19+
if trusted || env.GetEnvironment() != env.EnvironmentProd {
2020
trustedHandler(err, w, r)
2121
} else {
22-
untrustedHandler(err, w, r)
22+
w.WriteHeader(FailStatusCode)
2323
}
2424
}
2525

@@ -31,12 +31,3 @@ func trustedHandler(err error, w http.ResponseWriter, r *http.Request) {
3131
}
3232
taggederror.Handler(evasiveError.Wrap(taggedErr), w, r)
3333
}
34-
35-
// untrustedHandler uses FailStatusCode with no detail
36-
func untrustedHandler(err error, w http.ResponseWriter, r *http.Request) {
37-
if env.GetEnvironment() != env.EnvironmentProd {
38-
taggederror.Handler(err, w, r)
39-
} else {
40-
w.WriteHeader(FailStatusCode)
41-
}
42-
}

0 commit comments

Comments
 (0)