Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ go 1.23.1
require github.com/aquasecurity/table v1.8.0

require (
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
)
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ github.com/aquasecurity/table v1.8.0 h1:9ntpSwrUfjrM6/YviArlx/ZBGd6ix8W+MtojQcM7
github.com/aquasecurity/table v1.8.0/go.mod h1:eqOmvjjB7AhXFgFqpJUEE/ietg7RrMSJZXyTN8E/wZw=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 h1:XBBHcIb256gUJtLmY22n99HaZTz+r2Z51xUPi01m3wg=
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203/go.mod h1:E1jcSv8FaEny+OP/5k9UxZVw9YFWGj7eI4KR/iOBqCg=
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand All @@ -12,6 +14,8 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
Expand Down
58 changes: 55 additions & 3 deletions internal/secret/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"time"

"github.com/eiannone/keyboard"
"github.com/mahinops/secretcli/internal/utils"
)

Expand Down Expand Up @@ -89,9 +90,13 @@ func (cf *CmdFlags) addSecret(secrets *Secrets) {
username = scanner.Text()

// Input Password
fmt.Print("Enter Password: ")
password, err := getPassword(secrets)

if err != nil {
return
}

scanner.Scan()
password = scanner.Text()

// Input Note (optional)
fmt.Print("Enter Note (optional): ")
Expand Down Expand Up @@ -122,7 +127,54 @@ func (cf *CmdFlags) addSecret(secrets *Secrets) {
fmt.Println("Secret added successfully!")
}

// Edit an existing secret
func getPassword(secrets *Secrets) (string, error) {
fmt.Print("Enter Password (press Tab for a suggested password): ")
password := ""

if err := keyboard.Open(); err != nil {
return "", fmt.Errorf("error opening keyboard: %w", err)
}
defer keyboard.Close()

for {
char, key, err := keyboard.GetKey()

if err != nil {
return "", fmt.Errorf("error reading input: %w", err)
}

if key == keyboard.KeyEnter {
break
}

if key == keyboard.KeyBackspace {
if len(password) > 0 {
password = password[:len(password)-1]
printPassword(password)
}
continue
}

if key == keyboard.KeyTab {
password = secrets.Suggest()
printPassword(password)
continue
}

if char != 0 {
password += string(char)
fmt.Print(string(char))
}
}

return password, nil
}

func printPassword(password string) {
fmt.Printf("\rEnter Password (press Tab for a suggested password): %s", password)
fmt.Print("\033[K")
}

// Edit an existing secret
func (cf *CmdFlags) editSecret(secrets *Secrets, index int) {
if err := secrets.Validate(index); err != nil {
Expand Down
18 changes: 18 additions & 0 deletions internal/secret/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"fmt"
"math/rand"
"os"
"strconv"
"time"
Expand All @@ -12,6 +13,12 @@ import (
"github.com/mahinops/secretcli/internal/utils"
)

const (
// Define the characters to use in the password
letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_=+[]{}|;:,.<>?/"
passwordLength = 18
)

// Function to add a new secret
func (secrets *Secrets) Add(title, username, password, note, email, website string) error {
if title == "" {
Expand Down Expand Up @@ -112,3 +119,14 @@ func (secrets *Secrets) Export() error {

return nil
}

func (secrets *Secrets) Suggest() string {
rand.NewSource(time.Now().UnixNano())
password := make([]byte, passwordLength)

for i := range password {
password[i] = letterBytes[rand.Intn(len(letterBytes))]
}

return string(password)
}
28 changes: 28 additions & 0 deletions vendor/github.com/eiannone/keyboard/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/github.com/eiannone/keyboard/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions vendor/github.com/eiannone/keyboard/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 81 additions & 0 deletions vendor/github.com/eiannone/keyboard/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading