Merge pull request #227 from cablespaghetti/feature/fix-docker-auth

Fix incorrectly hardcoded Docker Authentication username
ivanilves · Oct 4, 2020 · 0c09910 · 0c09910
2 parents f6bd6d5 + fac7f6c
commit 0c09910
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/docker/config/config.go b/docker/config/config.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/ivanilves/lstags/docker/config/credhelper"
 	"github.com/moby/moby/api/types"
 
@@ -56,7 +57,7 @@ func (c *Config) GetCredentials(registry string) (string, string, bool) {
 
 func getAuthJSONString(username, password string) string {
 	b, err := json.Marshal(types.AuthConfig{
-		Username: "_json_key",
+		Username: username,
 		Password: password,
 	})
 
@@ -76,9 +77,11 @@ func (c *Config) GetRegistryAuth(registry string) string {
 	if !defined {
 		return ""
 	}
+	authJSONString := getAuthJSONString(username, password)
+	log.Debugf("JSON Auth String: %s", authJSONString)
 
 	return base64.StdEncoding.EncodeToString(
-		[]byte(getAuthJSONString(username, password)),
+		[]byte(authJSONString),
 	)
 }
 

diff --git a/docker/config/config_test.go b/docker/config/config_test.go
@@ -10,8 +10,8 @@ var configFile = "../../fixtures/docker/config.json"
 
 func TestGetRegistryAuth(t *testing.T) {
 	examples := map[string]string{
-		"registry.company.io":     "eyJ1c2VybmFtZSI6Il9qc29uX2tleSIsInBhc3N3b3JkIjoicGFzczEifQ==",
-		"registry.hub.docker.com": "eyJ1c2VybmFtZSI6Il9qc29uX2tleSIsInBhc3N3b3JkIjoicGFzczIifQ==",
+		"registry.company.io":     "eyJ1c2VybmFtZSI6InVzZXIxIiwicGFzc3dvcmQiOiJwYXNzMSJ9",
+		"registry.hub.docker.com": "eyJ1c2VybmFtZSI6InVzZXIyIiwicGFzc3dvcmQiOiJwYXNzMiJ9",
 		"registry.mindundi.org":   "",
 	}