7b8b61bda1
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>
174 lines
4.2 KiB
Go
174 lines
4.2 KiB
Go
package registry
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
)
|
|
|
|
func TestEncodeAuth(t *testing.T) {
|
|
newAuthConfig := &AuthConfig{Username: "ken", Password: "test", Email: "test@example.com"}
|
|
authStr := encodeAuth(newAuthConfig)
|
|
decAuthConfig := &AuthConfig{}
|
|
var err error
|
|
decAuthConfig.Username, decAuthConfig.Password, err = decodeAuth(authStr)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if newAuthConfig.Username != decAuthConfig.Username {
|
|
t.Fatal("Encode Username doesn't match decoded Username")
|
|
}
|
|
if newAuthConfig.Password != decAuthConfig.Password {
|
|
t.Fatal("Encode Password doesn't match decoded Password")
|
|
}
|
|
if authStr != "a2VuOnRlc3Q=" {
|
|
t.Fatal("AuthString encoding isn't correct.")
|
|
}
|
|
}
|
|
|
|
func setupTempConfigFile() (*ConfigFile, error) {
|
|
root, err := ioutil.TempDir("", "docker-test-auth")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
root = filepath.Join(root, CONFIGFILE)
|
|
configFile := &ConfigFile{
|
|
AuthConfigs: make(map[string]AuthConfig),
|
|
filename: root,
|
|
}
|
|
|
|
for _, registry := range []string{"testIndex", IndexServerAddress()} {
|
|
configFile.AuthConfigs[registry] = AuthConfig{
|
|
Username: "docker-user",
|
|
Password: "docker-pass",
|
|
Email: "docker@docker.io",
|
|
}
|
|
}
|
|
|
|
return configFile, nil
|
|
}
|
|
|
|
func TestSameAuthDataPostSave(t *testing.T) {
|
|
configFile, err := setupTempConfigFile()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.RemoveAll(configFile.filename)
|
|
|
|
err = configFile.Save()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
authConfig := configFile.AuthConfigs["testIndex"]
|
|
if authConfig.Username != "docker-user" {
|
|
t.Fail()
|
|
}
|
|
if authConfig.Password != "docker-pass" {
|
|
t.Fail()
|
|
}
|
|
if authConfig.Email != "docker@docker.io" {
|
|
t.Fail()
|
|
}
|
|
if authConfig.Auth != "" {
|
|
t.Fail()
|
|
}
|
|
}
|
|
|
|
func TestResolveAuthConfigIndexServer(t *testing.T) {
|
|
configFile, err := setupTempConfigFile()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.RemoveAll(configFile.filename)
|
|
|
|
indexConfig := configFile.AuthConfigs[IndexServerAddress()]
|
|
|
|
officialIndex := &IndexInfo{
|
|
Official: true,
|
|
}
|
|
privateIndex := &IndexInfo{
|
|
Official: false,
|
|
}
|
|
|
|
resolved := configFile.ResolveAuthConfig(officialIndex)
|
|
assertEqual(t, resolved, indexConfig, "Expected ResolveAuthConfig to return IndexServerAddress()")
|
|
|
|
resolved = configFile.ResolveAuthConfig(privateIndex)
|
|
assertNotEqual(t, resolved, indexConfig, "Expected ResolveAuthConfig to not return IndexServerAddress()")
|
|
}
|
|
|
|
func TestResolveAuthConfigFullURL(t *testing.T) {
|
|
configFile, err := setupTempConfigFile()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer os.RemoveAll(configFile.filename)
|
|
|
|
registryAuth := AuthConfig{
|
|
Username: "foo-user",
|
|
Password: "foo-pass",
|
|
Email: "foo@example.com",
|
|
}
|
|
localAuth := AuthConfig{
|
|
Username: "bar-user",
|
|
Password: "bar-pass",
|
|
Email: "bar@example.com",
|
|
}
|
|
officialAuth := AuthConfig{
|
|
Username: "baz-user",
|
|
Password: "baz-pass",
|
|
Email: "baz@example.com",
|
|
}
|
|
configFile.AuthConfigs[IndexServerAddress()] = officialAuth
|
|
|
|
expectedAuths := map[string]AuthConfig{
|
|
"registry.example.com": registryAuth,
|
|
"localhost:8000": localAuth,
|
|
"registry.com": localAuth,
|
|
}
|
|
|
|
validRegistries := map[string][]string{
|
|
"registry.example.com": {
|
|
"https://registry.example.com/v1/",
|
|
"http://registry.example.com/v1/",
|
|
"registry.example.com",
|
|
"registry.example.com/v1/",
|
|
},
|
|
"localhost:8000": {
|
|
"https://localhost:8000/v1/",
|
|
"http://localhost:8000/v1/",
|
|
"localhost:8000",
|
|
"localhost:8000/v1/",
|
|
},
|
|
"registry.com": {
|
|
"https://registry.com/v1/",
|
|
"http://registry.com/v1/",
|
|
"registry.com",
|
|
"registry.com/v1/",
|
|
},
|
|
}
|
|
|
|
for configKey, registries := range validRegistries {
|
|
configured, ok := expectedAuths[configKey]
|
|
if !ok || configured.Email == "" {
|
|
t.Fail()
|
|
}
|
|
index := &IndexInfo{
|
|
Name: configKey,
|
|
}
|
|
for _, registry := range registries {
|
|
configFile.AuthConfigs[registry] = configured
|
|
resolved := configFile.ResolveAuthConfig(index)
|
|
if resolved.Email != configured.Email {
|
|
t.Errorf("%s -> %q != %q\n", registry, resolved.Email, configured.Email)
|
|
}
|
|
delete(configFile.AuthConfigs, registry)
|
|
resolved = configFile.ResolveAuthConfig(index)
|
|
if resolved.Email == configured.Email {
|
|
t.Errorf("%s -> %q == %q\n", registry, resolved.Email, configured.Email)
|
|
}
|
|
}
|
|
}
|
|
}
|