Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
go.mod: Migrate to golang.org/x/term (#4073)
golang.org/x/crypto/ssh/terminal is deprecated in favor of golang.org/x/term See https://github.com/caddyserver/caddy/pull/4073/checks?check_run_id=2152150495 Error: SA1019: package golang.org/x/crypto/ssh/terminal is deprecated: this package moved to golang.org/x/term. (staticcheck) See https://github.com/caddyserver/caddy/pull/4073/checks?check_run_id=2152228516 Error: SA1019: package golang.org/x/crypto/ssh/terminal is deprecated: this package moved to golang.org/x/term. (staticcheck) Test: go test -count=1 './...'
Simão Gomes Viana committed
Mar 29, 2021 at 20:39 UTC
1c8ea0082822fbc13cb6b86443b908f6a068f385
4 files changed
+12
-8
go.mod
+1
@@ -26,6 +26,7 @@ require (
26
go.uber.org/zap v1.16.0
27
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
28
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
29
+ golang.org/x/term v0.0.0-20210317153231-de623e64d2a6
30
google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98
31
google.golang.org/protobuf v1.24.0 // cannot upgrade until warning is fixed
32
gopkg.in/natefinch/lumberjack.v2 v2.0.0
go.sum
+3
@@ -926,8 +926,11 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
926
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
927
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
928
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
929
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
930
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e h1:AyodaIpKjppX+cBfTASF2E1US3H2JFBj920Ot3rtDjs=
931
golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
932
+golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 h1:EC6+IGYTjPpRfv9a2b/6Puw0W+hLtAhkV1tPsXhutqs=
933
+golang.org/x/term v0.0.0-20210317153231-de623e64d2a6/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
934
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
935
golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
936
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
logging.go
+2
-2
@@ -27,7 +27,7 @@ import (
27
28
"go.uber.org/zap"
29
"go.uber.org/zap/zapcore"
30
- "golang.org/x/crypto/ssh/terminal"
30
+ "golang.org/x/term"
31
)
32
33
func init() {
@@ -670,7 +670,7 @@ func newDefaultProductionLog() (*defaultCustomLog, error) {
670
671
func newDefaultProductionLogEncoder(colorize bool) zapcore.Encoder {
672
encCfg := zap.NewProductionEncoderConfig()
673
- if terminal.IsTerminal(int(os.Stdout.Fd())) {
673
+ if term.IsTerminal(int(os.Stdout.Fd())) {
674
// if interactive terminal, make output more human-readable by default
675
encCfg.EncodeTime = func(ts time.Time, encoder zapcore.PrimitiveArrayEncoder) {
676
encoder.AppendString(ts.UTC().Format("2006/01/02 15:04:05.000"))
modules/caddyhttp/caddyauth/command.go
+6
-6
@@ -25,7 +25,7 @@ import (
25
26
"github.com/caddyserver/caddy/v2"
27
caddycmd "github.com/caddyserver/caddy/v2/cmd"
28
- "golang.org/x/crypto/ssh/terminal"
28
+ "golang.org/x/term"
29
)
30
31
func init() {
@@ -67,27 +67,27 @@ func cmdHashPassword(fs caddycmd.Flags) (int, error) {
67
68
if len(plaintext) == 0 {
69
fd := int(os.Stdin.Fd())
70
- if terminal.IsTerminal(fd) {
70
+ if term.IsTerminal(fd) {
71
// ensure the terminal state is restored on SIGINT
72
- state, _ := terminal.GetState(fd)
72
+ state, _ := term.GetState(fd)
73
c := make(chan os.Signal, 1)
74
signal.Notify(c, os.Interrupt)
75
go func() {
76
<-c
77
- _ = terminal.Restore(fd, state)
77
+ _ = term.Restore(fd, state)
78
os.Exit(caddy.ExitCodeFailedStartup)
79
}()
80
defer signal.Stop(c)
81
82
fmt.Fprint(os.Stderr, "Enter password: ")
83
- plaintext, err = terminal.ReadPassword(fd)
83
+ plaintext, err = term.ReadPassword(fd)
84
fmt.Fprintln(os.Stderr)
85
if err != nil {
86
return caddy.ExitCodeFailedStartup, err
87
}
88
89
fmt.Fprint(os.Stderr, "Confirm password: ")
90
- confirmation, err := terminal.ReadPassword(fd)
90
+ confirmation, err := term.ReadPassword(fd)
91
fmt.Fprintln(os.Stderr)
92
if err != nil {
93
return caddy.ExitCodeFailedStartup, err