Refuse local-use NAT64 addresses, and IPv4-compatible ones in blocked_networks (closes #299)
check / check (push) Canceled after 0s
check / check (push) Canceled after 0s
The check that keeps pixa from fetching internal addresses let through 64:ff9b:1::/48, the local-use NAT64 range, and matched an address in the IPv4-compatible form (::/96) against blocked_networks only as IPv6, so ::203.0.113.5 passed with 203.0.113.0/24 listed. The local-use NAT64 range is now blocked next to 64:ff9b::/96, and an address in ::/96 is refused when blocked_networks holds it as written or the IPv4 address it holds. The mapped form stays matched as IPv4 only, as Go keeps plain IPv4 addresses in that form; README.md says so. Model: opus-5-5
This commit was merged in pull request #300.
This commit is contained in:
@@ -3,6 +3,7 @@ package server
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/netip"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"slices"
|
||||
@@ -586,3 +587,79 @@ func TestImageRoutesRefuseIPv6SourceHostHoldingInternalIPv4Address(t *testing.T)
|
||||
t.Errorf("upstream received %q, want no request", got)
|
||||
}
|
||||
}
|
||||
|
||||
// TestImageRoutesCheckIPv4AddressInIPv6SourceHost requests ipv6SourcePath on
|
||||
// source hosts that hold an IPv4 address, through a /v1/image/ URL with a
|
||||
// signature and through an encrypted URL, with the fetcher pixad uses.
|
||||
// [64:ff9b:1::a00:1], in the local-use NAT64 range (64:ff9b:1::/48, RFC 8215),
|
||||
// answers 403. [::203.0.113.5] holds the public address 203.0.113.5 in the
|
||||
// IPv4-compatible form (::/96) and answers 403 when blocked_networks lists
|
||||
// 203.0.113.0/24 or ::/96. [::ffff:203.0.113.5] holds it in the IPv4-mapped
|
||||
// form (::ffff:0:0/96) and answers 403 when blocked_networks lists
|
||||
// 203.0.113.0/24. Go keeps the plain address 203.0.113.5 in the mapped form
|
||||
// too, and an IPv6 range must not refuse it: with ::/0 listed it is not
|
||||
// refused. Neither is [::203.0.113.5] with blocked_networks empty. Where a
|
||||
// host is not refused, the fetcher tries to connect to it, finds nothing
|
||||
// there, and the request fails with another status.
|
||||
func TestImageRoutesCheckIPv4AddressInIPv6SourceHost(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
const (
|
||||
ipv4CompatibleHost = "[::203.0.113.5]"
|
||||
ipv4MappedHost = "[::ffff:203.0.113.5]"
|
||||
)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
sourceHost string
|
||||
blockedNetworks []netip.Prefix
|
||||
wantForbidden bool
|
||||
}{
|
||||
{"local-use NAT64 form of 10.0.0.1", "[64:ff9b:1::a00:1]", nil, true},
|
||||
{"IPv4-compatible form of an address in blocked_networks",
|
||||
ipv4CompatibleHost,
|
||||
[]netip.Prefix{netip.MustParsePrefix("203.0.113.0/24")}, true},
|
||||
{"IPv4-compatible form with ::/96 in blocked_networks",
|
||||
ipv4CompatibleHost,
|
||||
[]netip.Prefix{netip.MustParsePrefix("::/96")}, true},
|
||||
{"IPv4-mapped form of an address in blocked_networks",
|
||||
ipv4MappedHost,
|
||||
[]netip.Prefix{netip.MustParsePrefix("203.0.113.0/24")}, true},
|
||||
{"plain IPv4 address with ::/0 in blocked_networks",
|
||||
"203.0.113.5",
|
||||
[]netip.Prefix{netip.MustParsePrefix("::/0")}, false},
|
||||
{"IPv4-compatible form of an address with blocked_networks empty",
|
||||
ipv4CompatibleHost, nil, false},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
imageURLs := map[string]string{
|
||||
"image URL with a signature": signedImageURL(t, tt.sourceHost),
|
||||
"encrypted URL": encryptedImageURL(t, tt.sourceHost),
|
||||
}
|
||||
|
||||
for route, imageURL := range imageURLs {
|
||||
t.Run(tt.name+" "+route, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
s := startImageProxyWithBlockedNetworks(t, tt.blockedNetworks)
|
||||
|
||||
rec := httptest.NewRecorder()
|
||||
s.ServeHTTP(rec, httptest.NewRequestWithContext(
|
||||
t.Context(), http.MethodGet, imageURL, nil))
|
||||
t.Logf("GET %s: %d", imageURL, rec.Code)
|
||||
|
||||
forbidden := rec.Code == http.StatusForbidden
|
||||
if tt.wantForbidden && !forbidden {
|
||||
t.Errorf("status = %d, want %d; body %s",
|
||||
rec.Code, http.StatusForbidden, rec.Body.String())
|
||||
}
|
||||
|
||||
if !tt.wantForbidden && forbidden {
|
||||
t.Errorf("status = %d, want any other status; body %s",
|
||||
rec.Code, rec.Body.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user