@@ -15,10 +15,10 @@ import (

 	"text/template"

 	"time"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/pkg/homedir"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/term"

-	"github.com/docker/docker/registry"

 )

 // DockerCli represents the docker command line client.

@@ -28,8 +28,9 @@ type DockerCli struct {

 	proto string

 	// addr holds the client address.

 	addr string

-	// configFile holds the configuration file (instance of registry.ConfigFile).

-	configFile *registry.ConfigFile

+

+	// configFile has the client configuration file

+	configFile *cliconfig.ConfigFile

 	// in holds the input stream and closer (io.ReadCloser) for the client.

 	in io.ReadCloser

 	// out holds the output stream (io.Writer) for the client.

@@ -184,7 +185,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, keyFile string, proto, a

 		tr.Dial = (&net.Dialer{Timeout: timeout}).Dial

 	}

-	configFile, e := registry.LoadConfig(filepath.Join(homedir.Get(), ".docker"))

+	configFile, e := cliconfig.Load(filepath.Join(homedir.Get(), ".docker"))

 	if e != nil {

 		fmt.Fprintf(err, "WARNING: Error loading config file:%v\n", e)

 	}

@@ -38,7 +38,7 @@ func (cli *DockerCli) pullImageCustomOut(image string, out io.Writer) error {

 	}

 	// Resolve the Auth config relevant for this server

-	authConfig := cli.configFile.ResolveAuthConfig(repoInfo.Index)

+	authConfig := registry.ResolveAuthConfig(cli.configFile, repoInfo.Index)

 	buf, err := json.Marshal(authConfig)

 	if err != nil {

 		return err

@@ -9,6 +9,7 @@ import (

 	"strings"

 	"github.com/docker/docker/api/types"

+	"github.com/docker/docker/cliconfig"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/term"

 	"github.com/docker/docker/registry"

@@ -56,7 +57,7 @@ func (cli *DockerCli) CmdLogin(args ...string) error {

 	authconfig, ok := cli.configFile.AuthConfigs[serverAddress]

 	if !ok {

-		authconfig = registry.AuthConfig{}

+		authconfig = cliconfig.AuthConfig{}

 	}

 	if username == "" {

@@ -28,7 +28,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {

 		return err

 	}

 	// Resolve the Auth config relevant for this server

-	authConfig := cli.configFile.ResolveAuthConfig(repoInfo.Index)

+	authConfig := registry.ResolveAuthConfig(cli.configFile, repoInfo.Index)

 	// If we're not using a custom registry, we know the restrictions

 	// applied to repository names and can warn the user in advance.

 	// Custom repositories can have different rules, and we must also

@@ -21,6 +21,7 @@ import (

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/autogen/dockerversion"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/engine"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/signal"

@@ -119,7 +120,7 @@ func (cli *DockerCli) clientRequest(method, path string, in io.Reader, headers m

 }

 func (cli *DockerCli) clientRequestAttemptLogin(method, path string, in io.Reader, out io.Writer, index *registry.IndexInfo, cmdName string) (io.ReadCloser, int, error) {

-	cmdAttempt := func(authConfig registry.AuthConfig) (io.ReadCloser, int, error) {

+	cmdAttempt := func(authConfig cliconfig.AuthConfig) (io.ReadCloser, int, error) {

 		buf, err := json.Marshal(authConfig)

 		if err != nil {

 			return nil, -1, err

@@ -150,14 +151,14 @@ func (cli *DockerCli) clientRequestAttemptLogin(method, path string, in io.Reade

 	}

 	// Resolve the Auth config relevant for this server

-	authConfig := cli.configFile.ResolveAuthConfig(index)

+	authConfig := registry.ResolveAuthConfig(cli.configFile, index)

 	body, statusCode, err := cmdAttempt(authConfig)

 	if statusCode == http.StatusUnauthorized {

 		fmt.Fprintf(cli.out, "\nPlease login prior to %s:\n", cmdName)

 		if err = cli.CmdLogin(index.GetAuthConfigKey()); err != nil {

 			return nil, -1, err

 		}

-		authConfig = cli.configFile.ResolveAuthConfig(index)

+		authConfig = registry.ResolveAuthConfig(cli.configFile, index)

 		return cmdAttempt(authConfig)

 	}

 	return body, statusCode, err

@@ -22,6 +22,7 @@ import (

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/autogen/dockerversion"

 	"github.com/docker/docker/builder"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/daemon/networkdriver/bridge"

 	"github.com/docker/docker/engine"

@@ -34,7 +35,6 @@ import (

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/version"

-	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/utils"

 )

@@ -239,7 +239,7 @@ func streamJSON(out *engine.Output, w http.ResponseWriter, flush bool) {

 }

 func (s *Server) postAuth(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

-	var config *registry.AuthConfig

+	var config *cliconfig.AuthConfig

 	err := json.NewDecoder(r.Body).Decode(&config)

 	r.Body.Close()

 	if err != nil {

@@ -728,13 +728,13 @@ func (s *Server) postImagesCreate(eng *engine.Engine, version version.Version, w

 		tag   = r.Form.Get("tag")

 	)

 	authEncoded := r.Header.Get("X-Registry-Auth")

-	authConfig := &registry.AuthConfig{}

+	authConfig := &cliconfig.AuthConfig{}

 	if authEncoded != "" {

 		authJson := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))

 		if err := json.NewDecoder(authJson).Decode(authConfig); err != nil {

 			// for a pull it is not an error if no auth was given

 			// to increase compatibility with the existing api it is defaulting to be empty

-			authConfig = &registry.AuthConfig{}

+			authConfig = &cliconfig.AuthConfig{}

 		}

 	}

@@ -802,7 +802,7 @@ func (s *Server) getImagesSearch(eng *engine.Engine, version version.Version, w

 		return err

 	}

 	var (

-		config      *registry.AuthConfig

+		config      *cliconfig.AuthConfig

 		authEncoded = r.Header.Get("X-Registry-Auth")

 		headers     = map[string][]string{}

 	)

@@ -812,7 +812,7 @@ func (s *Server) getImagesSearch(eng *engine.Engine, version version.Version, w

 		if err := json.NewDecoder(authJson).Decode(&config); err != nil {

 			// for a search it is not an error if no auth was given

 			// to increase compatibility with the existing api it is defaulting to be empty

-			config = &registry.AuthConfig{}

+			config = &cliconfig.AuthConfig{}

 		}

 	}

 	for k, v := range r.Header {

@@ -841,7 +841,7 @@ func (s *Server) postImagesPush(eng *engine.Engine, version version.Version, w h

 	if err := parseForm(r); err != nil {

 		return err

 	}

-	authConfig := &registry.AuthConfig{}

+	authConfig := &cliconfig.AuthConfig{}

 	authEncoded := r.Header.Get("X-Registry-Auth")

 	if authEncoded != "" {

@@ -849,7 +849,7 @@ func (s *Server) postImagesPush(eng *engine.Engine, version version.Version, w h

 		authJson := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))

 		if err := json.NewDecoder(authJson).Decode(authConfig); err != nil {

 			// to increase compatibility to existing api it is defaulting to be empty

-			authConfig = &registry.AuthConfig{}

+			authConfig = &cliconfig.AuthConfig{}

 		}

 	} else {

 		// the old format is supported for compatibility if there was no authConfig header

@@ -1263,9 +1263,9 @@ func (s *Server) postBuild(eng *engine.Engine, version version.Version, w http.R

 	}

 	var (

 		authEncoded       = r.Header.Get("X-Registry-Auth")

-		authConfig        = &registry.AuthConfig{}

+		authConfig        = &cliconfig.AuthConfig{}

 		configFileEncoded = r.Header.Get("X-Registry-Config")

-		configFile        = &registry.ConfigFile{}

+		configFile        = &cliconfig.ConfigFile{}

 		buildConfig       = builder.NewBuildConfig()

 	)

@@ -1278,7 +1278,7 @@ func (s *Server) postBuild(eng *engine.Engine, version version.Version, w http.R

 		if err := json.NewDecoder(authJson).Decode(authConfig); err != nil {

 			// for a pull it is not an error if no auth was given

 			// to increase compatibility with the existing api it is defaulting to be empty

-			authConfig = &registry.AuthConfig{}

+			authConfig = &cliconfig.AuthConfig{}

 		}

 	}

@@ -1287,7 +1287,7 @@ func (s *Server) postBuild(eng *engine.Engine, version version.Version, w http.R

 		if err := json.NewDecoder(configFileJson).Decode(configFile); err != nil {

 			// for a pull it is not an error if no auth was given

 			// to increase compatibility with the existing api it is defaulting to be empty

-			configFile = &registry.ConfigFile{}

+			configFile = &cliconfig.ConfigFile{}

 		}

 	}

@@ -30,13 +30,13 @@ import (

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/builder/command"

 	"github.com/docker/docker/builder/parser"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/pkg/fileutils"

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/symlink"

 	"github.com/docker/docker/pkg/tarsum"

-	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/utils"

 )

@@ -99,8 +99,8 @@ type Builder struct {

 	// the final configs of the Dockerfile but dont want the layers

 	disableCommit bool

-	AuthConfig *registry.AuthConfig

-	ConfigFile *registry.ConfigFile

+	AuthConfig *cliconfig.AuthConfig

+	ConfigFile *cliconfig.ConfigFile

 	// Deprecated, original writer used for ImagePull. To be removed.

 	OutOld          io.Writer

@@ -36,6 +36,7 @@ import (

 	"github.com/docker/docker/pkg/system"

 	"github.com/docker/docker/pkg/tarsum"

 	"github.com/docker/docker/pkg/urlutil"

+	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

 )

@@ -443,7 +444,7 @@ func (b *Builder) pullImage(name string) (*imagepkg.Image, error) {

 		if err != nil {

 			return nil, err

 		}

-		resolvedAuth := b.ConfigFile.ResolveAuthConfig(repoInfo.Index)

+		resolvedAuth := registry.ResolveAuthConfig(b.ConfigFile, repoInfo.Index)

 		pullRegistryAuth = &resolvedAuth

 	}

@@ -12,6 +12,7 @@ import (

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/builder/parser"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/graph"

 	"github.com/docker/docker/pkg/archive"

@@ -50,8 +51,8 @@ type Config struct {

 	CpuShares      int64

 	CpuSetCpus     string

 	CpuSetMems     string

-	AuthConfig     *registry.AuthConfig

-	ConfigFile     *registry.ConfigFile

+	AuthConfig     *cliconfig.AuthConfig

+	ConfigFile     *cliconfig.ConfigFile

 	Stdout  io.Writer

 	Context io.ReadCloser

@@ -76,8 +77,8 @@ func (b *Config) WaitCancelled() <-chan struct{} {

 func NewBuildConfig() *Config {

 	return &Config{

-		AuthConfig: &registry.AuthConfig{},

-		ConfigFile: &registry.ConfigFile{},

+		AuthConfig: &cliconfig.AuthConfig{},

+		ConfigFile: &cliconfig.ConfigFile{},

 		cancelled:  make(chan struct{}),

 	}

 }

new file mode 100644

@@ -0,0 +1,208 @@

+package cliconfig

+

+import (

+	"encoding/base64"

+	"encoding/json"

+	"errors"

+	"fmt"

+	"io/ioutil"

+	"os"

+	"path/filepath"

+	"strings"

+

+	"github.com/docker/docker/pkg/homedir"

+)

+

+const (

+	// Where we store the config file

+	CONFIGFILE     = "config.json"

+	OLD_CONFIGFILE = ".dockercfg"

+

+	// This constant is only used for really old config files when the

+	// URL wasn't saved as part of the config file and it was just

+	// assumed to be this value.

+	DEFAULT_INDEXSERVER = "https://index.docker.io/v1/"

+)

+

+var (

+	ErrConfigFileMissing = errors.New("The Auth config file is missing")

+)

+

+// Registry Auth Info

+type AuthConfig struct {

+	Username      string `json:"username,omitempty"`

+	Password      string `json:"password,omitempty"`

+	Auth          string `json:"auth"`

+	Email         string `json:"email"`

+	ServerAddress string `json:"serveraddress,omitempty"`

+}

+

+// ~/.docker/config.json file info

+type ConfigFile struct {

+	AuthConfigs map[string]AuthConfig `json:"auths"`

+	HttpHeaders map[string]string     `json:"HttpHeaders,omitempty"`

+	filename    string                // Note: not serialized - for internal use only

+}

+

+func NewConfigFile(fn string) *ConfigFile {

+	return &ConfigFile{

+		AuthConfigs: make(map[string]AuthConfig),

+		HttpHeaders: make(map[string]string),

+		filename:    fn,

+	}

+}

+

+// load up the auth config information and return values

+// FIXME: use the internal golang config parser

+func Load(configDir string) (*ConfigFile, error) {

+	if configDir == "" {

+		configDir = filepath.Join(homedir.Get(), ".docker")

+	}

+

+	configFile := ConfigFile{

+		AuthConfigs: make(map[string]AuthConfig),

+		filename:    filepath.Join(configDir, CONFIGFILE),

+	}

+

+	// Try happy path first - latest config file

+	if _, err := os.Stat(configFile.filename); err == nil {

+		file, err := os.Open(configFile.filename)

+		if err != nil {

+			return &configFile, err

+		}

+		defer file.Close()

+

+		if err := json.NewDecoder(file).Decode(&configFile); err != nil {

+			return &configFile, err

+		}

+

+		for addr, ac := range configFile.AuthConfigs {

+			ac.Username, ac.Password, err = DecodeAuth(ac.Auth)

+			if err != nil {

+				return &configFile, err

+			}

+			ac.Auth = ""

+			ac.ServerAddress = addr

+			configFile.AuthConfigs[addr] = ac

+		}

+

+		return &configFile, nil

+	} else if !os.IsNotExist(err) {

+		// if file is there but we can't stat it for any reason other

+		// than it doesn't exist then stop

+		return &configFile, err

+	}

+

+	// Can't find latest config file so check for the old one

+	confFile := filepath.Join(homedir.Get(), OLD_CONFIGFILE)

+

+	if _, err := os.Stat(confFile); err != nil {

+		return &configFile, nil //missing file is not an error

+	}

+

+	b, err := ioutil.ReadFile(confFile)

+	if err != nil {

+		return &configFile, err

+	}

+

+	if err := json.Unmarshal(b, &configFile.AuthConfigs); err != nil {

+		arr := strings.Split(string(b), "\n")

+		if len(arr) < 2 {

+			return &configFile, fmt.Errorf("The Auth config file is empty")

+		}

+		authConfig := AuthConfig{}

+		origAuth := strings.Split(arr[0], " = ")

+		if len(origAuth) != 2 {

+			return &configFile, fmt.Errorf("Invalid Auth config file")

+		}

+		authConfig.Username, authConfig.Password, err = DecodeAuth(origAuth[1])

+		if err != nil {

+			return &configFile, err

+		}

+		origEmail := strings.Split(arr[1], " = ")

+		if len(origEmail) != 2 {

+			return &configFile, fmt.Errorf("Invalid Auth config file")

+		}

+		authConfig.Email = origEmail[1]

+		authConfig.ServerAddress = DEFAULT_INDEXSERVER

+		configFile.AuthConfigs[DEFAULT_INDEXSERVER] = authConfig

+	} else {

+		for k, authConfig := range configFile.AuthConfigs {

+			authConfig.Username, authConfig.Password, err = DecodeAuth(authConfig.Auth)

+			if err != nil {

+				return &configFile, err

+			}

+			authConfig.Auth = ""

+			authConfig.ServerAddress = k

+			configFile.AuthConfigs[k] = authConfig

+		}

+	}

+	return &configFile, nil

+}

+

+func (configFile *ConfigFile) Save() error {

+	// Encode sensitive data into a new/temp struct

+	tmpAuthConfigs := make(map[string]AuthConfig, len(configFile.AuthConfigs))

+	for k, authConfig := range configFile.AuthConfigs {

+		authCopy := authConfig

+

+		authCopy.Auth = EncodeAuth(&authCopy)

+		authCopy.Username = ""

+		authCopy.Password = ""

+		authCopy.ServerAddress = ""

+		tmpAuthConfigs[k] = authCopy

+	}

+

+	saveAuthConfigs := configFile.AuthConfigs

+	configFile.AuthConfigs = tmpAuthConfigs

+	defer func() { configFile.AuthConfigs = saveAuthConfigs }()

+

+	data, err := json.MarshalIndent(configFile, "", "\t")

+	if err != nil {

+		return err

+	}

+

+	if err := os.MkdirAll(filepath.Dir(configFile.filename), 0700); err != nil {

+		return err

+	}

+

+	err = ioutil.WriteFile(configFile.filename, data, 0600)

+	if err != nil {

+		return err

+	}

+

+	return nil

+}

+

+func (config *ConfigFile) Filename() string {

+	return config.filename

+}

+

+// create a base64 encoded auth string to store in config

+func EncodeAuth(authConfig *AuthConfig) string {

+	authStr := authConfig.Username + ":" + authConfig.Password

+	msg := []byte(authStr)

+	encoded := make([]byte, base64.StdEncoding.EncodedLen(len(msg)))

+	base64.StdEncoding.Encode(encoded, msg)

+	return string(encoded)

+}

+

+// decode the auth string

+func DecodeAuth(authStr string) (string, string, error) {

+	decLen := base64.StdEncoding.DecodedLen(len(authStr))

+	decoded := make([]byte, decLen)

+	authByte := []byte(authStr)

+	n, err := base64.StdEncoding.Decode(decoded, authByte)

+	if err != nil {

+		return "", "", err

+	}

+	if n > decLen {

+		return "", "", fmt.Errorf("Something went wrong decoding auth config")

+	}

+	arr := strings.SplitN(string(decoded), ":", 2)

+	if len(arr) != 2 {

+		return "", "", fmt.Errorf("Invalid auth configuration file")

+	}

+	password := strings.Trim(arr[1], "\x00")

+	return arr[0], password, nil

+}

new file mode 100644

@@ -0,0 +1,157 @@

+package cliconfig

+

+import (

+	"io/ioutil"

+	"os"

+	"path/filepath"

+	"runtime"

+	"strings"

+	"testing"

+

+	"github.com/docker/docker/pkg/homedir"

+)

+

+func TestMissingFile(t *testing.T) {

+	tmpHome, _ := ioutil.TempDir("", "config-test")

+

+	config, err := Load(tmpHome)

+	if err != nil {

+		t.Fatalf("Failed loading on missing file: %q", err)

+	}

+

+	// Now save it and make sure it shows up in new form

+	err = config.Save()

+	if err != nil {

+		t.Fatalf("Failed to save: %q", err)

+	}

+

+	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, CONFIGFILE))

+	if !strings.Contains(string(buf), `"auths":`) {

+		t.Fatalf("Should have save in new form: %s", string(buf))

+	}

+}

+

+func TestSaveFileToDirs(t *testing.T) {

+	tmpHome, _ := ioutil.TempDir("", "config-test")

+

+	tmpHome += "/.docker"

+

+	config, err := Load(tmpHome)

+	if err != nil {

+		t.Fatalf("Failed loading on missing file: %q", err)

+	}

+

+	// Now save it and make sure it shows up in new form

+	err = config.Save()

+	if err != nil {

+		t.Fatalf("Failed to save: %q", err)

+	}

+

+	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, CONFIGFILE))

+	if !strings.Contains(string(buf), `"auths":`) {

+		t.Fatalf("Should have save in new form: %s", string(buf))

+	}

+}

+

+func TestEmptyFile(t *testing.T) {

+	tmpHome, _ := ioutil.TempDir("", "config-test")

+	fn := filepath.Join(tmpHome, CONFIGFILE)

+	ioutil.WriteFile(fn, []byte(""), 0600)

+

+	_, err := Load(tmpHome)

+	if err == nil {

+		t.Fatalf("Was supposed to fail")

+	}

+}

+

+func TestEmptyJson(t *testing.T) {

+	tmpHome, _ := ioutil.TempDir("", "config-test")

+	fn := filepath.Join(tmpHome, CONFIGFILE)

+	ioutil.WriteFile(fn, []byte("{}"), 0600)

+

+	config, err := Load(tmpHome)

+	if err != nil {

+		t.Fatalf("Failed loading on empty json file: %q", err)

+	}

+

+	// Now save it and make sure it shows up in new form

+	err = config.Save()

+	if err != nil {

+		t.Fatalf("Failed to save: %q", err)

+	}

+

+	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, CONFIGFILE))

+	if !strings.Contains(string(buf), `"auths":`) {

+		t.Fatalf("Should have save in new form: %s", string(buf))

+	}

+}

+

+func TestOldJson(t *testing.T) {

+	if runtime.GOOS == "windows" {

+		return

+	}

+

+	tmpHome, _ := ioutil.TempDir("", "config-test")

+	defer os.RemoveAll(tmpHome)

+

+	homeKey := homedir.Key()

+	homeVal := homedir.Get()

+

+	defer func() { os.Setenv(homeKey, homeVal) }()

+	os.Setenv(homeKey, tmpHome)

+

+	fn := filepath.Join(tmpHome, OLD_CONFIGFILE)

+	js := `{"https://index.docker.io/v1/":{"auth":"am9lam9lOmhlbGxv","email":"user@example.com"}}`

+	ioutil.WriteFile(fn, []byte(js), 0600)

+

+	config, err := Load(tmpHome)

+	if err != nil {

+		t.Fatalf("Failed loading on empty json file: %q", err)

+	}

+

+	ac := config.AuthConfigs["https://index.docker.io/v1/"]

+	if ac.Email != "user@example.com" || ac.Username != "joejoe" || ac.Password != "hello" {

+		t.Fatalf("Missing data from parsing:\n%q", config)

+	}

+

+	// Now save it and make sure it shows up in new form

+	err = config.Save()

+	if err != nil {

+		t.Fatalf("Failed to save: %q", err)

+	}

+

+	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, CONFIGFILE))

+	if !strings.Contains(string(buf), `"auths":`) ||

+		!strings.Contains(string(buf), "user@example.com") {

+		t.Fatalf("Should have save in new form: %s", string(buf))

+	}

+}

+

+func TestNewJson(t *testing.T) {

+	tmpHome, _ := ioutil.TempDir("", "config-test")

+	fn := filepath.Join(tmpHome, CONFIGFILE)

+	js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } } }`

+	ioutil.WriteFile(fn, []byte(js), 0600)

+

+	config, err := Load(tmpHome)

+	if err != nil {

+		t.Fatalf("Failed loading on empty json file: %q", err)

+	}

+

+	ac := config.AuthConfigs["https://index.docker.io/v1/"]

+	if ac.Email != "user@example.com" || ac.Username != "joejoe" || ac.Password != "hello" {

+		t.Fatalf("Missing data from parsing:\n%q", config)

+	}

+

+	// Now save it and make sure it shows up in new form

+	err = config.Save()

+	if err != nil {

+		t.Fatalf("Failed to save: %q", err)

+	}

+

+	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, CONFIGFILE))

+	if !strings.Contains(string(buf), `"auths":`) ||

+		!strings.Contains(string(buf), "user@example.com") {

+		t.Fatalf("Should have save in new form: %s", string(buf))

+	}

+}

@@ -12,6 +12,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/distribution/digest"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/progressreader"

 	"github.com/docker/docker/pkg/streamformatter"

@@ -23,7 +24,7 @@ import (

 type ImagePullConfig struct {

 	Parallel    bool

 	MetaHeaders map[string][]string

-	AuthConfig  *registry.AuthConfig

+	AuthConfig  *cliconfig.AuthConfig

 	Json        bool

 	OutStream   io.Writer

 }

@@ -12,6 +12,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/distribution/digest"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/pkg/progressreader"

 	"github.com/docker/docker/pkg/streamformatter"

@@ -26,7 +27,7 @@ var ErrV2RegistryUnavailable = errors.New("error v2 registry unavailable")

 type ImagePushConfig struct {

 	MetaHeaders map[string][]string

-	AuthConfig  *registry.AuthConfig

+	AuthConfig  *cliconfig.AuthConfig

 	Tag         string

 	Json        bool

 	OutStream   io.Writer

@@ -18,6 +18,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	apiserver "github.com/docker/docker/api/server"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/daemon/execdriver"

 	"github.com/docker/docker/engine"

@@ -28,7 +29,6 @@ import (

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/pkg/stringid"

-	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/utils"

 )

@@ -135,7 +135,7 @@ func setupBaseImage() {

 		imagePullConfig := &graph.ImagePullConfig{

 			Parallel:   true,

 			OutStream:  ioutils.NopWriteCloser(os.Stdout),

-			AuthConfig: &registry.AuthConfig{},

+			AuthConfig: &cliconfig.AuthConfig{},

 		}

 		d := getDaemon(eng)

 		if err := d.Repositories().Pull(unitTestImageName, "", imagePullConfig); err != nil {

@@ -1,51 +1,21 @@

 package registry

 import (

-	"encoding/base64"

 	"encoding/json"

-	"errors"

 	"fmt"

 	"io/ioutil"

 	"net/http"

-	"os"

-	"path/filepath"

 	"strings"

 	"sync"

 	"time"

 	"github.com/Sirupsen/logrus"

-	"github.com/docker/docker/pkg/homedir"

+	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/pkg/requestdecorator"

 )

-const (

-	// Where we store the config file

-	CONFIGFILE     = "config.json"

-	OLD_CONFIGFILE = ".dockercfg"

-)

-

-var (

-	ErrConfigFileMissing = errors.New("The Auth config file is missing")

-)

-

-// Registry Auth Info

-type AuthConfig struct {

-	Username      string `json:"username,omitempty"`

-	Password      string `json:"password,omitempty"`

-	Auth          string `json:"auth"`

-	Email         string `json:"email"`

-	ServerAddress string `json:"serveraddress,omitempty"`

-}

-

-// ~/.docker/config.json file info

-type ConfigFile struct {

-	AuthConfigs map[string]AuthConfig `json:"auths"`

-	HttpHeaders map[string]string     `json:"HttpHeaders,omitempty"`

-	filename    string                // Note: not serialized - for internal use only

-}

-

 type RequestAuthorization struct {

-	authConfig       *AuthConfig

+	authConfig       *cliconfig.AuthConfig

 	registryEndpoint *Endpoint

 	resource         string

 	scope            string

@@ -56,7 +26,7 @@ type RequestAuthorization struct {

 	tokenExpiration time.Time

 }

-func NewRequestAuthorization(authConfig *AuthConfig, registryEndpoint *Endpoint, resource, scope string, actions []string) *RequestAuthorization {

+func NewRequestAuthorization(authConfig *cliconfig.AuthConfig, registryEndpoint *Endpoint, resource, scope string, actions []string) *RequestAuthorization {

 	return &RequestAuthorization{

 		authConfig:       authConfig,

 		registryEndpoint: registryEndpoint,

@@ -121,160 +91,8 @@ func (auth *RequestAuthorization) Authorize(req *http.Request) error {

 	return nil

 }

-// create a base64 encoded auth string to store in config

-func encodeAuth(authConfig *AuthConfig) string {

-	authStr := authConfig.Username + ":" + authConfig.Password

-	msg := []byte(authStr)

-	encoded := make([]byte, base64.StdEncoding.EncodedLen(len(msg)))

-	base64.StdEncoding.Encode(encoded, msg)

-	return string(encoded)

-}

-

-// decode the auth string

-func decodeAuth(authStr string) (string, string, error) {

-	decLen := base64.StdEncoding.DecodedLen(len(authStr))

-	decoded := make([]byte, decLen)

-	authByte := []byte(authStr)

-	n, err := base64.StdEncoding.Decode(decoded, authByte)

-	if err != nil {

-		return "", "", err

-	}

-	if n > decLen {

-		return "", "", fmt.Errorf("Something went wrong decoding auth config")

-	}

-	arr := strings.SplitN(string(decoded), ":", 2)

-	if len(arr) != 2 {

-		return "", "", fmt.Errorf("Invalid auth configuration file")

-	}

-	password := strings.Trim(arr[1], "\x00")

-	return arr[0], password, nil

-}

-

-// load up the auth config information and return values

-// FIXME: use the internal golang config parser

-func LoadConfig(configDir string) (*ConfigFile, error) {

-	if configDir == "" {

-		configDir = filepath.Join(homedir.Get(), ".docker")

-	}

-

-	configFile := ConfigFile{

-		AuthConfigs: make(map[string]AuthConfig),

-		filename:    filepath.Join(configDir, CONFIGFILE),

-	}

-

-	// Try happy path first - latest config file

-	if _, err := os.Stat(configFile.filename); err == nil {

-		file, err := os.Open(configFile.filename)

-		if err != nil {

-			return &configFile, err

-		}

-		defer file.Close()

-

-		if err := json.NewDecoder(file).Decode(&configFile); err != nil {

-			return &configFile, err

-		}

-

-		for addr, ac := range configFile.AuthConfigs {

-			ac.Username, ac.Password, err = decodeAuth(ac.Auth)

-			if err != nil {

-				return &configFile, err

-			}

-			ac.Auth = ""

-			ac.ServerAddress = addr

-			configFile.AuthConfigs[addr] = ac

-		}

-

-		return &configFile, nil

-	} else if !os.IsNotExist(err) {

-		// if file is there but we can't stat it for any reason other

-		// than it doesn't exist then stop

-		return &configFile, err

-	}

-

-	// Can't find latest config file so check for the old one

-	confFile := filepath.Join(homedir.Get(), OLD_CONFIGFILE)

-

-	if _, err := os.Stat(confFile); err != nil {

-		return &configFile, nil //missing file is not an error

-	}

-

-	b, err := ioutil.ReadFile(confFile)

-	if err != nil {

-		return &configFile, err

-	}

-

-	if err := json.Unmarshal(b, &configFile.AuthConfigs); err != nil {

-		arr := strings.Split(string(b), "\n")

-		if len(arr) < 2 {

-			return &configFile, fmt.Errorf("The Auth config file is empty")

-		}

-		authConfig := AuthConfig{}

-		origAuth := strings.Split(arr[0], " = ")

-		if len(origAuth) != 2 {

-			return &configFile, fmt.Errorf("Invalid Auth config file")

-		}

-		authConfig.Username, authConfig.Password, err = decodeAuth(origAuth[1])