fix: return better error codes from proxy

ory · Sep 27, 2024 · 8f0110c · 8f0110c
1 parent b4941ae
commit 8f0110c
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/proxy/proxy.go b/proxy/proxy.go
@@ -258,10 +258,20 @@ func (o *options) beforeProxyMiddleware(h http.Handler) http.Handler {
 }
 
 func defaultErrorHandler(w http.ResponseWriter, r *http.Request, err error) {
-	if !errors.Is(err, context.Canceled) {
+	switch {
+	case errors.Is(err, context.Canceled):
+		w.WriteHeader(499) // http://nginx.org/en/docs/dev/development_guide.html
+	case isTimeoutError(err):
+		w.WriteHeader(http.StatusGatewayTimeout)
+	default:
 		log.Printf("http: proxy error: %v", err)
+		w.WriteHeader(http.StatusBadGateway)
 	}
-	w.WriteHeader(http.StatusBadGateway)
+}
+
+func isTimeoutError(err error) bool {
+	var te interface{ Timeout() bool } = nil
+	return errors.As(err, &te) && te.Timeout() || errors.Is(err, context.DeadlineExceeded)
 }
 
 // New creates a new Proxy