All checks were successful
Check / check (push) Successful in 4s
Bumps golangci-lint from v2.10.1 to v2.12.2 everywhere it is pinned and installs the canonical `.golangci.yml`, then fixes every finding the new linter surfaces so `make check` is green. ## Version pins - `Dockerfile` lint stage: `golangci/golangci-lint:v2.12.2` (Debian-based), tag plus digest pin - `script/bootstrap`: `GOLANGCI_LINT_VERSION=2.12.2` with updated `linux-amd64`/`linux-arm64` release-archive sha256 pins ## Config `.golangci.yml` replaced with the canonical config. Material change: the old file declared `version: "2"` but kept settings under the legacy top-level `linters-settings` key, which golangci-lint v2 ignores — so the intended thresholds (`lll` 88, `funlen` 80/50, `cyclop` 15, `dupl` 100) were not being applied. The canonical file moves them under `linters.settings` and drops `issues.exclude-use-default`. ## Lint fixes (216 findings) - `lll` (96): wrapped lines to the 88-column limit - `noctx` (46): `httptest.NewRequestWithContext` with `t.Context()` throughout the tests - `goconst` (24): shared constants for template/JSON keys in `internal/handlers` and repeated test literals - `gosec` (23): app-page redirects now go through a `redirectToApp` helper that path-escapes the app ID (G710 open redirect); `http.ServeFile` of the internally derived deployment log path annotated like the adjacent `os.Stat` (G703) - `dupl` (22): extracted a generic `findAllByAppID` in `internal/models`, a `deleteAppResource` helper in `internal/handlers`, a shared `parsePush` in `internal/service/webhook`, and table-driven/helper-based dedup in tests - `nolintlint` (5): removed `//nolint:funlen` directives made obsolete by the new limits (plus one more that became obsolete after refactoring) - `nilerr` (3, surfaced during fixing): resource-delete lookups now propagate the find error to the caller No behavior changes intended; all tests pass and `make check` is green. Note: golangci-lint v2.12 warns that `gomodguard` is deprecated in favor of `gomodguard_v2` — a future canonical-config update should address this centrally. Co-authored-by: sneak <sneak@sneak.berlin> Reviewed-on: #187 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
170 lines
4.1 KiB
Go
170 lines
4.1 KiB
Go
package middleware //nolint:testpackage // tests unexported realIP function
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
"testing"
|
|
)
|
|
|
|
// Shared test addresses (also used by ratelimit_test.go).
|
|
const (
|
|
testProxyAddr = "10.0.0.1:1234"
|
|
testRealIP = "203.0.113.5"
|
|
testXFFIP = "198.51.100.1"
|
|
testPrivateIP = "192.168.1.1"
|
|
testPublicIP = "93.184.216.34"
|
|
testPublicDNSIP = "8.8.8.8"
|
|
)
|
|
|
|
func TestRealIP(t *testing.T) { //nolint:funlen // table-driven test
|
|
t.Parallel()
|
|
|
|
tests := []struct {
|
|
name string
|
|
remoteAddr string
|
|
xRealIP string
|
|
xff string
|
|
want string
|
|
}{
|
|
// === Trusted proxy (RFC1918 / loopback) — headers ARE honoured ===
|
|
{
|
|
name: "trusted: X-Real-IP from 10.x",
|
|
remoteAddr: testProxyAddr,
|
|
xRealIP: testRealIP,
|
|
xff: "198.51.100.1, 10.0.0.1",
|
|
want: testRealIP,
|
|
},
|
|
{
|
|
name: "trusted: XFF from 10.x when no X-Real-IP",
|
|
remoteAddr: testProxyAddr,
|
|
xff: "198.51.100.1, 10.0.0.1",
|
|
want: testXFFIP,
|
|
},
|
|
{
|
|
name: "trusted: XFF single IP from 10.x",
|
|
remoteAddr: testProxyAddr,
|
|
xff: "203.0.113.10",
|
|
want: "203.0.113.10",
|
|
},
|
|
{
|
|
name: "trusted: falls back to RemoteAddr (192.168.x)",
|
|
remoteAddr: "192.168.1.1:5678",
|
|
want: testPrivateIP,
|
|
},
|
|
{
|
|
name: "trusted: RemoteAddr without port",
|
|
remoteAddr: testPrivateIP,
|
|
want: testPrivateIP,
|
|
},
|
|
{
|
|
name: "trusted: X-Real-IP with whitespace from 10.x",
|
|
remoteAddr: testProxyAddr,
|
|
xRealIP: " 203.0.113.5 ",
|
|
want: testRealIP,
|
|
},
|
|
{
|
|
name: "trusted: XFF with whitespace from 10.x",
|
|
remoteAddr: testProxyAddr,
|
|
xff: " 198.51.100.1 , 10.0.0.1",
|
|
want: testXFFIP,
|
|
},
|
|
{
|
|
name: "trusted: empty X-Real-IP falls through to XFF from 10.x",
|
|
remoteAddr: testProxyAddr,
|
|
xRealIP: " ",
|
|
xff: testXFFIP,
|
|
want: testXFFIP,
|
|
},
|
|
{
|
|
name: "trusted: loopback honours X-Real-IP",
|
|
remoteAddr: "127.0.0.1:9999",
|
|
xRealIP: testPublicIP,
|
|
want: testPublicIP,
|
|
},
|
|
{
|
|
name: "trusted: 172.16.x honours XFF",
|
|
remoteAddr: "172.16.0.1:4321",
|
|
xff: testPublicDNSIP,
|
|
want: testPublicDNSIP,
|
|
},
|
|
|
|
// === Untrusted proxy (public IP) — headers IGNORED, use RemoteAddr ===
|
|
{
|
|
name: "untrusted: X-Real-IP ignored from public IP",
|
|
remoteAddr: "203.0.113.50:1234",
|
|
xRealIP: "10.0.0.1",
|
|
want: "203.0.113.50",
|
|
},
|
|
{
|
|
name: "untrusted: XFF ignored from public IP",
|
|
remoteAddr: "198.51.100.99:5678",
|
|
xff: "10.0.0.1, 192.168.1.1",
|
|
want: "198.51.100.99",
|
|
},
|
|
{
|
|
name: "untrusted: both headers ignored from public IP",
|
|
remoteAddr: "8.8.8.8:443",
|
|
xRealIP: "1.2.3.4",
|
|
xff: "5.6.7.8",
|
|
want: testPublicDNSIP,
|
|
},
|
|
{
|
|
name: "untrusted: no headers, public RemoteAddr",
|
|
remoteAddr: "93.184.216.34:8080",
|
|
want: testPublicIP,
|
|
},
|
|
{
|
|
name: "untrusted: public RemoteAddr without port",
|
|
remoteAddr: testPublicIP,
|
|
want: testPublicIP,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
req, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, "/", nil)
|
|
req.RemoteAddr = tt.remoteAddr
|
|
|
|
if tt.xRealIP != "" {
|
|
req.Header.Set("X-Real-IP", tt.xRealIP)
|
|
}
|
|
|
|
if tt.xff != "" {
|
|
req.Header.Set("X-Forwarded-For", tt.xff)
|
|
}
|
|
|
|
got := realIP(req)
|
|
if got != tt.want {
|
|
t.Errorf("realIP() = %q, want %q", got, tt.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIsTrustedProxy(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
trusted := []string{"10.0.0.1", "10.255.255.255", "172.16.0.1", "172.31.255.255",
|
|
"192.168.0.1", "192.168.255.255", "127.0.0.1", "127.255.255.255", "::1"}
|
|
untrusted := []string{
|
|
testPublicDNSIP, "203.0.113.1", "172.32.0.1", "11.0.0.1", "2001:db8::1",
|
|
}
|
|
|
|
for _, addr := range trusted {
|
|
ip := net.ParseIP(addr)
|
|
if !isTrustedProxy(ip) {
|
|
t.Errorf("expected %s to be trusted", addr)
|
|
}
|
|
}
|
|
|
|
for _, addr := range untrusted {
|
|
ip := net.ParseIP(addr)
|
|
if isTrustedProxy(ip) {
|
|
t.Errorf("expected %s to be untrusted", addr)
|
|
}
|
|
}
|
|
}
|