refactor: server

Author: evgeniy-scherbina

proxy/proxy.go

@@ -12,7 +12,6 @@ import (
 	"net/url"
 	"strings"
 	"sync"
-	"time"
 
 	"github.com/coder/boundary/audit"
 	"github.com/coder/boundary/rules"
@@ -26,7 +25,7 @@ type Server struct {
 	tlsConfig  *tls.Config
 	httpPort   int
 
-	httpServer *http.Server
+	listener net.Listener
 }
 
 // Config holds configuration for the proxy server
@@ -51,27 +50,22 @@ func NewProxyServer(config Config) *Server {
 
 // Start starts the HTTP proxy server with TLS termination capability
 func (p *Server) Start(ctx context.Context) error {
-	// Create HTTP server with TLS termination capability
-	p.httpServer = &http.Server{
-		Addr:    fmt.Sprintf(":%d", p.httpPort),
-		Handler: http.HandlerFunc(p.handleHTTPWithTLSTermination),
-	}
-
 	// Start HTTP server with custom listener for TLS detection
 	go func() {
 		p.logger.Info("Starting HTTP proxy with TLS termination", "port", p.httpPort)
-		listener, err := net.Listen("tcp", fmt.Sprintf(":%d", p.httpPort))
+		var err error
+		p.listener, err = net.Listen("tcp", fmt.Sprintf(":%d", p.httpPort))
 		if err != nil {
 			p.logger.Error("Failed to create HTTP listener", "error", err)
 			return
 		}
 
 		for {
-			conn, err := listener.Accept()
+			conn, err := p.listener.Accept()
 			if err != nil {
 				select {
 				case <-ctx.Done():
-					err = listener.Close()
+					err = p.listener.Close()
 					if err != nil {
 						p.logger.Error("Failed to close listener", "error", err)
 					}
@@ -94,17 +88,17 @@ func (p *Server) Start(ctx context.Context) error {
 
 // Stops proxy server
 func (p *Server) Stop() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	var httpErr error
-	if p.httpServer != nil {
-		httpErr = p.httpServer.Shutdown(ctx)
+	if p.listener == nil {
+		return nil
 	}
 
-	if httpErr != nil {
-		return httpErr
+	err := p.listener.Close()
+	if err != nil {
+		p.logger.Error("Failed to close listener", "error", err)
 	}
+
+	fmt.Printf("STOP is finished\n")
+
 	return nil
 }
 
@@ -479,13 +473,6 @@ func (p *Server) handleConnectionWithTLSDetection(conn net.Conn) {
 	}
 }
 
-// handleHTTPWithTLSTermination is the main handler (currently just delegates to regular HTTP)
-func (p *Server) handleHTTPWithTLSTermination(w http.ResponseWriter, r *http.Request) {
-	// This handler is not used when we do custom connection handling
-	// All traffic goes through handleConnectionWithTLSDetection
-	p.handleHTTP(w, r)
-}
-
 // connectionWrapper lets us "unread" the peeked byte
 type connectionWrapper struct {
 	net.Conn

proxy/proxy_test.go

@@ -109,6 +109,12 @@ func TestProxyServerBasicHTTP(t *testing.T) {
 }`
 		require.Equal(t, expectedResponse, string(body))
 	})
+
+	err = server.Stop()
+	require.NoError(t, err)
+	cancel()
+	err = <-serverDone
+	require.NoError(t, err)
 }
 
 // TestProxyServerBasicHTTPS tests basic HTTPS request handling
@@ -211,4 +217,10 @@ func TestProxyServerBasicHTTPS(t *testing.T) {
 `
 		require.Equal(t, expectedResponse, string(body))
 	})
+
+	err = server.Stop()
+	require.NoError(t, err)
+	cancel()
+	err = <-serverDone
+	require.NoError(t, err)
 }