improve error handling for net error(s)

fixes: reverse proxy support #2419
gofiber · Apr 21, 2023 · c2f8e14 · c2f8e14
1 parent ad88630
commit c2f8e14
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/app.go b/app.go
@@ -470,12 +470,6 @@ var DefaultMethods = []string{
 
 // DefaultErrorHandler that process return errors from handlers
 func DefaultErrorHandler(c *Ctx, err error) error {
-	var netErr net.Error
-	if errors.As(err, &netErr) {
-		// 502 - Bad Gateway
-		err = ErrBadGateway
-	}
-
 	code := StatusInternalServerError
 	var e *Error
 	if errors.As(err, &e) {
@@ -1054,13 +1048,18 @@ func (app *App) serverErrorHandler(fctx *fasthttp.RequestCtx, err error) {
 	c := app.AcquireCtx(fctx)
 	defer app.ReleaseCtx(c)
 
-	var errNetOP *net.OpError
+	var (
+		errNetOP *net.OpError
+		netErr   net.Error
+	)
 
 	switch {
 	case errors.As(err, new(*fasthttp.ErrSmallBuffer)):
 		err = ErrRequestHeaderFieldsTooLarge
 	case errors.As(err, &errNetOP) && errNetOP.Timeout():
 		err = ErrRequestTimeout
+	case errors.As(err, &netErr):
+		err = ErrBadGateway
 	case errors.Is(err, fasthttp.ErrBodyTooLarge):
 		err = ErrRequestEntityTooLarge
 	case errors.Is(err, fasthttp.ErrGetOnly):

diff --git a/app_test.go b/app_test.go
@@ -268,6 +268,20 @@ func Test_App_serverErrorHandler_Internal_Error(t *testing.T) {
 	utils.AssertEqual(t, c.fasthttp.Response.StatusCode(), StatusBadRequest)
 }
 
+func Test_App_serverErrorHandler_Network_Error(t *testing.T) {
+	t.Parallel()
+	app := New()
+	c := app.AcquireCtx(&fasthttp.RequestCtx{})
+	defer app.ReleaseCtx(c)
+	app.serverErrorHandler(c.fasthttp, &net.DNSError{
+		Err:       "test error",
+		Name:      "test host",
+		IsTimeout: false,
+	})
+	utils.AssertEqual(t, string(c.fasthttp.Response.Body()), utils.StatusMessage(StatusBadGateway))
+	utils.AssertEqual(t, c.fasthttp.Response.StatusCode(), StatusBadGateway)
+}
+
 func Test_App_Nested_Params(t *testing.T) {
 	t.Parallel()
 	app := New()

diff --git a/docs/guide/error-handling.md b/docs/guide/error-handling.md
@@ -71,12 +71,6 @@ Fiber provides an error handler by default. For a standard error, the response i
 ```go title="Example"
 // Default error handler
 var DefaultErrorHandler = func(c *fiber.Ctx, err error) error {
-    // Handle internal network errors
-    var netErr net.Error
-    if errors.As(err, &netErr) {
-        // 502 - Bad Gateway
-        err = ErrBadGateway
-    }
     // Status code defaults to 500
     code := fiber.StatusInternalServerError