Merge pull request #144 from blacknon/develop

version 0.6.13

- bugfix: when selecting a server from the second page onwards using the mouse.
- bugfix: Corrected to disconnect if ssh connection is made using Proxy when ssh connection fails.
- update go-sshlib. v0.1.16 to v0.1.18

Author: blacknon

cmd/lscp/args.go

@@ -58,7 +58,7 @@ USAGE:
 	app.Name = "lscp"
 	app.Usage = "TUI list select and parallel scp client command."
 	app.Copyright = "blacknon([email protected])"
-	app.Version = "0.6.12"
+	app.Version = "0.6.13"
 
 	// options
 	// TODO(blacknon): オプションの追加(0.7.0)

cmd/lsftp/args.go

@@ -50,7 +50,7 @@ USAGE:
 	app.Name = "lsftp"
 	app.Usage = "TUI list select and parallel sftp client command."
 	app.Copyright = "blacknon([email protected])"
-	app.Version = "0.6.12"
+	app.Version = "0.6.13"
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{Name: "file,F", Value: defConf, Usage: "config file path"},

cmd/lssh/args.go

@@ -59,7 +59,7 @@ USAGE:
 	app.Name = "lssh"
 	app.Usage = "TUI list select and parallel ssh client command."
 	app.Copyright = "blacknon([email protected])"
-	app.Version = "0.6.12"
+	app.Version = "0.6.13"
 
 	// TODO(blacknon): オプションの追加
 	//     -T       ... マウント・リバースマウントのTypeを指定できるようにする(v0.7.0)

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
 	github.com/blacknon/crypto11 v1.2.7 // indirect
-	github.com/blacknon/go-sshlib v0.1.16
+	github.com/blacknon/go-sshlib v0.1.18
 	github.com/blacknon/go-x11auth v0.1.0 // indirect
 	github.com/blacknon/textcol v0.0.1
 	github.com/c-bata/go-prompt v0.2.6

go.sum

@@ -16,8 +16,8 @@ github.com/blacknon/go-nfs-sshlib v0.0.3 h1:tq83kTZibrr99/GCn0pqkJhmBTDMupL/eMI3
 github.com/blacknon/go-nfs-sshlib v0.0.3/go.mod h1:jaCmHgFoj8j08rGrBnhJ4nFO7nUWs4xFrUd2vEPwyx8=
 github.com/blacknon/go-prompt v0.2.7 h1:dVdTqVplKvpT/k4bB9BlbcBYl/k6amYX5tvjYBmuKkI=
 github.com/blacknon/go-prompt v0.2.7/go.mod h1:zNBmC/BPAyr+3ey1oRhPxuXJS9zz1lEmJpwaoQroe3w=
-github.com/blacknon/go-sshlib v0.1.16 h1:de5KXEYalMzknPWwSbKEr/Z3CxgOfMyiQC5+sfzYwLg=
-github.com/blacknon/go-sshlib v0.1.16/go.mod h1:upfnjVHf/Lh7ysT3dU1ziHKtzRQ1J62JyrShZ7FlNSI=
+github.com/blacknon/go-sshlib v0.1.18 h1:gzkplZuAH2aHARng2YbiEjzGufZomPdGoMQuqmdA2R0=
+github.com/blacknon/go-sshlib v0.1.18/go.mod h1:DN5Vkl/FpEzVxGoS0p8uBsBoHpVywiHbALr9UxcfJxw=
 github.com/blacknon/go-x11auth v0.1.0 h1:SnljCPWcvglWeGAlKc1RAPMHnOfMpM9+GrTGEUQ1lqQ=
 github.com/blacknon/go-x11auth v0.1.0/go.mod h1:SKOCa19LluXHyB+OaLYobquzceE0SWxVW7e/qU5xGBM=
 github.com/blacknon/textcol v0.0.1 h1:x9h7yLPGyr8Pdz12XJ30h7Iz5mJlKd0CzfGYxhrmnk8=

list/event.go

@@ -150,8 +150,9 @@ func (l *ListInfo) keyEvent() (lineData []string) {
 				// mouse select line is (ev.MouseY - headLine) line.
 				mouseSelectLine := ev.MouseY - headLine
 
-				if mouseSelectLine <= len(l.ViewText)-headLine {
-					l.CursorLine = mouseSelectLine
+				pageOffset := (l.CursorLine / height) * height
+				if mouseSelectLine >= 0 && mouseSelectLine < height && pageOffset+mouseSelectLine < len(l.ViewText) {
+					l.CursorLine = pageOffset + mouseSelectLine
 				}
 				l.draw()
 			}

ssh/connect.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/blacknon/go-sshlib"
 	"github.com/blacknon/lssh/conf"
+	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/proxy"
 )
 
@@ -98,7 +99,15 @@ func (r *Run) CreateSshConnect(server string) (connect *sshlib.Connect, err erro
 
 	err = connect.CreateClient(s.Addr, s.Port, s.User, r.serverAuthMethodMap[server])
 
-	return
+	if err != nil {
+		if client, ok := dialer.(*ssh.Client); ok {
+			client.Close()
+		}
+
+		return nil, err
+	}
+
+	return connect, nil
 }
 
 // proxy struct