Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #162 (docker-credential-pass does not work with username containing forward-slash) #267

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix issue #162 (docker-credential-pass does not work with username containing forward-slash) #267

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4335b3
update go to 1.20
crazy-max Apr 16, 2023
8bad466
update golangci-lint to v1.51.1
crazy-max Apr 16, 2023
c9d5f99
remove deprecated golangci-lint linters
crazy-max Apr 16, 2023
f898af7
Fix username slash issue
davcosentino May 9, 2023
4e374e8
Merge branch 'docker:master' into master
davcosentino May 10, 2023
8dc76c1
Merge branch 'docker:master' into master
davcosentino Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions pass/pass.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ func (p Pass) Add(creds *credentials.Credentials) error {

encoded := base64.URLEncoding.EncodeToString([]byte(creds.ServerURL))

_, err := p.runPass(creds.Secret, "insert", "-f", "-m", path.Join(PASS_FOLDER, encoded, creds.Username))
username := creds.Username
if strings.Contains(username, "/") {
username = base64.URLEncoding.EncodeToString([]byte(creds.Username))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know if pass supports spaces in usernames? If it does, perhaps we could swap "/" for " " (as I don't think we support spaces in usernames, so that would be non-ambiguous).

Advantage would be that the username would still be readable (I don't use pass myself, but ISTR there's tools to manage credentials in pass, which would otherwise see a base64-encoded username (which is not very user-friendly 😅)

}

_, err := p.runPass(creds.Secret, "insert", "-f", "-m", path.Join(PASS_FOLDER, encoded, username))
return err
}

Expand Down Expand Up @@ -160,8 +165,13 @@ func (p Pass) Get(serverURL string) (string, string, error) {
}

actual := strings.TrimSuffix(usernames[0].Name(), ".gpg")
username := actual
decodedUsername, err := base64.URLEncoding.DecodeString(actual)
if err == nil {
username = string(decodedUsername)
}
secret, err := p.runPass("", "show", path.Join(PASS_FOLDER, encoded, actual))
return actual, secret, err
return username, secret, err
}

// List returns the stored URLs and corresponding usernames for a given credentials label
Expand Down Expand Up @@ -193,6 +203,10 @@ func (p Pass) List() (map[string]string, error) {
}

resp[string(serverURL)] = strings.TrimSuffix(usernames[0].Name(), ".gpg")
decodedUsername, err := base64.URLEncoding.DecodeString(strings.TrimSuffix(usernames[0].Name(), ".gpg"))
if err == nil {
resp[string(serverURL)] = string(decodedUsername)
}
}

return resp, nil
Expand Down