notkshitij/docker-credential-helpers
1
0
Fork 0
mirror of https://github.com/docker/docker-credential-helpers.git synced 2026-06-13 16:01:28 +05:30
Code Releases 1 Activity

Merge pull request #322 from thaJeztah/pass_dry

Browse Source 
pass: add utilities for encoding/decoding serverURL
This commit is contained in:
Sebastiaan van Stijn
2024-05-10 10:23:32 +02:00
committed by GitHub
parent f64d6b131b d3ef442f59
commit 74840b3740
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pass/pass.go
+21 -6
View File
@@ -87,8 +87,7 @@ func (p Pass) Add(creds *credentials.Credentials) error {
return errors.New("missing credentials") return errors.New("missing credentials")
} }
encoded := base64.URLEncoding.EncodeToString([]byte(creds.ServerURL)) encoded := encodeServerURL(creds.ServerURL)
_, err := p.runPass(creds.Secret, "insert", "-f", "-m", path.Join(PASS_FOLDER, encoded, creds.Username)) _, err := p.runPass(creds.Secret, "insert", "-f", "-m", path.Join(PASS_FOLDER, encoded, creds.Username))
return err return err
} }
@@ -99,7 +98,7 @@ func (p Pass) Delete(serverURL string) error {
return errors.New("missing server url") return errors.New("missing server url")
} }
encoded := base64.URLEncoding.EncodeToString([]byte(serverURL)) encoded := encodeServerURL(serverURL)
_, err := p.runPass("", "rm", "-rf", path.Join(PASS_FOLDER, encoded)) _, err := p.runPass("", "rm", "-rf", path.Join(PASS_FOLDER, encoded))
return err return err
} }
@@ -142,7 +141,7 @@ func (p Pass) Get(serverURL string) (string, string, error) {
return "", "", errors.New("missing server url") return "", "", errors.New("missing server url")
} }
encoded := base64.URLEncoding.EncodeToString([]byte(serverURL)) encoded := encodeServerURL(serverURL)
if _, err := os.Stat(path.Join(getPassDir(), PASS_FOLDER, encoded)); err != nil { if _, err := os.Stat(path.Join(getPassDir(), PASS_FOLDER, encoded)); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
@@ -180,7 +179,7 @@ func (p Pass) List() (map[string]string, error) {
continue continue
} }
serverURL, err := base64.URLEncoding.DecodeString(server.Name()) serverURL, err := decodeServerURL(server.Name())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -194,8 +193,24 @@ func (p Pass) List() (map[string]string, error) {
continue continue
} }
resp[string(serverURL)] = strings.TrimSuffix(usernames[0].Name(), ".gpg") resp[serverURL] = strings.TrimSuffix(usernames[0].Name(), ".gpg")
} }
return resp, nil return resp, nil
} }
// encodeServerURL returns the serverURL in base64-URL encoding to use
// as directory-name in pass storage.
func encodeServerURL(serverURL string) string {
return base64.URLEncoding.EncodeToString([]byte(serverURL))
}
// decodeServerURL decodes base64-URL encoded serverURL. ServerURLs are
// used in encoded format for directory-names in pass storage.
func decodeServerURL(encodedServerURL string) (string, error) {
serverURL, err := base64.URLEncoding.DecodeString(encodedServerURL)
if err != nil {
return "", err
}
return string(serverURL), nil
}
pass/pass_test.go
+1 -2
View File
@@ -3,7 +3,6 @@
package pass package pass
import ( import (
"encoding/base64"
"os" "os"
"path" "path"
"strings" "strings"
@@ -152,7 +151,7 @@ func TestPassHelperWithEmptyServer(t *testing.T) {
} }
} else { } else {
// No credentials; create an empty directory for this server. // No credentials; create an empty directory for this server.
serverURL := base64.URLEncoding.EncodeToString([]byte(cred.ServerURL)) serverURL := encodeServerURL(cred.ServerURL)
p := path.Join(getPassDir(), PASS_FOLDER, serverURL) p := path.Join(getPassDir(), PASS_FOLDER, serverURL)
if err := os.Mkdir(p, 0o755); err != nil { if err := os.Mkdir(p, 0o755); err != nil {
t.Error(err) t.Error(err)