From 535438342e37c627c5a32653f97332f4c9cd93b4 Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Mon, 13 Nov 2023 11:34:05 -0800
Subject: [PATCH] server: resolve linter errors (#433)

Signed-off-by: James Hillyerd <james@hillyerd.com>
---
 pkg/server/pop3/handler_test.go |  8 ++++----
 pkg/server/pop3/listener.go     | 10 ++++------
 pkg/server/smtp/handler.go      |  1 -
 pkg/server/smtp/listener.go     |  6 +++---
 pkg/server/web/server.go        | 10 ++++------
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/pkg/server/pop3/handler_test.go b/pkg/server/pop3/handler_test.go
index ca4b663..480dbb3 100644
--- a/pkg/server/pop3/handler_test.go
+++ b/pkg/server/pop3/handler_test.go
@@ -45,7 +45,7 @@ func TestNoTLS(t *testing.T) {
 		t.Fatalf("Failed to send CAPA; %v.", err)
 	}
 	replies := []string{}
-	for true {
+	for {
 		reply, err := c.ReadLine()
 		if err != nil {
 			t.Fatalf("Reading CAPA line failed %v", err)
@@ -85,7 +85,7 @@ func TestStartTLS(t *testing.T) {
 		t.Fatalf("Failed to send CAPA; %v.", err)
 	}
 	replies := []string{}
-	for true {
+	for {
 		reply, err := c.ReadLine()
 		if err != nil {
 			t.Fatalf("Reading CAPA line failed %v", err)
@@ -138,7 +138,7 @@ func TestStartTLS(t *testing.T) {
 	if !strings.HasPrefix(reply, "+OK") {
 		t.Fatalf("CAPA failed: %s", reply)
 	}
-	for true {
+	for {
 		reply, err := c.ReadLine()
 		if err != nil {
 			t.Fatalf("Reading CAPA line failed %v", err)
@@ -188,7 +188,7 @@ func TestForceTLS(t *testing.T) {
 	if !strings.HasPrefix(reply, "+OK") {
 		t.Fatalf("CAPA failed: %s", reply)
 	}
-	for true {
+	for {
 		reply, err := c.ReadLine()
 		if err != nil {
 			t.Fatalf("Reading CAPA line failed %v", err)
diff --git a/pkg/server/pop3/listener.go b/pkg/server/pop3/listener.go
index 5333a6c..f0541ee 100644
--- a/pkg/server/pop3/listener.go
+++ b/pkg/server/pop3/listener.go
@@ -74,9 +74,7 @@ func (s *Server) Start(ctx context.Context, readyFunc func()) {
 	readyFunc()
 
 	// Wait for shutdown.
-	select {
-	case _ = <-ctx.Done():
-	}
+	<-ctx.Done()
 	slog = log.With().Str("module", "pop3").Str("phase", "shutdown").Logger()
 	slog.Debug().Msg("POP3 shutdown requested, connections will be drained")
 
@@ -92,8 +90,8 @@ func (s *Server) serve(ctx context.Context) {
 	var tempDelay time.Duration
 	for sid := 1; ; sid++ {
 		if conn, err := s.listener.Accept(); err != nil {
-			if nerr, ok := err.(net.Error); ok && nerr.Temporary() {
-				// Temporary error, sleep for a bit and try again.
+			if nerr, ok := err.(net.Error); ok && nerr.Timeout() {
+				// Timeout, sleep for a bit and try again.
 				if tempDelay == 0 {
 					tempDelay = 5 * time.Millisecond
 				} else {
@@ -103,7 +101,7 @@ func (s *Server) serve(ctx context.Context) {
 					tempDelay = max
 				}
 				log.Error().Str("module", "pop3").Err(err).
-					Msgf("POP3 accept error; retrying in %v", tempDelay)
+					Msgf("POP3 accept timout; retrying in %v", tempDelay)
 				time.Sleep(tempDelay)
 				continue
 			} else {
diff --git a/pkg/server/smtp/handler.go b/pkg/server/smtp/handler.go
index 8d57768..8a0e467 100644
--- a/pkg/server/smtp/handler.go
+++ b/pkg/server/smtp/handler.go
@@ -547,7 +547,6 @@ func (s *Session) dataHandler() {
 	s.send("250 Mail accepted for delivery")
 	s.logger.Info().Msgf("Message size %v bytes", mailData.Len())
 	s.reset()
-	return
 }
 
 func (s *Session) enterState(state State) {
diff --git a/pkg/server/smtp/listener.go b/pkg/server/smtp/listener.go
index 03e6416..b67648a 100644
--- a/pkg/server/smtp/listener.go
+++ b/pkg/server/smtp/listener.go
@@ -147,8 +147,8 @@ func (s *Server) serve(ctx context.Context) {
 	for sessionID := 1; ; sessionID++ {
 		if conn, err := s.listener.Accept(); err != nil {
 			// There was an error accepting the connection.
-			if nerr, ok := err.(net.Error); ok && nerr.Temporary() {
-				// Temporary error, sleep for a bit and try again.
+			if nerr, ok := err.(net.Error); ok && nerr.Timeout() {
+				// Timeout, sleep for a bit and try again.
 				if tempDelay == 0 {
 					tempDelay = 5 * time.Millisecond
 				} else {
@@ -158,7 +158,7 @@ func (s *Server) serve(ctx context.Context) {
 					tempDelay = max
 				}
 				log.Error().Str("module", "smtp").Err(err).
-					Msgf("SMTP accept error; retrying in %v", tempDelay)
+					Msgf("SMTP accept timeout; retrying in %v", tempDelay)
 				time.Sleep(tempDelay)
 				continue
 			} else {
diff --git a/pkg/server/web/server.go b/pkg/server/web/server.go
index 436b257..1e4a266 100644
--- a/pkg/server/web/server.go
+++ b/pkg/server/web/server.go
@@ -159,11 +159,9 @@ func (s *Server) Start(ctx context.Context, readyFunc func()) {
 	readyFunc()
 
 	// Wait for shutdown
-	select {
-	case _ = <-ctx.Done():
-		log.Debug().Str("module", "web").Str("phase", "shutdown").
-			Msg("HTTP server shutting down on request")
-	}
+	<-ctx.Done()
+	log.Debug().Str("module", "web").Str("phase", "shutdown").
+		Msg("HTTP server shutting down on request")
 
 	// Closing the listener will cause the serve() go routine to exit
 	if err := listener.Close(); err != nil {
@@ -195,7 +193,7 @@ func (s *Server) serve(ctx context.Context) {
 	err := server.Serve(listener)
 
 	select {
-	case _ = <-ctx.Done():
+	case <-ctx.Done():
 		// Nop
 	default:
 		log.Error().Str("module", "web").Str("phase", "startup").Err(err).