feat(lib): expose WEIGH matches as prometheus metrics

Signed-off-by: Xe Iaso <me@xeiaso.net>

.github/workflows/asset-verification.yml

@@ -22,11 +22,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential
 
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: latest
 
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: stable
 

.github/workflows/docker-pr.yml

@@ -26,11 +26,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential
 
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: latest
 
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: stable
 
@@ -38,7 +38,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
         with:
           images: ghcr.io/${{ github.repository }}
 

.github/workflows/docker.yml

@@ -36,11 +36,11 @@ jobs:
         run: |
           echo "IMAGE=ghcr.io/${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
 
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: latest
 
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: stable
 
@@ -55,7 +55,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
         with:
           images: ${{ env.IMAGE }}
 

.github/workflows/docs-deploy.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
         with:
           images: ghcr.io/techarohq/anubis/docs
           tags: |

.github/workflows/docs-test.yml

@@ -22,7 +22,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
         with:
           images: ghcr.io/techarohq/anubis/docs
           tags: |

.github/workflows/go.yml

@@ -24,11 +24,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential
 
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: latest
 
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: stable
 

.github/workflows/package-builds-stable.yml

@@ -25,11 +25,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential
 
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: latest
 
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: stable
 

.github/workflows/package-builds-unstable.yml

@@ -26,11 +26,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential
 
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: latest
 
-      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: stable
 

data/clients/docker-client.yaml

@@ -51,3 +51,10 @@
     all:
       - path.startsWith("/v2/")
       - userAgent.contains("containerd/")
+
+- name: allow-renovate
+  action: ALLOW
+  expression:
+    all:
+      - path.startsWith("/v2/")
+      - userAgent.contains("Renovate/")

docs/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/node AS build
+FROM docker.io/library/node:lts AS build
 
 WORKDIR /app
 COPY . .

docs/docs/CHANGELOG.md

@@ -13,9 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- This changes the project to: -->
 
+- Expose WEIGHT rule matches as Prometheus metrics.
 - Allow more OCI registry clients [based on feedback](https://github.com/TecharoHQ/anubis/pull/1253#issuecomment-3506744184).
 - Expose services directory in the embedded `(data)` filesystem.
-- Add Ukrainian locale ([#1044](https://github.com/TecharoHQ/anubis/pull/1044))
+- Add Ukrainian locale ([#1044](https://github.com/TecharoHQ/anubis/pull/1044)).
+- Allow Renovate as an OCI registry client.
+- Properly handle 4in6 addresses so that IP matching works with those addresses.
 
 ## v1.23.1: Lyse Hext - Echo 1
 

lib/anubis.go

@@ -576,6 +576,7 @@ func (s *Server) check(r *http.Request, lg *slog.Logger) (policy.CheckResult, *p
 				return cr("bot/"+b.Name, b.Action, weight), &b, nil
 			case config.RuleWeigh:
 				lg.Debug("adjusting weight", "name", b.Name, "delta", b.Weight.Adjust)
+				policy.Applications.WithLabelValues("bot/"+b.Name, "WEIGH").Add(1)
 				weight += b.Weight.Adjust
 			}
 		}

lib/http_test.go

@@ -173,148 +173,6 @@ func TestRenderIndexRedirect(t *testing.T) {
 	}
 }
 
-func TestClearCookieHostParameterHonorsDynamicDomain(t *testing.T) {
-	// Test that Host parameter is only used when CookieDynamicDomain is enabled
-	testCases := []struct {
-		name                   string
-		options                Options
-		host                   string
-		expectedDomain         string
-		shouldHaveDomainField  bool
-	}{
-		{
-			name:                   "dynamic domain disabled",
-			options:                Options{CookieDynamicDomain: false},
-			host:                   "subdomain.example.com",
-			expectedDomain:         "",
-			shouldHaveDomainField:  false,
-		},
-		{
-			name:                   "dynamic domain enabled with valid host",
-			options:                Options{CookieDynamicDomain: true},
-			host:                   "subdomain.example.com",
-			expectedDomain:         "example.com",
-			shouldHaveDomainField:  true,
-		},
-		{
-			name:                   "dynamic domain enabled with invalid host",
-			options:                Options{CookieDynamicDomain: true},
-			host:                   "invalid-host",
-			expectedDomain:         "",
-			shouldHaveDomainField:  false,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			srv := spawnAnubis(t, tc.options)
-			rw := httptest.NewRecorder()
-
-			// Test ClearCookie with Host parameter
-			srv.ClearCookie(rw, CookieOpts{Path: "/", Host: tc.host})
-
-			resp := rw.Result()
-			cookies := resp.Cookies()
-
-			if len(cookies) != 1 {
-				t.Errorf("wanted 1 cookie, got %d cookies", len(cookies))
-			}
-
-			ckie := cookies[0]
-
-			if ckie.Name != anubis.CookieName {
-				t.Errorf("wanted cookie named %q, got cookie named %q", anubis.CookieName, ckie.Name)
-			}
-
-			if ckie.MaxAge != -1 {
-				t.Errorf("wanted cookie max age of -1, got: %d", ckie.MaxAge)
-			}
-
-			// Verify domain handling based on CookieDynamicDomain setting
-			if tc.shouldHaveDomainField {
-				if ckie.Domain != tc.expectedDomain {
-					t.Errorf("wanted cookie domain %q, got cookie domain %q", tc.expectedDomain, ckie.Domain)
-				}
-			} else {
-				if ckie.Domain != tc.expectedDomain {
-					t.Errorf("wanted cookie domain %q, got cookie domain %q", tc.expectedDomain, ckie.Domain)
-				}
-			}
-		})
-	}
-}
-
-func TestSetCookieHostParameterHonorsDynamicDomain(t *testing.T) {
-	// Test that SetCookie Host parameter is only used when CookieDynamicDomain is enabled
-	testCases := []struct {
-		name                   string
-		options                Options
-		host                   string
-		expectedDomain         string
-		shouldHaveDomainField  bool
-	}{
-		{
-			name:                   "dynamic domain disabled",
-			options:                Options{CookieDynamicDomain: false},
-			host:                   "subdomain.example.com",
-			expectedDomain:         "",
-			shouldHaveDomainField:  false,
-		},
-		{
-			name:                   "dynamic domain enabled with valid host",
-			options:                Options{CookieDynamicDomain: true},
-			host:                   "subdomain.example.com",
-			expectedDomain:         "example.com",
-			shouldHaveDomainField:  true,
-		},
-		{
-			name:                   "dynamic domain enabled with invalid host",
-			options:                Options{CookieDynamicDomain: true},
-			host:                   "invalid-host",
-			expectedDomain:         "",
-			shouldHaveDomainField:  false,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			srv := spawnAnubis(t, tc.options)
-			rw := httptest.NewRecorder()
-
-			// Test SetCookie with Host parameter
-			srv.SetCookie(rw, CookieOpts{Path: "/", Host: tc.host, Value: "test-value"})
-
-			resp := rw.Result()
-			cookies := resp.Cookies()
-
-			if len(cookies) != 1 {
-				t.Errorf("wanted 1 cookie, got %d cookies", len(cookies))
-			}
-
-			ckie := cookies[0]
-
-			if ckie.Name != anubis.CookieName {
-				t.Errorf("wanted cookie named %q, got cookie named %q", anubis.CookieName, ckie.Name)
-			}
-
-			if ckie.Value != "test-value" {
-				t.Errorf("wanted cookie value %q, got cookie value %q", "test-value", ckie.Value)
-			}
-
-			// Verify domain handling based on CookieDynamicDomain setting
-			if tc.shouldHaveDomainField {
-				if ckie.Domain != tc.expectedDomain {
-					t.Errorf("wanted cookie domain %q, got cookie domain %q", tc.expectedDomain, ckie.Domain)
-				}
-			} else {
-				if ckie.Domain != tc.expectedDomain {
-					t.Errorf("wanted cookie domain %q, got cookie domain %q", tc.expectedDomain, ckie.Domain)
-				}
-			}
-		})
-	}
-}
-
 func TestRenderIndexUnauthorized(t *testing.T) {
 	s := &Server{
 		opts: Options{

lib/policy/checker.go

@@ -51,6 +51,11 @@ func (rac *RemoteAddrChecker) Check(r *http.Request) (bool, error) {
 		return false, fmt.Errorf("%w: %s is not an IP address: %w", ErrMisconfiguration, host, err)
 	}
 
+	// Convert IPv4-mapped IPv6 addresses to IPv4
+	if addr.Is6() && addr.Is4In6() {
+		addr = addr.Unmap()
+	}
+
 	return rac.prefixTable.Contains(addr), nil
 }
 

lib/policy/checker_test.go

@@ -21,6 +21,20 @@ func TestRemoteAddrChecker(t *testing.T) {
 			ok:    true,
 			err:   nil,
 		},
+		{
+			name:  "match_ipv4_in_ipv6",
+			cidrs: []string{"0.0.0.0/0"},
+			ip:    "::ffff:1.1.1.1",
+			ok:    true,
+			err:   nil,
+		},
+		{
+			name:  "match_ipv4_in_ipv6_hex",
+			cidrs: []string{"0.0.0.0/0"},
+			ip:    "::ffff:101:101",
+			ok:    true,
+			err:   nil,
+		},
 		{
 			name:  "match_ipv6",
 			cidrs: []string{"::/0"},