Skip to content

Commit e9f9205

Browse files
authored
Merge pull request #147 from blacknon/develop
Version 0.6.14
2 parents 105ec27 + 98ae617 commit e9f9205

File tree

402 files changed

+15067
-17742
lines changed

Some content is hidden

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

402 files changed

+15067
-17742
lines changed

.github/workflows/release.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
116116
- name: Upload artifact
117117
if: matrix.ext == 'rpm'
118-
uses: actions/upload-artifact@v1
118+
uses: actions/upload-artifact@v3
119119
with:
120120
name: build-${{ matrix.goos }}_${{ matrix.goarch }}
121121
path: lssh_${{ steps.package_version.outputs.version }}_${{ matrix.goos }}_${{ matrix.goarch }}.rpm
@@ -127,21 +127,21 @@ jobs:
127127
128128
- name: Upload artifact
129129
if: matrix.ext == 'deb'
130-
uses: actions/upload-artifact@v1
130+
uses: actions/upload-artifact@v3
131131
with:
132132
name: build-${{ matrix.goos }}_${{ matrix.goarch }}
133133
path: lssh_${{ steps.package_version.outputs.version }}_${{ matrix.goos }}_${{ matrix.goarch }}.deb
134134

135135
- name: Upload artifact
136136
if: matrix.ext == 'tar.gz'
137-
uses: actions/upload-artifact@v1
137+
uses: actions/upload-artifact@v3
138138
with:
139139
name: build-${{ matrix.goos }}_${{ matrix.goarch }}
140140
path: lssh_${{ steps.package_version.outputs.version }}_${{ matrix.goos }}_${{ matrix.goarch }}.tar.gz
141141

142142
- name: Upload artifact
143143
if: matrix.ext == 'zip'
144-
uses: actions/upload-artifact@v1
144+
uses: actions/upload-artifact@v3
145145
with:
146146
name: build-${{ matrix.goos }}_${{ matrix.goarch }}
147147
path: lssh_${{ steps.package_version.outputs.version }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip
@@ -213,15 +213,15 @@ jobs:
213213
needs: [create-release]
214214
runs-on: ubuntu-latest
215215
steps:
216-
- uses: actions/download-artifact@v1
216+
- uses: actions/download-artifact@v4
217217
with:
218218
name: create-release
219219

220220
- id: upload-url
221221
run: |
222222
echo "::set-output name=url::$(cat create-release/release_upload_url.txt)"
223223
224-
- uses: actions/download-artifact@v1
224+
- uses: actions/download-artifact@v4
225225
with:
226226
name: build-${{ matrix.goos }}_${{ matrix.goarch }}
227227

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@
1414
/lsshfs
1515
/lssync
1616
*.exe
17+
18+
vendor/*

README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Supported multiple ssh proxy, http/socks5 proxy, x11 forward, and port forwardin
2525
* Supported multiple proxy, **ssh**, **http**, and **socks5** proxy. It's supported multi-stage proxy.
2626
* Supported **ssh-agent**.
2727
* Supported **Local** and **Remote Port forward**, **Dynamic Forward(SOCKS5, http)**, **Reverse Dynamic Forward(SOCKS5, http)** and **x11 forward**.
28+
* Supported KnownHosts.
2829
* By using **NFS Forward**/**NFS Reverse Forward**, the NFS server starts listening to the PATH of the local host or remote machine, making it available via local port forwarding.
2930
* Can use bashrc of local machine at ssh connection destination.
3031
* It supports various authentication methods. Password, Public key, Certificate and PKCS11(Yubikey etc.).
@@ -629,6 +630,29 @@ After that, the forwarded PATH can be used as a mount point on the local machine
629630
If OpenSsh config is loaded, it will be loaded as it is.
630631

631632

633+
</details>
634+
635+
### 10. Check KnownHosts
636+
<details>
637+
638+
Supported check KnownHosts.
639+
If you want to enable check KnownHost, set `check_known_hosts` to `true` in Server Config.
640+
641+
If you want to specify a file to record KnownHosts, add file path to `known_hosts_files`.
642+
643+
[server.CheckKnownHosts]
644+
addr = "check_knwon_hosts.local"
645+
user = "user"
646+
check_known_hosts = true
647+
note = "check known hosts example"
648+
649+
[server.CheckKnownHostsToOriginalFile]
650+
addr = "check_knwon_hosts.local"
651+
user = "user"
652+
check_known_hosts = true
653+
known_hosts_files = ["/path/to/known_hosts"]
654+
note = "check known hosts example"
655+
632656
</details>
633657

634658
## Related projects

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(blacknon@orebibou.com)"
61-
app.Version = "0.6.13"
61+
app.Version = "0.6.14"
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(blacknon@orebibou.com)"
53-
app.Version = "0.6.13"
53+
app.Version = "0.6.14"
5454

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

cmd/lssh/args.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,19 @@ USAGE:
5959
app.Name = "lssh"
6060
app.Usage = "TUI list select and parallel ssh client command."
6161
app.Copyright = "blacknon(blacknon@orebibou.com)"
62-
app.Version = "0.6.13"
62+
app.Version = "0.6.14"
6363

6464
// TODO(blacknon): オプションの追加
6565
// -T ... マウント・リバースマウントのTypeを指定できるようにする(v0.7.0)
66-
// ※ そもそもfuseをそのままfusemountでマウントできるのか?という謎もある
66+
// ※ smb/nfsの指定
6767
// -f ... バックグラウンドでの接続(X11接続やport forwardingをバックグラウンドで実行する場合など)。
6868
// 「ssh -f」と同じ。 (v0.7.0)
6969
// (https://github.com/sevlyar/go-daemon)
70-
// -a ... 自動接続モード(接続が切れてしまった場合、自動的に再接続を試みる)。autossh的なoptionとして追加。 (v0.7.0)
71-
// --autoconnect <num>
72-
// ... 自動接続モード(接続が切れてしまった場合、自動的に再接続を試みる)。再試行の回数指定(デフォルトは3回?)。 (v0.7.0)
7370
// --read_profile
7471
// ... デフォルトではlocalrc読み込みでのshellではsshサーバ上のprofileは読み込まないが、このオプションを指定することで読み込まれるようになる (v0.7.0)
7572
// -P
76-
// ... 3muxを用いたマルチプレクサでのParallel Shell/Command実行を有効にする(v0.7.0)
73+
// ... Terminal multipluxerを用いたParallel Shell/Command実行を有効にする(v0.7.0)
74+
// ※ -pとの排他制御が必要
7775

7876
// Set options
7977
app.Flags = []cli.Flag{

completion/zsh/_lscp

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#compdef lscp
2+
_lscp() {
3+
_arguments -s \
4+
'(-H --host)'{-H,--host}'[Connect to server by name]:server:_hosts' \
5+
'(-l --list)'{-l,--list}'[Print server list from config]' \
6+
'(-F --file)'{-F,--file}'[Specify config file path]:config file:_files' \
7+
'(-p --permission)'{-p,--permission}'[Copy file permission]' \
8+
'(-h --help)'{-h,--help}'[Print this help]' \
9+
'(-v --version)'{-v,--version}'[Print the version]' \
10+
'*:copy_path:_lscp_path_completion'
11+
}
12+
13+
_lscp_path_completion() {
14+
local current_arg="${words[-1]}"
15+
local -a file_list
16+
local prefix="local:"
17+
18+
if [[ "$current_arg" == local:* ]]; then
19+
local path="${current_arg#$prefix}"
20+
file_list=($(compgen -G "${path}*"))
21+
22+
for file in "${file_list[@]}"; do
23+
compadd -S '' "${prefix}${file}"
24+
done
25+
elif [[ "$current_arg" == remote:* ]]; then
26+
return
27+
else
28+
compadd -S '' "local:" "remote:"
29+
fi
30+
}

completion/zsh/_lsftp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#compdef lsftp
2+
_lsftp() {
3+
_arguments -s \
4+
'(-F --file)'{-F,--file}'[Specify config file path]:config file:_files' \
5+
'(-h --help)'{-h,--help}'[Print this help]' \
6+
'(-v --version)'{-v,--version}'[Print the version]'
7+
}

0 commit comments

Comments
 (0)