Merge pull request #176 from jiaqiluo/fix-proxy

Author: jiaqiluo

libmachine/cert/cert.go

@@ -11,15 +11,13 @@ import (
 	"math/big"
 	"net"
 	"net/http"
-	"net/url"
 	"os"
 	"time"
 
 	"errors"
 
 	"github.com/rancher/machine/libmachine/auth"
 	"github.com/rancher/machine/libmachine/log"
-	"github.com/rancher/machine/libmachine/util"
 )
 
 var defaultGenerator = NewX509CertGenerator()
@@ -264,21 +262,13 @@ func (xcg *X509CertGenerator) ValidateCertificate(addr string, authOptions *auth
 
 	transport := http.Transport{
 		TLSClientConfig: tlsConfig,
-	}
-
-	envVar := util.GetProxyURL()
-	if envVar != "" {
-		log.Debugf("proxy address is used: %s", envVar)
-		url, err := url.Parse("http://" + envVar)
-		if err != nil {
-			return false, err
-		}
-		transport.Proxy = http.ProxyURL(url)
+		Proxy:           http.ProxyFromEnvironment,
 	}
 	client := http.Client{
 		Transport: &transport,
 		Timeout:   time.Second * 20,
 	}
+	// A https request is used to validate the certificates
 	_, err = client.Get("https://" + addr + "/version")
 	if err != nil {
 		return false, err

libmachine/ssh/client.go

@@ -338,13 +338,20 @@ func NewExternalClient(sshBinaryPath, user, host string, port int, auth *Auth) (
 	client := &ExternalClient{
 		BinaryPath: sshBinaryPath,
 	}
-
 	var args []string
-	envVar := util.GetProxyURL()
+	// http proxy should be used for the SSH connection
+	proxy, err := util.GetProxyURL("http://" + host)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get the http proxy for the exernal client: %v", err)
+	}
+	proxy_url := ""
+	if proxy != nil {
+		proxy_url = proxy.Host
+	}
 	ncBinaryPath, _ := exec.LookPath("nc")
-	log.Debugf("envVar: %s; ncBinaryPath: %s", envVar, ncBinaryPath)
-	if envVar != "" && ncBinaryPath != "" {
-		args = append(baseSSHArgs, "-o", fmt.Sprintf(SSHProxyArg, ncBinaryPath, envVar), fmt.Sprintf("%s@%s", user, host))
+	log.Debugf("proxy_url: %s; ncBinaryPath: %s", proxy_url, ncBinaryPath)
+	if proxy_url != "" && ncBinaryPath != "" {
+		args = append(baseSSHArgs, "-o", fmt.Sprintf(SSHProxyArg, ncBinaryPath, proxy_url), fmt.Sprintf("%s@%s", user, host))
 	} else {
 		args = append(baseSSHArgs, fmt.Sprintf("%s@%s", user, host))
 	}

libmachine/util/util.go

@@ -1,10 +1,9 @@
 package util
 
 import (
+	"net/http"
+	"net/url"
 	"os"
-	"strings"
-
-	"github.com/rancher/machine/libmachine/log"
 )
 
 func FindEnvAny(names ...string) string {
@@ -16,14 +15,18 @@ func FindEnvAny(names ...string) string {
 	return ""
 }
 
-func GetProxyURL() string {
-	urlRaw := FindEnvAny("HTTP_PROXY", "HTTPS_PROXY")
-	if urlRaw == "" {
-		log.Debug("env var HTTP_PROXY or HTTPS_PROXY is not found")
-		return ""
+// GetProxyURL returns the URL of the proxy to use for this given hostUrl as indicated by the environment variables
+// HTTP_PROXY, HTTPS_PROXY and NO_PROXY (or the lowercase versions thereof).
+// HTTPS_PROXY takes precedence over HTTP_PROXY for https requests.
+// The hostUrl may be either a complete URL or a "host[:port]", in which case the "http" scheme is assumed.
+func GetProxyURL(hostUrl string) (*url.URL, error) {
+	req, err := http.NewRequest(http.MethodGet, hostUrl, nil)
+	if err != nil {
+		return nil, err
+	}
+	proxy, err := http.ProxyFromEnvironment(req)
+	if err != nil {
+		return nil, err
 	}
-	urlRaw = strings.ToLower(urlRaw)
-	urlRaw = strings.TrimPrefix(urlRaw, "http://")
-	urlRaw = strings.TrimPrefix(urlRaw, "https://")
-	return urlRaw
+	return proxy, nil
 }