mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
18c9b6c645
This PR does the following: - migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated but the old file remains in case its needed - moves the auth json in that fie into an "auth" property so we can add new top-level properties w/o messing with the auth stuff - adds support for an HttpHeaders property in ~/.docker/config.json which adds these http headers to all msgs from the cli In a follow-on PR I'll move the config file process out from under "registry" since it not specific to that any more. I didn't do it here because I wanted the diff to be smaller so people can make sure I didn't break/miss any auth code during my edits. Signed-off-by: Doug Davis <dug@us.ibm.com>
58 lines
1.4 KiB
Go
58 lines
1.4 KiB
Go
package main
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/pkg/homedir"
|
|
)
|
|
|
|
func TestConfigHttpHeader(t *testing.T) {
|
|
testRequires(t, UnixCli) // Can't set/unset HOME on windows right now
|
|
// We either need a level of Go that supports Unsetenv (for cases
|
|
// when HOME/USERPROFILE isn't set), or we need to be able to use
|
|
// os/user but user.Current() only works if we aren't statically compiling
|
|
|
|
var headers map[string][]string
|
|
|
|
server := httptest.NewServer(http.HandlerFunc(
|
|
func(w http.ResponseWriter, r *http.Request) {
|
|
headers = r.Header
|
|
}))
|
|
defer server.Close()
|
|
|
|
homeKey := homedir.Key()
|
|
homeVal := homedir.Get()
|
|
tmpDir, _ := ioutil.TempDir("", "fake-home")
|
|
defer os.RemoveAll(tmpDir)
|
|
|
|
dotDocker := filepath.Join(tmpDir, ".docker")
|
|
os.Mkdir(dotDocker, 0600)
|
|
tmpCfg := filepath.Join(dotDocker, "config.json")
|
|
|
|
defer func() { os.Setenv(homeKey, homeVal) }()
|
|
os.Setenv(homeKey, tmpDir)
|
|
|
|
data := `{
|
|
"HttpHeaders": { "MyHeader": "MyValue" }
|
|
}`
|
|
|
|
err := ioutil.WriteFile(tmpCfg, []byte(data), 0600)
|
|
if err != nil {
|
|
t.Fatalf("Err creating file(%s): %v", tmpCfg, err)
|
|
}
|
|
|
|
cmd := exec.Command(dockerBinary, "-H="+server.URL[7:], "ps")
|
|
out, _, _ := runCommandWithOutput(cmd)
|
|
|
|
if headers["Myheader"] == nil || headers["Myheader"][0] != "MyValue" {
|
|
t.Fatalf("Missing/bad header: %q\nout:%v", headers, out)
|
|
}
|
|
|
|
logDone("config - add new http headers")
|
|
}
|