Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PWX-32800: proxy with http protocol also supports user/password #1201

Merged
merged 1 commit into from
Aug 11, 2023
Merged

PWX-32800: proxy with http protocol also supports user/password #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/storage/portworx/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ var (

// ParsePxProxy trims protocol prefix then splits the proxy address of the form "host:port" with possible basic authentication credential
func ParsePxProxyURL(proxy string) (string, string, string, error) {
if strings.HasPrefix(proxy, HttpsProtocolPrefix) && strings.Contains(proxy, "@") {
if strings.Contains(proxy, "@") {
proxyUrl, err := url.Parse(proxy)
if err != nil {
return "", "", "", fmt.Errorf("failed to parse px proxy url %s", proxy)
Expand Down
7 changes: 6 additions & 1 deletion drivers/storage/portworx/util/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,18 @@ func TestParsePxProxyURL(t *testing.T) {
require.Equal(t, "1234", port)
require.Equal(t, "", authHeader)

// The only valid format for HTTPS proxy
host, port, authHeader, err = ParsePxProxyURL("https://user:password@http.proxy.address:1234")
require.NoError(t, err)
require.Equal(t, "http.proxy.address", host)
require.Equal(t, "1234", port)
require.Equal(t, "Basic dXNlcjpwYXNzd29yZA==", authHeader)

host, port, authHeader, err = ParsePxProxyURL("http://user:password@http.proxy.address:1234")
require.NoError(t, err)
require.Equal(t, "http.proxy.address", host)
require.Equal(t, "1234", port)
require.Equal(t, "Basic dXNlcjpwYXNzd29yZA==", authHeader)

// Invalid cases
_, _, _, err = ParsePxProxyURL("")
require.Error(t, err)
Expand Down
Loading