Configurable http and https proxy addrs #208
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
Pull Request Test Coverage Report for Build 6858847444
💛 - Coveralls |
|
r? @cds2-stripe |
Pull Request Test Coverage Report for Build 6858934496
💛 - Coveralls |
xieyuxi-stripe
force-pushed
the
xieyuxi-configurable-proxy-addrs
branch
from
373a392
to
3f8bcc3
Compare
Pull Request Test Coverage Report for Build 6859183623
💛 - Coveralls |
xieyuxi-stripe
force-pushed
the
xieyuxi-configurable-proxy-addrs
branch
2 times, most recently
from
2f7264e
to
3f8bcc3
Compare
Pull Request Test Coverage Report for Build 6869798316
💛 - Coveralls |
cds2-stripe
requested changes
Nov 14, 2023
cmd/smokescreen.go
Outdated
| cli.StringFlag{ | ||
| Name: "transport-http-proxy-addr", | ||
| Value: "", | ||
| Usage: "Set the smokescreen's HTTP transport proxy address", |
There was a problem hiding this comment.
Could we change this to:
Set Smokescreen's upstream HTTP proxy address
cmd/smokescreen.go
Outdated
| cli.StringFlag{ | ||
| Name: "transport-https-proxy-addr", | ||
| Value: "", | ||
| Usage: "Set the smokescreen's HTTPS transport proxy address", |
There was a problem hiding this comment.
Same as above but for HTTPS
cmd/smokescreen.go
Outdated
| @@ -146,6 +146,16 @@ func NewConfiguration(args []string, logger *log.Logger) (*smokescreen.Config, e | |||
| Name: "unsafe-allow-private-ranges", | |||
| Usage: "Allow private ip ranges by default", | |||
| }, | |||
| cli.StringFlag{ | |||
| Name: "transport-http-proxy-addr", | |||
There was a problem hiding this comment.
We should change this to: upstream-http-proxy-addr
cmd/smokescreen.go
Outdated
| Usage: "Set the smokescreen's HTTP transport proxy address", | ||
| }, | ||
| cli.StringFlag{ | ||
| Name: "transport-https-proxy-addr", |
There was a problem hiding this comment.
upstream-https-proxy-addr
pkg/smokescreen/config.go
Outdated
| @@ -73,6 +73,10 @@ type Config struct { | |||
| TransportMaxIdleConns int | |||
| TransportMaxIdleConnsPerHost int | |||
|
|
|||
| // There are the http and https address for the transport proxy | |||
There was a problem hiding this comment.
UpstreamHttpProxyAddr string
UpstreamHttpsProxyAddr string
|
r? @cds2-stripe |
cds2-stripe
approved these changes
Nov 15, 2023
Open
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
Update the stripe/goproxy dependency to include stripe/goproxy#22. Allow setting the httpProxyAddr and httpsProxyAddr directly in smokescreen's configuration. When the TransportHttpProxyAddr and TransportHttpsProxyAddr in the smokescreen configuration is non-empty, use these proxy address to create the
NewProxyHttpServerfor smokescreen. 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.
Test plan