Browse code
fix https
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Victor Vieux authored on 2014/05/03 04:49:12Showing 3 changed files
| ... | ... |
@@ -65,8 +65,13 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, proto, addr string, tlsC |
| 65 | 65 |
var ( |
| 66 | 66 |
isTerminal = false |
| 67 | 67 |
terminalFd uintptr |
| 68 |
+ scheme = "http" |
|
| 68 | 69 |
) |
| 69 | 70 |
|
| 71 |
+ if tlsConfig != nil {
|
|
| 72 |
+ scheme = "https" |
|
| 73 |
+ } |
|
| 74 |
+ |
|
| 70 | 75 |
if in != nil {
|
| 71 | 76 |
if file, ok := in.(*os.File); ok {
|
| 72 | 77 |
terminalFd = file.Fd() |
| ... | ... |
@@ -86,6 +91,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, proto, addr string, tlsC |
| 86 | 86 |
isTerminal: isTerminal, |
| 87 | 87 |
terminalFd: terminalFd, |
| 88 | 88 |
tlsConfig: tlsConfig, |
| 89 |
+ scheme: scheme, |
|
| 89 | 90 |
} |
| 90 | 91 |
} |
| 91 | 92 |
|
| ... | ... |
@@ -99,4 +105,5 @@ type DockerCli struct {
|
| 99 | 99 |
isTerminal bool |
| 100 | 100 |
terminalFd uintptr |
| 101 | 101 |
tlsConfig *tls.Config |
| 102 |
+ scheme string |
|
| 102 | 103 |
} |
| ... | ... |
@@ -57,7 +57,7 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b
|
| 57 | 57 |
} |
| 58 | 58 |
} |
| 59 | 59 |
|
| 60 |
- req, err := http.NewRequest(method, fmt.Sprintf("http://v%s%s", api.APIVERSION, path), params)
|
|
| 60 |
+ req, err := http.NewRequest(method, fmt.Sprintf("/v%s%s", api.APIVERSION, path), params)
|
|
| 61 | 61 |
if err != nil {
|
| 62 | 62 |
return nil, -1, err |
| 63 | 63 |
} |
| ... | ... |
@@ -82,7 +82,8 @@ func (cli *DockerCli) call(method, path string, data interface{}, passAuthInfo b
|
| 82 | 82 |
} |
| 83 | 83 |
} |
| 84 | 84 |
req.Header.Set("User-Agent", "Docker-Client/"+dockerversion.VERSION)
|
| 85 |
- req.Host = cli.addr |
|
| 85 |
+ req.URL.Host = cli.addr |
|
| 86 |
+ req.URL.Scheme = cli.scheme |
|
| 86 | 87 |
if data != nil {
|
| 87 | 88 |
req.Header.Set("Content-Type", "application/json")
|
| 88 | 89 |
} else if method == "POST" {
|
| ... | ... |
@@ -123,7 +124,8 @@ func (cli *DockerCli) streamHelper(method, path string, setRawTerminal bool, in |
| 123 | 123 |
return err |
| 124 | 124 |
} |
| 125 | 125 |
req.Header.Set("User-Agent", "Docker-Client/"+dockerversion.VERSION)
|
| 126 |
- req.Host = cli.addr |
|
| 126 |
+ req.URL.Host = cli.addr |
|
| 127 |
+ req.URL.Scheme = cli.scheme |
|
| 127 | 128 |
if method == "POST" {
|
| 128 | 129 |
req.Header.Set("Content-Type", "plain/text")
|
| 129 | 130 |
} |
| ... | ... |
@@ -3,10 +3,12 @@ package docker |
| 3 | 3 |
import ( |
| 4 | 4 |
"crypto/tls" |
| 5 | 5 |
"crypto/x509" |
| 6 |
- "github.com/dotcloud/docker/api/client" |
|
| 7 | 6 |
"io/ioutil" |
| 7 |
+ "strings" |
|
| 8 | 8 |
"testing" |
| 9 | 9 |
"time" |
| 10 |
+ |
|
| 11 |
+ "github.com/dotcloud/docker/api/client" |
|
| 10 | 12 |
) |
| 11 | 13 |
|
| 12 | 14 |
const ( |
| ... | ... |
@@ -56,7 +58,7 @@ func TestHttpsInfoRogueCert(t *testing.T) {
|
| 56 | 56 |
if err == nil {
|
| 57 | 57 |
t.Fatal("Expected error but got nil")
|
| 58 | 58 |
} |
| 59 |
- if err.Error() != errBadCertificate {
|
|
| 59 |
+ if !strings.Contains(err.Error(), errBadCertificate) {
|
|
| 60 | 60 |
t.Fatalf("Expected error: %s, got instead: %s", errBadCertificate, err)
|
| 61 | 61 |
} |
| 62 | 62 |
}) |
| ... | ... |
@@ -74,7 +76,7 @@ func TestHttpsInfoRogueServerCert(t *testing.T) {
|
| 74 | 74 |
t.Fatal("Expected error but got nil")
|
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 |
- if err.Error() != errCaUnknown {
|
|
| 77 |
+ if !strings.Contains(err.Error(), errCaUnknown) {
|
|
| 78 | 78 |
t.Fatalf("Expected error: %s, got instead: %s", errBadCertificate, err)
|
| 79 | 79 |
} |
| 80 | 80 |
|