refactor: start/stop methods

Author: evgeniy-scherbina

proxy/proxy.go

@@ -2,8 +2,8 @@ package proxy
 
 import (
 	"bufio"
-	"context"
 	"crypto/tls"
+	"errors"
 	"fmt"
 	"io"
 	"log/slog"
@@ -12,6 +12,7 @@ import (
 	"net/url"
 	"strings"
 	"sync"
+	"sync/atomic"
 
 	"github.com/coder/boundary/audit"
 	"github.com/coder/boundary/rules"
@@ -24,6 +25,7 @@ type Server struct {
 	logger     *slog.Logger
 	tlsConfig  *tls.Config
 	httpPort   int
+	started    atomic.Bool
 
 	listener net.Listener
 }
@@ -49,7 +51,12 @@ func NewProxyServer(config Config) *Server {
 }
 
 // Start starts the HTTP proxy server with TLS termination capability
-func (p *Server) Start(ctx context.Context) error {
+func (p *Server) Start() error {
+	if p.isStarted() {
+		return nil
+	}
+	p.started.Store(true)
+
 	// Start HTTP server with custom listener for TLS detection
 	go func() {
 		p.logger.Info("Starting HTTP proxy with TLS termination", "port", p.httpPort)
@@ -62,46 +69,49 @@ func (p *Server) Start(ctx context.Context) error {
 
 		for {
 			conn, err := p.listener.Accept()
+			if err != nil && errors.Is(err, net.ErrClosed) && p.isStopped() {
+				return
+			}
 			if err != nil {
-				select {
-				case <-ctx.Done():
-					err = p.listener.Close()
-					if err != nil {
-						p.logger.Error("Failed to close listener", "error", err)
-					}
-					return
-				default:
-					p.logger.Error("Failed to accept connection", "error", err)
-					continue
-				}
+				p.logger.Error("Failed to accept connection", "error", err)
+				continue
 			}
 
 			// Handle connection with TLS detection
 			go p.handleConnectionWithTLSDetection(conn)
 		}
 	}()
 
-	// Wait for context cancellation
-	<-ctx.Done()
-	return p.Stop()
+	return nil
 }
 
 // Stops proxy server
 func (p *Server) Stop() error {
-	if p.listener == nil {
+	if p.isStopped() {
 		return nil
 	}
+	p.started.Store(false)
+
+	if p.listener == nil {
+		return errors.New("listener is nil; server was not started")
+	}
 
 	err := p.listener.Close()
 	if err != nil {
 		p.logger.Error("Failed to close listener", "error", err)
 	}
 
-	fmt.Printf("STOP is finished\n")
-
 	return nil
 }
 
+func (p *Server) isStarted() bool {
+	return p.started.Load()
+}
+
+func (p *Server) isStopped() bool {
+	return !p.started.Load()
+}
+
 // handleHTTP handles regular HTTP requests and CONNECT tunneling
 func (p *Server) handleHTTP(w http.ResponseWriter, r *http.Request) {
 	p.logger.Debug("handleHTTP called", "method", r.Method, "url", r.URL.String(), "host", r.Host)

proxy/proxy_test.go

@@ -1,7 +1,6 @@
 package proxy
 
 import (
-	"context"
 	"crypto/tls"
 	"io"
 	"log"
@@ -31,7 +30,7 @@ func (m *mockAuditor) AuditRequest(req audit.Request) {
 func TestProxyServerBasicHTTP(t *testing.T) {
 	// Create test logger
 	logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
-		Level: slog.LevelDebug,
+		Level: slog.LevelError,
 	}))
 
 	// Create test rules (allow all for testing)
@@ -60,14 +59,10 @@ func TestProxyServerBasicHTTP(t *testing.T) {
 		TLSConfig:  tlsConfig,
 	})
 
-	// Create context with timeout
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
 	// Start server in goroutine
 	serverDone := make(chan error, 1)
 	go func() {
-		serverDone <- server.Start(ctx)
+		serverDone <- server.Start()
 	}()
 
 	// Give server time to start
@@ -112,7 +107,6 @@ func TestProxyServerBasicHTTP(t *testing.T) {
 
 	err = server.Stop()
 	require.NoError(t, err)
-	cancel()
 	err = <-serverDone
 	require.NoError(t, err)
 }
@@ -121,7 +115,7 @@ func TestProxyServerBasicHTTP(t *testing.T) {
 func TestProxyServerBasicHTTPS(t *testing.T) {
 	// Create test logger
 	logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
-		Level: slog.LevelDebug,
+		Level: slog.LevelError,
 	}))
 
 	// Create test rules (allow all for testing)
@@ -167,14 +161,10 @@ func TestProxyServerBasicHTTPS(t *testing.T) {
 		TLSConfig:  tlsConfig,
 	})
 
-	// Create context with timeout
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
 	// Start server in goroutine
 	serverDone := make(chan error, 1)
 	go func() {
-		serverDone <- server.Start(ctx)
+		serverDone <- server.Start()
 	}()
 
 	// Give server time to start
@@ -215,7 +205,6 @@ func TestProxyServerBasicHTTPS(t *testing.T) {
 
 	err = server.Stop()
 	require.NoError(t, err)
-	cancel()
 	err = <-serverDone
 	require.NoError(t, err)
 }