Merge pull request #69 from gatewayd-io/fix-stale-connection-issue

Fix stale connection issue

Author: mostafa

network/proxy.go

@@ -2,8 +2,6 @@ package network
 
 import (
 	"context"
-	"errors"
-	"io"
 
 	gerr "github.com/gatewayd-io/gatewayd/errors"
 	"github.com/gatewayd-io/gatewayd/plugin"
@@ -262,7 +260,7 @@ func (pr *ProxyImpl) PassThrough(gconn gnet.Conn) *gerr.GatewayDError {
 
 	// The connection to the server is closed, so we MUST reconnect,
 	// otherwise the client will be stuck.
-	if received == 0 && err != nil && errors.Is(err.Unwrap(), io.EOF) {
+	if IsConnClosed(received, err) || IsConnTimedOut(err) {
 		pr.logger.Debug().Fields(
 			map[string]interface{}{
 				"function": "proxy.passthrough",
@@ -289,6 +287,17 @@ func (pr *ProxyImpl) PassThrough(gconn gnet.Conn) *gerr.GatewayDError {
 		}
 	}
 
+	// If the response is empty, don't send anything, instead just close the ingress connection.
+	if received == 0 {
+		pr.logger.Debug().Fields(
+			map[string]interface{}{
+				"function": "proxy.passthrough",
+				"local":    client.Conn.LocalAddr().String(),
+				"remote":   client.Conn.RemoteAddr().String(),
+			}).Msg("No data to send to client")
+		return err
+	}
+
 	// Run the OnEgressTraffic hooks.
 	result, err = pr.hookConfig.Run(
 		context.Background(),

network/server.go

@@ -218,15 +218,15 @@ func (s *Server) OnTraffic(gconn gnet.Conn) gnet.Action {
 	// Pass the traffic from the client to server and vice versa.
 	// If there is an error, log it and close the connection.
 	if err := s.proxy.PassThrough(gconn); err != nil {
-		s.logger.Error().Err(err).Msg("Failed to pass through traffic")
+		s.logger.Warn().Err(err).Msg("Failed to pass through traffic")
 		switch {
-		case errors.Is(err, gerr.ErrPoolExhausted):
-		case errors.Is(err, gerr.ErrCastFailed):
-		case errors.Is(err, gerr.ErrClientNotFound):
-		case errors.Is(err, gerr.ErrClientNotConnected):
-		case errors.Is(err, gerr.ErrClientSendFailed):
-		case errors.Is(err, gerr.ErrClientReceiveFailed):
-		case errors.Is(err.Unwrap(), io.EOF):
+		case errors.Is(err, gerr.ErrPoolExhausted),
+			errors.Is(err, gerr.ErrCastFailed),
+			errors.Is(err, gerr.ErrClientNotFound),
+			errors.Is(err, gerr.ErrClientNotConnected),
+			errors.Is(err, gerr.ErrClientSendFailed),
+			errors.Is(err, gerr.ErrClientReceiveFailed),
+			errors.Is(err.Unwrap(), io.EOF):
 			return gnet.Close
 		}
 	}

network/utils.go

@@ -4,7 +4,9 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
+	"errors"
 	"fmt"
+	"io"
 	"net"
 	"syscall"
 
@@ -118,3 +120,17 @@ func extractFieldValue(result map[string]interface{}, fieldName string) ([]byte,
 	}
 	return data, err, conversionErr
 }
+
+func IsConnTimedOut(err *gerr.GatewayDError) bool {
+	if err != nil && err.Unwrap() != nil {
+		var netErr net.Error
+		if ok := errors.As(err.Unwrap(), &netErr); ok && netErr.Timeout() {
+			return true
+		}
+	}
+	return false
+}
+
+func IsConnClosed(received int, err *gerr.GatewayDError) bool {
+	return received == 0 && err != nil && err.Unwrap() != nil && errors.Is(err.Unwrap(), io.EOF)
+}