Skip to content

Commit 12b2e90

Browse files
blacknonblacknon
authored
Merge pull request #139 from blacknon/develop
Version 0.6.10
2 parents 190bbba + e47a484 commit 12b2e90

File tree

150 files changed

+10164
-5870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+10164
-5870
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# Meta files
22
*.DS_Store
3+
# Sublime text
34
*.sublime-*
5+
## VSCode
46
.vscode
7+
## GoLand
8+
.idea
59

610
# Binary programs
711
/lssh

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ option(lssh)
139139
# run command parallel in selected server over ssh.
140140
lssh -p command...
141141

142-
### lscp
142+
### lscpd
143143

144144
run command.
145145

‎cmd/lscp/args.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ USAGE:
5858
app.Name = "lscp"
5959
app.Usage = "TUI list select and parallel scp client command."
6060
app.Copyright = "blacknon([email protected])"
61-
app.Version = "0.6.9"
61+
app.Version = "0.6.10"
6262

6363
// options
6464
// TODO(blacknon): オプションの追加(0.7.0)

‎cmd/lsftp/args.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ USAGE:
5050
app.Name = "lsftp"
5151
app.Usage = "TUI list select and parallel sftp client command."
5252
app.Copyright = "blacknon([email protected])"
53-
app.Version = "0.6.9"
53+
app.Version = "0.6.10"
5454

5555
app.Flags = []cli.Flag{
5656
cli.StringFlag{Name: "file,F", Value: defConf, Usage: "config file path"},

‎cmd/lssh/args.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ USAGE:
5959
app.Name = "lssh"
6060
app.Usage = "TUI list select and parallel ssh client command."
6161
app.Copyright = "blacknon([email protected])"
62-
app.Version = "0.6.9"
62+
app.Version = "0.6.10"
6363

6464
// TODO(blacknon): オプションの追加
65+
// -m ... NFSマウントで、リモートホストの特定ディレクトリをローカルにマウント可能にする (v0.7.0)
66+
// -M ... リバースNFSマウントで、リモートホストの特定ディレクトリをローカルにマウント可能にする (v0.7.0)
6567
// -f ... バックグラウンドでの接続(X11接続やport forwardingをバックグラウンドで実行する場合など)。
6668
// 「ssh -f」と同じ。 (v0.7.0)
6769
// (https://github.com/sevlyar/go-daemon)

‎conf/main.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@ conf is a package used to read configuration file (~/.lssh.conf).
1111
// - Azure Bastion
1212
// - GCP(gcloud compute ssh)
1313

14-
// TODO(blacknon): if/whenなどを使って、条件に応じて設定を追加するような仕組みを実装したい
14+
// TODO(blacknon): if/whenなどを使って、条件に応じて設定を追加するような仕組みを実装したい(v0.7.0)
1515
// ex) 現在のipアドレスのrangeが192.168.10.0/24 => xxxのnwだからproxy serverが必要
1616

17+
// TODO(blacknon): 接続成功時に特定のコマンドを実行可能にする(接続前しか今はないので)
18+
1719
package conf
1820

1921
import (
2022
"crypto/md5"
2123
"encoding/hex"
2224
"fmt"
25+
"log"
2326
"os"
2427
"strings"
2528
"time"
@@ -138,18 +141,18 @@ func (c *Config) checkFormatServerConf() (ok bool) {
138141
for k, v := range c.Server {
139142
// Address Set Check
140143
if v.Addr == "" {
141-
fmt.Printf("%s: 'addr' is not set.\n", k)
144+
log.Printf("%s: 'addr' is not set.\n", k)
142145
ok = false
143146
}
144147

145148
// User Set Check
146149
if v.User == "" {
147-
fmt.Printf("%s: 'user' is not set.\n", k)
150+
log.Printf("%s: 'user' is not set.\n", k)
148151
ok = false
149152
}
150153

151154
if !checkFormatServerConfAuth(v) {
152-
fmt.Printf("%s: Authentication information is not set.\n", k)
155+
log.Printf("%s: Authentication information is not set.\n", k)
153156
ok = false
154157
}
155158
}
@@ -167,7 +170,7 @@ func Read(confPath string) (c Config) {
167170
// Read config file
168171
_, err := toml.DecodeFile(confPath, &c)
169172
if err != nil {
170-
fmt.Println(err)
173+
log.Println(err)
171174
os.Exit(1)
172175
}
173176
}

‎go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ require (
1212
github.com/VividCortex/ewma v1.2.0 // indirect
1313
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
1414
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect
15-
github.com/blacknon/go-sshlib v0.1.13
15+
github.com/blacknon/crypto11 v1.2.7 // indirect
16+
github.com/blacknon/go-sshlib v0.1.15
1617
github.com/blacknon/go-x11auth v0.1.0 // indirect
1718
github.com/blacknon/textcol v0.0.1
1819
github.com/c-bata/go-prompt v0.2.6
@@ -42,14 +43,12 @@ require (
4243
github.com/thales-e-security/pool v0.0.2 // indirect
4344
github.com/urfave/cli v1.21.0
4445
github.com/vbauerster/mpb v3.4.0+incompatible
45-
golang.org/x/crypto v0.17.0
46-
golang.org/x/net v0.10.0
47-
golang.org/x/sys v0.19.0
48-
golang.org/x/term v0.19.0 // indirect
46+
golang.org/x/crypto v0.26.0
47+
golang.org/x/net v0.28.0
48+
golang.org/x/sys v0.23.0
49+
golang.org/x/term v0.23.0 // indirect
4950
gopkg.in/yaml.v3 v3.0.1 // indirect
5051
)
5152

52-
require github.com/blacknon/crypto11 v1.2.7 // indirect
53-
5453
// replace
5554
replace github.com/c-bata/go-prompt v0.2.6 => github.com/blacknon/go-prompt v0.2.7

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/blacknon/crypto11 v1.2.7 h1:LKrnCeXAk4jQmpJTeg/tVvNjqEgKHIE+tYSNXQj8F
1414
github.com/blacknon/crypto11 v1.2.7/go.mod h1:Z24sFD9pMX3NdUFzX52ggcV7HurAYAGvxud73BrHudA=
1515
github.com/blacknon/go-prompt v0.2.7 h1:dVdTqVplKvpT/k4bB9BlbcBYl/k6amYX5tvjYBmuKkI=
1616
github.com/blacknon/go-prompt v0.2.7/go.mod h1:zNBmC/BPAyr+3ey1oRhPxuXJS9zz1lEmJpwaoQroe3w=
17-
github.com/blacknon/go-sshlib v0.1.13 h1:QoFoMuGefHWOTr18riHoQux4/lVrrDmsfvBTNuueeNI=
18-
github.com/blacknon/go-sshlib v0.1.13/go.mod h1:Kxbot2GEniRqBduRtw8Tq6E8XtPLrFEKFmAHdlR+ipk=
17+
github.com/blacknon/go-sshlib v0.1.15 h1:3yd50Y+/DsMOkCpm4szomcZg0yS9DebXIsfnCXhiXfI=
18+
github.com/blacknon/go-sshlib v0.1.15/go.mod h1:5oa1CR8KJjlgvv+gP9JJC5oHOfXXKpIFkRsM4Ccm22A=
1919
github.com/blacknon/go-x11auth v0.1.0 h1:SnljCPWcvglWeGAlKc1RAPMHnOfMpM9+GrTGEUQ1lqQ=
2020
github.com/blacknon/go-x11auth v0.1.0/go.mod h1:SKOCa19LluXHyB+OaLYobquzceE0SWxVW7e/qU5xGBM=
2121
github.com/blacknon/textcol v0.0.1 h1:x9h7yLPGyr8Pdz12XJ30h7Iz5mJlKd0CzfGYxhrmnk8=
@@ -88,13 +88,13 @@ github.com/vbauerster/mpb v3.4.0+incompatible/go.mod h1:zAHG26FUhVKETRu+MWqYXcI7
8888
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
8989
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
9090
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
91-
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
92-
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
91+
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
92+
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
9393
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
9494
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
9595
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
96-
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
97-
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
96+
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
97+
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
9898
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9999
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
100100
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -109,11 +109,11 @@ golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7w
109109
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
110110
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
111111
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
112-
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
113-
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
112+
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
113+
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
114114
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
115-
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
116-
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
115+
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
116+
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
117117
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
118118
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
119119
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎scp/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,10 @@ func (cp *Scp) pullPath(client *ScpConnect) {
432432
}
433433

434434
p := walker.Path()
435-
rp, _ := filepath.Rel(remoteBase, fileName)
435+
// rp, _ := filepath.Rel(remoteBase, fileName)
436+
rp, _ := filepath.Rel(remoteBase, p)
436437
if fileName == "" {
437-
rp, _ = filepath.Rel(remoteBase, p)
438+
rp, _ = filepath.Rel(remoteBase, fileName)
438439
}
439440
lpath := filepath.Join(baseDir, rp)
440441

‎ssh/connect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (r *Run) CreateSshConnect(server string) (connect *sshlib.Connect, err erro
2828
}
2929

3030
// setup dialer
31-
var dialer proxy.Dialer
31+
var dialer sshlib.ProxyDialer
3232
dialer = proxy.Direct
3333

3434
// Connect loop proxy server

0 commit comments

Comments
 (0)