-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NO_PROXY port support + special case for proxying via localhost (#11403)
This change updates NO_PROXY handling to allow blocking specific host:port combinations, rather than just the host. It also adds a special case for downgrading requests to plain HTTP when --insecure is true and the request goes through a plain HTTP proxy at localhost (i.e. HTTP_PROXY=http://localhost).
- Loading branch information
Showing
13 changed files
with
379 additions
and
250 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
/* | ||
Copyright 2022 Gravitational, Inc. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package proxy | ||
|
||
import ( | ||
"net/http" | ||
"net/url" | ||
"strings" | ||
|
||
"github.com/gravitational/trace" | ||
"golang.org/x/net/http/httpproxy" | ||
) | ||
|
||
// GetProxyAddress gets the HTTP proxy address to use for a given address, if any. | ||
func GetProxyAddress(dialAddr string) *url.URL { | ||
addrURL, err := parse(dialAddr) | ||
if err != nil || addrURL == nil { | ||
return nil | ||
} | ||
|
||
proxyFunc := httpproxy.FromEnvironment().ProxyFunc() | ||
if addrURL.Scheme != "" { | ||
proxyURL, err := proxyFunc(addrURL) | ||
if err != nil { | ||
return nil | ||
} | ||
return proxyURL | ||
} | ||
|
||
for _, scheme := range []string{"https", "http"} { | ||
addrURL.Scheme = scheme | ||
proxyURL, err := proxyFunc(addrURL) | ||
if err == nil && proxyURL != nil { | ||
return proxyURL | ||
} | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// parse parses an absolute URL. Unlike url.Parse, absolute URLs without a scheme are allowed. | ||
func parse(addr string) (*url.URL, error) { | ||
if addr == "" { | ||
return nil, nil | ||
} | ||
addrURL, err := url.Parse(addr) | ||
if err == nil && addrURL.Host != "" { | ||
return addrURL, nil | ||
} | ||
|
||
// url.Parse won't correctly parse an absolute URL without a scheme, so try again with a scheme. | ||
addrURL, err2 := url.Parse("http://" + addr) | ||
if err2 != nil { | ||
return nil, trace.NewAggregate(err, err2) | ||
} | ||
addrURL.Scheme = "" | ||
return addrURL, nil | ||
} | ||
|
||
// HTTPFallbackRoundTripper is a wrapper for http.Transport that downgrades requests | ||
// to plain HTTP when using a plain HTTP proxy at localhost. | ||
type HTTPFallbackRoundTripper struct { | ||
*http.Transport | ||
isProxyHTTPLocalhost bool | ||
} | ||
|
||
// NewHTTPFallbackRoundTripper creates a new initialized HTTP fallback roundtripper. | ||
func NewHTTPFallbackRoundTripper(transport *http.Transport, insecure bool) *HTTPFallbackRoundTripper { | ||
proxyConfig := httpproxy.FromEnvironment() | ||
rt := HTTPFallbackRoundTripper{ | ||
Transport: transport, | ||
isProxyHTTPLocalhost: strings.HasPrefix(proxyConfig.HTTPProxy, "http://localhost"), | ||
} | ||
if rt.TLSClientConfig != nil { | ||
rt.TLSClientConfig.InsecureSkipVerify = insecure | ||
} | ||
return &rt | ||
} | ||
|
||
// RoundTrip executes a single HTTP transaction. Part of the RoundTripper interface. | ||
func (rt *HTTPFallbackRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { | ||
tlsConfig := rt.Transport.TLSClientConfig | ||
// Use plain HTTP if proxying via http://localhost in insecure mode. | ||
if rt.isProxyHTTPLocalhost && tlsConfig != nil && tlsConfig.InsecureSkipVerify { | ||
req.URL.Scheme = "http" | ||
} | ||
return rt.Transport.RoundTrip(req) | ||
} |
Oops, something went wrong.