Skip to content

K
k3s
Unverified Commit 6f03384f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #53898 from kad/fix-ipv6-noproxy

Automatic merge from submit-queue (batch tested with PRs 54800, 53898, 54812, 54921, 53558). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. NewProxierWithNoProxyCIDR: fix handling IPv6 URLs **What this PR does / why we need it**: Current logic of splitting hostname from URL does not work if URL is for IPv6 address and does not explicitly specify port number. Example: "https://[2001:db8::1]/". Use standard library function to get hostname out of URL string. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note - Fix handling of IPv6 URLs in NO_PROXY. ``` /area ipv6 /sig api-machinery
parents 4ff8cb60 ad3f9a81
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 11 deletions
staging/src/k8s.io/apimachinery/pkg/util/net/http.go
View file @ 6f03384f
...@@ -276,17 +276,7 @@ func NewProxierWithNoProxyCIDR(delegate func(req *http.Request) (*url.URL, error ...@@ -276,17 +276,7 @@ func NewProxierWithNoProxyCIDR(delegate func(req *http.Request) (*url.URL, error
} }
return func(req *http.Request) (*url.URL, error) { return func(req *http.Request) (*url.URL, error) {
host := req.URL.Host ip := net.ParseIP(req.URL.Hostname())
// for some urls, the Host is already the host, not the host:port
if net.ParseIP(host) == nil {
var err error
host, _, err = net.SplitHostPort(req.URL.Host)
if err != nil {
return delegate(req)
}
}
ip := net.ParseIP(host)
if ip == nil { if ip == nil {
return delegate(req) return delegate(req)
} }
......
staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go
View file @ 6f03384f
...@@ -172,6 +172,30 @@ func TestProxierWithNoProxyCIDR(t *testing.T) { ...@@ -172,6 +172,30 @@ func TestProxierWithNoProxyCIDR(t *testing.T) {
url: "https://192.168.143.1:8443/api", url: "https://192.168.143.1:8443/api",
expectedDelegated: false, expectedDelegated: false,
}, },
{
name: "IPv6 cidr",
noProxy: "2001:db8::/48",
url: "https://[2001:db8::1]/api",
expectedDelegated: false,
},
{
name: "IPv6+port cidr",
noProxy: "2001:db8::/48",
url: "https://[2001:db8::1]:8443/api",
expectedDelegated: false,
},
{
name: "IPv6, not matching cidr",
noProxy: "2001:db8::/48",
url: "https://[2001:db8:1::1]/api",
expectedDelegated: true,
},
{
name: "IPv6+port, not matching cidr",
noProxy: "2001:db8::/48",
url: "https://[2001:db8:1::1]:8443/api",
expectedDelegated: true,
},
} }
for _, test := range testCases { for _, test := range testCases {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment