Configurable http and https proxy addrs #22
Merged
Conversation
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
xieyuxi-stripe
changed the title
cds2-stripe
requested changes
Nov 9, 2023
https.go
Outdated
| @@ -559,10 +559,15 @@ func (proxy *ProxyHttpServer) connectDialProxyWithContext(ctx *ProxyCtx, proxyHo | |||
| return c, nil | |||
| } | |||
|
|
|||
| // httpsProxyFromEnv allows goproxy to respect no_proxy env vars | |||
| // httpsProxy allows goproxy to respect no_proxy env vars | |||
There was a problem hiding this comment.
Could you extend this comment to clarify which configuration takes precedent?
https.go
Outdated
| // https://github.com/stripe/goproxy/pull/5 | ||
| func httpsProxyFromEnv(reqURL *url.URL) (string, error) { | ||
| func httpsProxy(reqURL *url.URL, httpProxyAddr string) (string, error) { |
There was a problem hiding this comment.
Could you change the var name to httpsProxyAddr to be more accurate?
proxy.go
Outdated
| @@ -191,7 +230,26 @@ func NewProxyHttpServer() *ProxyHttpServer { | |||
| }), | |||
| Tr: &http.Transport{TLSClientConfig: tlsClientSkipVerify, Proxy: http.ProxyFromEnvironment}, | |||
| } | |||
| proxy.ConnectDial = dialerFromEnv(&proxy) | |||
|
|
|||
| cfg := httpproxy.FromEnvironment() | |||
There was a problem hiding this comment.
I'm not sure about silently overriding environment proxy variables. WDYT?
There was a problem hiding this comment.
Also could we name this something to signal what it actually is instead of just cfg?
|
I am planning to make the configuration take precedence and fall back to environment variable when configuration is not set. |
cds2-stripe
approved these changes
Nov 13, 2023
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Allow setting the httpProxyAddr and httpsProxyAddr directly in
ProxyHttpServerconstructor. If these addresses are not set, use the default values from environment.Motivation
stripe/smokescreen uses this library for the proxy server. Currently, the only way to set the transport proxy for smokescreen are setting the proxy from environment, which requires us to set the environment variables like HTTP_PROXY, HTTPS_PROXY. We would like to have a more robust way of configuring the smokescreen server's transport proxy. Thus we are adding the transport proxy address as another configurations for the smokescreen server and the goproxy library it uses underneath.