net/http: close accepted connection

Fixes #48642

Change-Id: I7bf00517bea43dcf38e15b778818a3a3f6ffe23e
GitHub-Last-Rev: a0e8b80f18dc8ae60944e01e5985c30d610efdf5
GitHub-Pull-Request: golang/go#48753
Reviewed-on: https://go-review.googlesource.com/c/go/+/353714
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index 404cca0825a85ab1cc1894003fd52dec4b52fa43..a686fd0de01aedcfe2c9d68d6ec0f116b04057f4 100644 (file)
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -6725,3 +6725,28 @@ func testMaxBytesHandler(t *testing.T, maxSize, requestSize int64) {
                t.Errorf("expected echo of size %d; got %d", handlerN, buf.Len())
        }
 }
+
+// Issue 48642: close accepted connection
+func TestServerCloseAccepted(t *testing.T) {
+       closed := 0
+       conn := &rwTestConn{
+               closeFunc: func() error {
+                       closed++
+                       return nil
+               },
+       }
+       ln := &oneConnListener{conn: conn}
+       var srv Server
+       // Use ConnContext to close server after connection is accepted but before it is tracked
+       srv.ConnContext = func(ctx context.Context, c net.Conn) context.Context {
+               srv.Close()
+               return ctx
+       }
+       got := srv.Serve(ln)
+       if got != ErrServerClosed {
+               t.Errorf("Serve err = %v; want ErrServerClosed", got)
+       }
+       if closed != 1 {
+               t.Errorf("Connection expected to be closed")
+       }
+}

diff --git a/src/net/http/server.go b/src/net/http/server.go
index d44b0fb256577be0ec49ddc757803225c95a8b1e..34d6ec828b3176921db448f1b711efcad13e1576 100644 (file)
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -1754,10 +1754,10 @@ const (
 func (c *conn) setState(nc net.Conn, state ConnState, runHook bool) {
        srv := c.server
        switch state {
-       case StateNew:
-               srv.trackConn(c, true)
        case StateHijacked, StateClosed:
-               srv.trackConn(c, false)
+               srv.mu.Lock()
+               delete(srv.activeConn, c)
+               srv.mu.Unlock()
        }
        if state > 0xff || state < 0 {
                panic("internal error")
@@ -3068,6 +3068,10 @@ func (srv *Server) Serve(l net.Listener) error {
                }
                tempDelay = 0
                c := srv.newConn(rw)
+               if !srv.trackConn(c) {
+                       rw.Close()
+                       return ErrServerClosed
+               }
                c.setState(c.rwc, StateNew, runHooks) // before Serve can return
                go c.serve(connCtx)
        }
@@ -3139,17 +3143,19 @@ func (s *Server) trackListener(ln *net.Listener, add bool) bool {
        return true
 }
 
-func (s *Server) trackConn(c *conn, add bool) {
+// trackConn adds a connection to the set of tracked connections.
+// It reports whether the server is still up (not Shutdown or Closed).
+func (s *Server) trackConn(c *conn) bool {
        s.mu.Lock()
        defer s.mu.Unlock()
+       if s.shuttingDown() {
+               return false
+       }
        if s.activeConn == nil {
                s.activeConn = make(map[*conn]struct{})
        }
-       if add {
-               s.activeConn[c] = struct{}{}
-       } else {
-               delete(s.activeConn, c)
-       }
+       s.activeConn[c] = struct{}{}
+       return true
 }
 
 func (s *Server) idleTimeout() time.Duration {