From a03d4dc360f49de1459199d80d35b0886cb7645c Mon Sep 17 00:00:00 2001
From: marco <marco@crowdsec.net>
Date: Tue, 9 Jul 2024 09:53:16 +0200
Subject: [PATCH 1/3] errors.Is()

---
 .golangci.yml                            | 4 ----
 pkg/acquisition/modules/appsec/appsec.go | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 271e3a57d34..acde901dbe6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -348,10 +348,6 @@ issues:
         - errorlint
       text: "type switch on error will fail on wrapped errors. Use errors.As to check for specific errors"
 
-    - linters:
-        - errorlint
-      text: "comparing with .* will fail on wrapped errors. Use errors.Is to check for a specific error"
-
     - linters:
         - nosprintfhostport
       text: "host:port in url should be constructed with net.JoinHostPort and not directly with fmt.Sprintf"
diff --git a/pkg/acquisition/modules/appsec/appsec.go b/pkg/acquisition/modules/appsec/appsec.go
index a6dcffe89a2..0c793fff54d 100644
--- a/pkg/acquisition/modules/appsec/appsec.go
+++ b/pkg/acquisition/modules/appsec/appsec.go
@@ -268,7 +268,7 @@ func (w *AppsecSource) StreamingAcquisition(ctx context.Context, out chan types.
 				} else {
 					err = w.server.Serve(listener)
 				}
-				if err != nil && err != http.ErrServerClosed {
+				if err != nil && !errors.Is(err, http.ErrServerClosed) {
 					return fmt.Errorf("appsec server failed: %w", err)
 				}
 			}

From c28f9066ac528a2b68411f19862a8219648db345 Mon Sep 17 00:00:00 2001
From: marco <marco@crowdsec.net>
Date: Tue, 9 Jul 2024 13:10:47 +0200
Subject: [PATCH 2/3] errors.is() - windows

---
 pkg/acquisition/modules/wineventlog/wineventlog_windows.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/acquisition/modules/wineventlog/wineventlog_windows.go b/pkg/acquisition/modules/wineventlog/wineventlog_windows.go
index 887be8b7dd3..1f5332f43b8 100644
--- a/pkg/acquisition/modules/wineventlog/wineventlog_windows.go
+++ b/pkg/acquisition/modules/wineventlog/wineventlog_windows.go
@@ -94,7 +94,7 @@ func (w *WinEventLogSource) getXMLEvents(config *winlog.SubscribeConfig, publish
 		2000,                // Timeout in milliseconds to wait.
 		0,                   // Reserved. Must be zero.
 		&returned)           // The number of handles in the array that are set by the API.
-	if err == windows.ERROR_NO_MORE_ITEMS {
+	if errors.Is(err, windows.ERROR_NO_MORE_ITEMS) {
 		return nil, err
 	} else if err != nil {
 		return nil, fmt.Errorf("wevtapi.EvtNext failed: %v", err)
@@ -188,7 +188,7 @@ func (w *WinEventLogSource) getEvents(out chan types.Event, t *tomb.Tomb) error
 			}
 			if status == syscall.WAIT_OBJECT_0 {
 				renderedEvents, err := w.getXMLEvents(w.evtConfig, publisherCache, subscription, 500)
-				if err == windows.ERROR_NO_MORE_ITEMS {
+				if errors.Is(err, windows.ERROR_NO_MORE_ITEMS) {
 					windows.ResetEvent(w.evtConfig.SignalEvent)
 				} else if err != nil {
 					w.logger.Errorf("getXMLEvents failed: %v", err)
@@ -411,7 +411,7 @@ OUTER_LOOP:
 			return nil
 		default:
 			evts, err := w.getXMLEvents(w.evtConfig, publisherCache, handle, 500)
-			if err == windows.ERROR_NO_MORE_ITEMS {
+			if errors.Is(err, windows.ERROR_NO_MORE_ITEMS) {
 				log.Info("No more items")
 				break OUTER_LOOP
 			} else if err != nil {

From c261309be0b2dd7c17aa7258bba24991e07169db Mon Sep 17 00:00:00 2001
From: marco <marco@crowdsec.net>
Date: Tue, 9 Jul 2024 13:22:40 +0200
Subject: [PATCH 3/3] extract function isBrokenConnection()

---
 pkg/apiserver/apiserver.go | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 35f9beaf635..05f9150b037 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -46,20 +46,11 @@ type APIServer struct {
 	consoleConfig  *csconfig.ConsoleConfig
 }
 
-func recoverFromPanic(c *gin.Context) {
-	err := recover()
-	if err == nil {
-		return
-	}
-
-	// Check for a broken connection, as it is not really a
-	// condition that warrants a panic stack trace.
-	brokenPipe := false
-
+func isBrokenConnection(err any) bool {
 	if ne, ok := err.(*net.OpError); ok {
 		if se, ok := ne.Err.(*os.SyscallError); ok {
 			if strings.Contains(strings.ToLower(se.Error()), "broken pipe") || strings.Contains(strings.ToLower(se.Error()), "connection reset by peer") {
-				brokenPipe = true
+				return true
 			}
 		}
 	}
@@ -79,11 +70,22 @@ func recoverFromPanic(c *gin.Context) {
 			errors.Is(strErr, errClosedBody) ||
 			errors.Is(strErr, errHandlerComplete) ||
 			errors.Is(strErr, errStreamClosed) {
-			brokenPipe = true
+			return true
 		}
 	}
 
-	if brokenPipe {
+	return false
+}
+
+func recoverFromPanic(c *gin.Context) {
+	err := recover()
+	if err == nil {
+		return
+	}
+
+	// Check for a broken connection, as it is not really a
+	// condition that warrants a panic stack trace.
+	if isBrokenConnection(err) {
 		log.Warningf("client %s disconnected: %s", c.ClientIP(), err)
 		c.Abort()
 	} else {