Skip to content

Commit 2e7a9d6

Browse files
committed
Merge branch 'pull/344' into 'master'
2 parents f544ff3 + 5649250 commit 2e7a9d6

3 files changed

Lines changed: 2 additions & 8 deletions

File tree

cmd/login.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"path/filepath"
2121
"strings"
2222

23-
"github.com/howeyc/gopass"
2423
"github.com/pkg/errors"
2524
"github.com/spf13/cobra"
2625
"github.com/spf13/viper"
26+
"golang.org/x/term"
2727

2828
"github.com/mendersoftware/mender-cli/client/useradm"
2929
"github.com/mendersoftware/mender-cli/log"
@@ -146,7 +146,7 @@ func (c *LoginCmd) maybeGetPassword() error {
146146
if c.password == "" {
147147
fmt.Printf("Password: ")
148148

149-
p, err := gopass.GetPasswdMasked()
149+
p, err := term.ReadPassword(int(os.Stdin.Fd()))
150150
if err != nil {
151151
return err
152152
}

go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/cheggaaa/pb/v3 v3.1.7
77
github.com/google/uuid v1.6.0
88
github.com/gorilla/websocket v1.5.3
9-
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef
109
github.com/mendersoftware/go-lib-micro v0.0.0-20221025103319-e1f941fb3145
1110
github.com/mendersoftware/mender-artifact v0.0.0-20250529094801-7264a90f1074
1211
github.com/pkg/errors v0.9.1
@@ -44,7 +43,6 @@ require (
4443
github.com/subosito/gotenv v1.6.0 // indirect
4544
github.com/ulikunitz/xz v0.5.14 // indirect
4645
go.yaml.in/yaml/v3 v3.0.4 // indirect
47-
golang.org/x/crypto v0.35.0 // indirect
4846
golang.org/x/text v0.28.0 // indirect
4947
google.golang.org/appengine v1.6.8 // indirect
5048
google.golang.org/protobuf v1.36.6 // indirect

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
2424
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2525
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
2626
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
27-
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef h1:A9HsByNhogrvm9cWb28sjiS3i7tcKCkflWFEkHfuAgM=
28-
github.com/howeyc/gopass v0.0.0-20210920133722-c8aef6fb66ef/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
2927
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
3028
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
3129
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -97,8 +95,6 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
9795
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
9896
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
9997
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
100-
golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs=
101-
golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
10298
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
10399
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
104100
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=

0 commit comments

Comments
 (0)