update

Author: LeeEirc

cmd/ssh.go

@@ -82,6 +82,7 @@ jmstool ssh [email protected] -p 2222
 			_ = cmd.Help()
 			os.Exit(1)
 		}
+		auths := make([]gossh.AuthMethod, 0, 2)
 
 		if flagPort, err := cmd.PersistentFlags().GetString("port"); err == nil {
 			port = flagPort
@@ -91,8 +92,9 @@ jmstool ssh [email protected] -p 2222
 		}
 		if flagPassword, err := cmd.PersistentFlags().GetString("password"); err == nil {
 			password = flagPassword
+			auths = append(auths, gossh.Password(password))
 		}
-		auths := make([]gossh.AuthMethod, 0, 2)
+
 
 		if password == "" && privateFile == "" {
 			if _, err := fmt.Fprintf(os.Stdout, "%s@%s password: ", username, host); err != nil {

cmd/telnet.go

@@ -77,7 +77,7 @@ jmstool telnet [email protected] -p 23 -P 1212
 		if xterm == "" {
 			xterm = "xterm-256color"
 		}
-		var customSuccess *regexp.Regexp
+		var customSuccess = tclientlib.DefaultLoginSuccessPattern
 		if custom != "" {
 			customSuccess = regexp.MustCompile(custom)
 		}
@@ -93,7 +93,7 @@ jmstool telnet [email protected] -p 23 -P 1212
 				High:     h,
 				TermType: xterm,
 			},
-			CustomSuccessRegex: customSuccess,
+			LoginSuccessRegex: customSuccess,
 		}
 		tclientlib.SetMode(tclientlib.DebugMode)
 		client, err := tclientlib.Dial("tcp", net.JoinHostPort(host, port), &conf)
@@ -117,7 +117,6 @@ jmstool telnet [email protected] -p 23 -P 1212
 			sigChan <- struct{}{}
 		}()
 		sigwinchCh := make(chan os.Signal, 1)
-		WatchWindowSize(sigwinchCh)
 		for {
 			select {
 			case <-sigChan:

go.mod

@@ -3,7 +3,7 @@ module github.com/LeeEirc/jmstool
 go 1.15
 
 require (
-	github.com/LeeEirc/tclientlib v0.0.0-20201204094839-0ca50e509e92
+	github.com/LeeEirc/tclientlib v0.0.0-20201208031857-c210dd977a04
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/viper v1.6.3

go.sum

@@ -1,8 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/LeeEirc/tclientlib v0.0.0-20201204094839-0ca50e509e92 h1:hKd6x2DwRp/n2xCVuVcWRjVifNUWDuEGBbn4LBB7S4Y=
-github.com/LeeEirc/tclientlib v0.0.0-20201204094839-0ca50e509e92/go.mod h1:TF2v0XZYyRcZfx4NmA/EEFRkdKZLsQd8YnlhGKl1KUA=
+github.com/LeeEirc/tclientlib v0.0.0-20201208031857-c210dd977a04 h1:j2XxH6wbtZUHMc10CUIqWNPw4Z8COMfzWNlMnsvZmUM=
+github.com/LeeEirc/tclientlib v0.0.0-20201208031857-c210dd977a04/go.mod h1:TF2v0XZYyRcZfx4NmA/EEFRkdKZLsQd8YnlhGKl1KUA=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=