Skip to content

Add password flag for authentication #43

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

Merged
merged 3 commits into from
Feb 27, 2020
Merged

Add password flag for authentication #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6af292
Add password flag for authentication
BrainBlasted Sep 6, 2019
f2bb9f5
commands: Fix up the interactive auth flow
BrainBlasted Sep 6, 2019
bd378a8
commands: Remove redundant string() cast on pass
BrainBlasted Oct 9, 2019
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
4 changes: 4 additions & 0 deletions cmd/writeas/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ func main() {
Name: "verbose, v",
Usage: "Make the operation more talkative",
},
cli.StringFlag{
Name: "password, p",
Usage: "The password for the account being logged into",
},
},
},
{
Expand Down
23 changes: 14 additions & 9 deletions commands/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,23 +408,28 @@ func CmdAuth(c *cli.Context) error {
}
}

fmt.Print("Password: ")
pass, err := gopass.GetPasswdMasked()
if err != nil {
return cli.NewExitError(fmt.Sprintf("error reading password: %v", err), 1)
}
// Take password from argument, and fall back to input
pass := c.String("p")
if pass == "" {
fmt.Print("Password: ")
enteredPass, err := gopass.GetPasswdMasked()
if err != nil {
return cli.NewExitError(fmt.Sprintf("error reading password: %v", err), 1)
}

// Validate password
if len(pass) == 0 {
return cli.NewExitError("Please enter your password.", 1)
// Validate password
if len(enteredPass) == 0 {
return cli.NewExitError("Please enter your password.", 1)
}
pass = string(enteredPass)
}

if config.IsTor(c) {
log.Info(c, "Logging in via hidden service...")
} else {
log.Info(c, "Logging in...")
}
err = api.DoLogIn(c, username, string(pass))
err = api.DoLogIn(c, username, pass)
if err != nil {
return cli.NewExitError(fmt.Sprintf("error logging in: %v", err), 1)
}
Expand Down