jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-10-30 23:57:50 +02:00
Code Issues Releases Activity

feat(cnbBuild): Support of username/password authorization (#3690)

Browse Source 
Co-authored-by: Ralf Pannemans <ralf.pannemans@sap.com>
This commit is contained in:
Ralf Pannemans
2022-03-31 16:13:21 +02:00
committed by GitHub
parent 0c28ecc4fb
commit 5b42b6af70
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/cnbutils/auth.go
View File

@@ -1,6 +1,7 @@
package cnbutils
import (
"encoding/base64"
"encoding/json"
"fmt"
@@ -26,6 +27,15 @@ func GenerateCnbAuth(config string, utils BuildUtils) (string, error) {
auth := map[string]string{}
for registry, value := range dockerConfig.AuthConfigs {
if value.Auth == "" && value.Username == "" && value.Password == "" {
log.Entry().Warnf("docker config.json contains empty credentials for registry %q. Either 'auth' or 'username' and 'password' have to be provided.", registry)
continue
}
if value.Auth == "" {
value.Auth = encodeAuth(value.Username, value.Password)
}
log.Entry().Debugf("Adding credentials for: registry %q", registry)
auth[registry] = fmt.Sprintf("Basic %s", value.Auth)
@@ -38,3 +48,8 @@ func GenerateCnbAuth(config string, utils BuildUtils) (string, error) {
return string(cnbRegistryAuth), nil
}
func encodeAuth(username, password string) string {
auth := username + ":" + password
return base64.StdEncoding.EncodeToString([]byte(auth))
}

16
pkg/cnbutils/auth_test.go
View File

@@ -15,12 +15,26 @@ func TestGenerateCnbAuth(t *testing.T) {
}
t.Run("successfully generates cnb auth env variable", func(t *testing.T) {
mockUtils.AddFile("/test/valid_config.json", []byte("{\"auths\":{\"example.com\":{\"username\":\"username\",\"password\":\"password\",\"auth\":\"dXNlcm5hbWU6cGFzc3dvcmQ=\"}}}"))
mockUtils.AddFile("/test/valid_config.json", []byte("{\"auths\":{\"example.com\":{\"auth\":\"dXNlcm5hbWU6cGFzc3dvcmQ=\"}}}"))
auth, err := cnbutils.GenerateCnbAuth("/test/valid_config.json", mockUtils)
assert.NoError(t, err)
assert.Equal(t, "{\"example.com\":\"Basic dXNlcm5hbWU6cGFzc3dvcmQ=\"}", auth)
})
t.Run("successfully generates cnb auth env variable from username and password", func(t *testing.T) {
mockUtils.AddFile("/test/valid_config.json", []byte("{\"auths\":{\"example.com\":{\"username\":\"username\",\"password\":\"password\"}}}"))
auth, err := cnbutils.GenerateCnbAuth("/test/valid_config.json", mockUtils)
assert.NoError(t, err)
assert.Equal(t, "{\"example.com\":\"Basic dXNlcm5hbWU6cGFzc3dvcmQ=\"}", auth)
})
t.Run("skips registry with empty credentials", func(t *testing.T) {
mockUtils.AddFile("/test/valid_config.json", []byte("{\"auths\":{\"example.com\":{}}}"))
auth, err := cnbutils.GenerateCnbAuth("/test/valid_config.json", mockUtils)
assert.NoError(t, err)
assert.Equal(t, "{}", auth)
})
t.Run("successfully generates cnb auth env variable if docker config is not present", func(t *testing.T) {
auth, err := cnbutils.GenerateCnbAuth("", mockUtils)
assert.NoError(t, err)