Try to fix issue with IP address look-up

Author: PascalMinder

.github/workflows/main.yml

@@ -13,9 +13,9 @@ jobs:
     name: Main Process
     runs-on: ubuntu-latest
     env:
-      GO_VERSION: 1.19
-      GOLANGCI_LINT_VERSION: v1.50.0
-      YAEGI_VERSION: v0.14.2
+      GO_VERSION: 1.22
+      GOLANGCI_LINT_VERSION: v1.58.1
+      YAEGI_VERSION: v0.16.1
       CGO_ENABLED: 0
     defaults:
       run:

.golangci.yml

@@ -1,21 +1,19 @@
 # inspired by: https://github.com/golangci/golangci-lint/blob/master/.golangci.yml
 
 run:
-  go: "1.18"
+  go: "1.19"
 
 linters-settings:
   # dupl:
   #   threshold: 100
   funlen:
     lines: 100
     statements: 50
-  golint:
-    min-confidence: 0
   lll:
     line-length: 125
   goconst:
     min-len: 2
-    min-occurences: 2
+    min-occurrences: 3
   misspell:
     locale: US
 
@@ -26,14 +24,12 @@ linters:
     # - bidichk
     # - bodyclose
     # - contextcheck
-    - deadcode
-    - depguard
+    # - depguard
     - dogsled
     # - dupl
     # - durationcheck
     - errcheck
     # - errname
-    - exportloopref
     - funlen
     - gochecknoinits
     - goconst
@@ -60,15 +56,13 @@ linters:
     # - predeclared
     # - revive
     - staticcheck
-    - structcheck
     - stylecheck
     # - tagliatelle
     # - thelper
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     # - wastedassign
     - whitespace
 

geoblock.go

@@ -189,6 +189,7 @@ func (a *GeoBlock) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 
 	// only keep the first IP address, which should be the client (if the proxy behaves itself), to check if allowed or denied
 	if a.xForwardedForReverseProxy {
+		infoLogger.Printf("X-Forwarded-For reverse proxy is enabled. Searching for: %s\n", requestIPAddresses[0])
 		requestIPAddresses = requestIPAddresses[:1]
 	}
 

geoblock_test.go

@@ -153,10 +153,33 @@ func TestMultipleAllowedCountry(t *testing.T) {
 	assertStatusCode(t, recorder.Result(), http.StatusOK)
 }
 
+func createMockAPIServer(t *testing.T, ipResponseMap map[string][]byte) *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+		t.Logf("Intercepted request: %s %s", req.Method, req.URL.String())
+		t.Logf("Headers: %v", req.Header)
+
+		requestedIP := req.URL.String()[1:]
+
+		if response, exists := ipResponseMap[requestedIP]; exists {
+			t.Logf("Matched IP: %s", requestedIP)
+			rw.WriteHeader(http.StatusOK)
+			_, _ = rw.Write(response)
+		} else {
+			t.Errorf("Unexpected IP: %s", requestedIP)
+			rw.WriteHeader(http.StatusNotFound)
+			_, _ = rw.Write([]byte(`{"error": "IP not found"}`))
+		}
+	}))
+}
+
 func TestMultipleIpAddresses(t *testing.T) {
+	mockServer := createMockAPIServer(t, map[string][]byte{caExampleIP: []byte(`CA`), chExampleIP: []byte(`CH`)})
+	defer mockServer.Close()
+
 	cfg := createTesterConfig()
 
 	cfg.Countries = append(cfg.Countries, "CH")
+	cfg.API = mockServer.URL + "/{ip}"
 
 	ctx := context.Background()
 	next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {})
@@ -181,9 +204,13 @@ func TestMultipleIpAddresses(t *testing.T) {
 }
 
 func TestMultipleIpAddressesReverse(t *testing.T) {
+	mockServer := createMockAPIServer(t, map[string][]byte{caExampleIP: []byte(`CA`), chExampleIP: []byte(`CH`)})
+	defer mockServer.Close()
+
 	cfg := createTesterConfig()
 
 	cfg.Countries = append(cfg.Countries, "CH")
+	cfg.API = mockServer.URL + "/{ip}"
 
 	ctx := context.Background()
 	next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {})
@@ -208,10 +235,14 @@ func TestMultipleIpAddressesReverse(t *testing.T) {
 }
 
 func TestMultipleIpAddressesProxy(t *testing.T) {
+	mockServer := createMockAPIServer(t, map[string][]byte{caExampleIP: []byte(`CA`)})
+	defer mockServer.Close()
+
 	cfg := createTesterConfig()
 
 	cfg.Countries = append(cfg.Countries, "CA")
 	cfg.XForwardedForReverseProxy = true
+	cfg.API = mockServer.URL + "/{ip}"
 
 	ctx := context.Background()
 	next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {})
@@ -228,18 +259,24 @@ func TestMultipleIpAddressesProxy(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	req.Header.Add(xForwardedFor, strings.Join([]string{caExampleIP, chExampleIP}, ","))
+	forwardedForContent := strings.Join([]string{caExampleIP, chExampleIP}, ",")
+	req.Header.Add(xForwardedFor, forwardedForContent)
+	t.Logf("X-Forwarded-For header: %s", forwardedForContent)
 
 	handler.ServeHTTP(recorder, req)
 
 	assertStatusCode(t, recorder.Result(), http.StatusOK)
 }
 
 func TestMultipleIpAddressesProxyReverse(t *testing.T) {
+	mockServer := createMockAPIServer(t, map[string][]byte{chExampleIP: []byte(`CH`)})
+	defer mockServer.Close()
+
 	cfg := createTesterConfig()
 
 	cfg.Countries = append(cfg.Countries, "CA")
 	cfg.XForwardedForReverseProxy = true
+	cfg.API = mockServer.URL + "/{ip}"
 
 	ctx := context.Background()
 	next := http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {})
@@ -256,7 +293,9 @@ func TestMultipleIpAddressesProxyReverse(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	req.Header.Add(xForwardedFor, strings.Join([]string{chExampleIP, caExampleIP}, ","))
+	forwardedForContent := strings.Join([]string{chExampleIP, caExampleIP}, ",")
+	req.Header.Add(xForwardedFor, forwardedForContent)
+	t.Logf("X-Forwarded-For header: %s", forwardedForContent)
 
 	handler.ServeHTTP(recorder, req)