fix: misc linter fixes

Signed-off-by: Liam Stanley <liam@liam.sh>

Author: lrstanley

bind.go

@@ -6,6 +6,7 @@ package chix
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"strings"
@@ -97,7 +98,8 @@ handle:
 	if DefaultValidator != nil {
 		err = DefaultValidator.Struct(v)
 		if err != nil {
-			if _, ok := err.(*validator.InvalidValidationError); ok {
+			invalidValidationError := &validator.InvalidValidationError{}
+			if errors.As(err, &invalidValidationError) {
 				panic(fmt.Errorf("invalid validation error: %w", err))
 			}
 

logger.go

@@ -50,11 +50,11 @@ func UseStructuredLogger(logger log.Interface) func(next http.Handler) http.Hand
 				bfields["rid"] = id
 			}
 
-			if ray := r.Header.Get("CF-Ray"); ray != "" {
+			if ray := r.Header.Get("Cf-Ray"); ray != "" {
 				bfields["ray_id"] = ray
 			}
 
-			if country := r.Header.Get("CF-IPCountry"); country != "" {
+			if country := r.Header.Get("Cf-Ipcountry"); country != "" {
 				bfields["country"] = country
 			}
 

realip.go

@@ -167,7 +167,7 @@ func UseRealIP(trusted []string, flags RealIPOptions) func(next http.Handler) ht
 
 			// Parse enabled headers by most specific (and common) to least.
 			if flags&OptUseCFConnectingIP != 0 {
-				if value := parseIP(r.Header.Get("CF-Connecting-IP")); value != nil {
+				if value := parseIP(r.Header.Get("Cf-Connecting-Ip")); value != nil {
 					r.RemoteAddr = value.String()
 					goto nexthandler
 				}

recoverer.go

@@ -5,6 +5,7 @@
 package chix
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"runtime/debug"
@@ -29,7 +30,7 @@ func UseRecoverer(next http.Handler) http.Handler {
 	fn := func(w http.ResponseWriter, r *http.Request) {
 		defer func() {
 			if rvr := recover(); rvr != nil {
-				if rvr == http.ErrAbortHandler {
+				if e, ok := rvr.(error); ok && errors.Is(e, http.ErrAbortHandler) {
 					panic(rvr)
 				}
 

recoverer_test.go

@@ -5,6 +5,7 @@
 package chix
 
 import (
+	"errors"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -27,8 +28,13 @@ func TestUseRecoverer(t *testing.T) {
 
 func TestUseRecovererAbort(t *testing.T) {
 	defer func() {
-		if rvr := recover(); rvr != http.ErrAbortHandler {
+		if rvr := recover(); rvr != nil {
+			if e, ok := rvr.(error); ok && errors.Is(e, http.ErrAbortHandler) {
+				return
+			}
 			t.Fatalf("expected panic of type http.ErrAbortHandler, got %v", rvr)
+		} else {
+			t.Fatalf("expected panic of type http.ErrAbortHandler, got nil")
 		}
 	}()