Unwrap io errors in server connection receive error handling

austinvazquez · dmcgowan · commit d5f7eeddb5e0 · 2023-05-08T16:46:27.000-07:00
Unwrap io.EOF and io.ErrUnexpectedEOF in the case of read message error which would lead to leaked server connections. Signed-off-by: Austin Vazquez <macedonv@amazon.com> (cherry picked from commit 9599fad) Signed-off-by: Derek McGowan <derek@mcg.dev>
diff --git a/server.go b/server.go
@@ -468,7 +468,7 @@ func (c *serverConn) run(sctx context.Context) {
 			// branch. Basically, it means that we are no longer receiving
 			// requests due to a terminal error.
 			recvErr = nil // connection is now "closing"
-			if err == io.EOF || err == io.ErrUnexpectedEOF || errors.Is(err, syscall.ECONNRESET) {
+			if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) || errors.Is(err, syscall.ECONNRESET) {
 				// The client went away and we should stop processing
 				// requests, so that the client connection is closed
 				return
