Merge pull request #6 from rapid7/winhttp_automaticProxyConfScript

added the support for automatic configuration script proxy on windows
rapid7 · Nov 5, 2018 · fbcd32a · fbcd32a
2 parents 790ca9f + 5d35042
commit fbcd32a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/proxy/provider_darwin.go b/proxy/provider_darwin.go
@@ -54,7 +54,7 @@ Returns:
 	nil: A proxy was not found, or an error occurred
 */
 func (p *providerDarwin) Get(protocol string, targetUrlStr string) (Proxy) {
-	targetUrl := ParseTargetURL(targetUrlStr)
+	targetUrl := ParseTargetURL(targetUrlStr, protocol)
 	if proxy := p.provider.get(protocol, targetUrl); proxy != nil {
 		return proxy
 	}

diff --git a/proxy/provider_darwin_test.go b/proxy/provider_darwin_test.go
@@ -145,7 +145,7 @@ func TestParseScutildata_Read_HTTPS_HTTP(t *testing.T) {
 
 	commands := getDarwinProviderTestsNoBypass(ScutilDataHttpsHttp)
 
-	targetUrl := ParseTargetURL("")
+	targetUrl := ParseTargetURL("", "")
 
 	protocols := [4]string{"http", "https", "HTTP", "HTTPS"}
 	for _, protocol := range protocols {
@@ -178,7 +178,7 @@ func TestParseScutildata_Read_HTTPS(t *testing.T) {
 
 	commands := getDarwinProviderTestsNoBypass(ScutilDataHttps)
 
-	targetUrl := ParseTargetURL("")
+	targetUrl := ParseTargetURL("", "")
 
 	protocols := [4]string{"http", "https", "HTTP", "HTTPS"}
 	for _, protocol := range protocols {
@@ -217,7 +217,7 @@ func TestParseScutildata_Read_HTTP(t *testing.T) {
 
 	commands := getDarwinProviderTestsNoBypass(ScutilDataHttp)
 
-	targetUrl := ParseTargetURL("")
+	targetUrl := ParseTargetURL("", "")
 
 	protocols := [4]string{"http", "https", "HTTP", "HTTPS"}
 	for _, protocol := range protocols {
@@ -248,7 +248,7 @@ func TestExecCommandsHandledProperly(t *testing.T) {
 
 	c := newDarwinTestProvider()
 
-	targetUrl := ParseTargetURL("")
+	targetUrl := ParseTargetURL("", "")
 	expectedProxy, err := c.parseScutildata("", targetUrl, "exit", "")
 
 	a.Equal(isTimedOut(err), true)
@@ -273,7 +273,7 @@ func TestParseScutildata_Read_HTTPS_BYPASS_TARGET_URL(t *testing.T) {
 	protocol := "https"
 
 	// test empty target URL
-	targetUrl := ParseTargetURL("")
+	targetUrl := ParseTargetURL("", "")
 	expectedProxy, err := c.parseScutildata(protocol, targetUrl, "echo", command)
 	// test error is nil
 	a.Nil(err)
@@ -287,7 +287,7 @@ func TestParseScutildata_Read_HTTPS_BYPASS_TARGET_URL(t *testing.T) {
 	for _, tests := range bypassProxySettingsHostsDomains {
 		for _, test := range tests {
 			for urlStr, result := range test {
-				targetUrl := ParseTargetURL(urlStr)
+				targetUrl := ParseTargetURL(urlStr, "")
 				expectedProxy, err := c.parseScutildata(protocol, targetUrl, "echo", command)
 				// test error is nil
 				a.Nil(err)
@@ -308,7 +308,7 @@ func TestParseScutildata_Read_HTTPS_BYPASS_TARGET_URL(t *testing.T) {
 	for _, tests := range bypassProxySettingsHostsDomains {
 		for _, test := range tests {
 			for urlStr, _ := range test {
-				targetUrl := ParseTargetURL(urlStr)
+				targetUrl := ParseTargetURL(urlStr, "")
 				expectedProxy, err := c.parseScutildata(protocol, targetUrl, "echo", command)
 				// test error is returned correctly
 				a.Equal(isNotFound(err), true)

diff --git a/proxy/provider_linux.go b/proxy/provider_linux.go
@@ -41,7 +41,7 @@ Returns:
 	nil: A proxy was not found, or an error occurred
 */
 func (p *providerLinux) Get(protocol string, targetUrlStr string) (Proxy) {
-	return p.provider.get(protocol, ParseTargetURL(targetUrlStr))
+	return p.provider.get(protocol, ParseTargetURL(targetUrlStr, protocol))
 }
 
 /*

diff --git a/proxy/provider_windows.go b/proxy/provider_windows.go
@@ -53,7 +53,7 @@ Returns:
 	nil: A proxy was not found, or an error occurred
 */
 func (p *providerWindows) Get(protocol string, targetUrlStr string) (Proxy) {
-	targetUrl := ParseTargetURL(targetUrlStr)
+	targetUrl := ParseTargetURL(targetUrlStr, protocol)
 	proxy := p.provider.get(protocol, targetUrl)
 	if proxy != nil {
 		return proxy

diff --git a/proxy/url.go b/proxy/url.go
@@ -49,8 +49,8 @@ Returns:
 		* Fragment
 	The given URL string need not be a valid URL
 */
-func ParseTargetURL(targetUrl string) (*url.URL) {
-	parsedUrl, err := ParseURL(targetUrl, "")
+func ParseTargetURL(targetUrl, defaultScheme string) (*url.URL) {
+	parsedUrl, err := ParseURL(targetUrl, defaultScheme)
 	if err != nil {
 		return &url.URL{Host:"*"}
 	}

diff --git a/proxy/url_test.go b/proxy/url_test.go
@@ -108,7 +108,7 @@ func TestParseTargetURL(t *testing.T) {
 	for _, tt := range dataParseTargetURL {
 		t.Run(tt.rawUrl, func(t *testing.T) {
 			a := assert.New(t)
-			a.Equal(tt.expectUrl, ParseTargetURL(tt.rawUrl))
+			a.Equal(tt.expectUrl, ParseTargetURL(tt.rawUrl, ""))
 		})
 	}
 }