Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

SSH Bugfixes Early April 2024 (#551)

Browse Source 
* fix: add vix for missing known_hosts file

In a recent cleanup, I accidentally deleted this fix from before. This
adds it back.

* chore: clarify that the ssh should use private key
This commit is contained in:
Sylvie Crowe 2024-04-05 10:54:12 -07:00 committed by GitHub
parent 181e14f55c
commit 84cea373a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/common/modals/createremoteconn.tsx
View File

@ -312,7 +312,7 @@ class CreateRemoteConnModal extends React.Component<{}, {}> {
endDecoration: ( endDecoration: (
<InputDecoration> <InputDecoration>
<Tooltip <Tooltip
message={`(Required) The path to your ssh key file.`} message={`(Required) The path to your ssh private key file.`}
icon={<i className="fa-sharp fa-regular fa-circle-question" />} icon={<i className="fa-sharp fa-regular fa-circle-question" />}
> >
<i className="fa-sharp fa-regular fa-circle-question" /> <i className="fa-sharp fa-regular fa-circle-question" />

2
src/app/common/modals/editremoteconn.tsx
View File

@ -338,7 +338,7 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
endDecoration: ( endDecoration: (
<InputDecoration> <InputDecoration>
<Tooltip <Tooltip
message={`(Required) The path to your ssh key file.`} message={`(Required) The path to your ssh private key file.`}
icon={<i className="fa-sharp fa-regular fa-circle-question" />} icon={<i className="fa-sharp fa-regular fa-circle-question" />}
> >
<i className="fa-sharp fa-regular fa-circle-question" /> <i className="fa-sharp fa-regular fa-circle-question" />

6
wavesrv/pkg/remote/sshclient.go
View File

@ -412,6 +412,12 @@ func createHostKeyCallback(opts *sstore.SSHOpts) (ssh.HostKeyCallback, error) {
} }
} }
if basicCallback == nil {
basicCallback = func(hostname string, remote net.Addr, key ssh.PublicKey) error {
return &knownhosts.KeyError{}
}
}
waveHostKeyCallback := func(hostname string, remote net.Addr, key ssh.PublicKey) error { waveHostKeyCallback := func(hostname string, remote net.Addr, key ssh.PublicKey) error {
err := basicCallback(hostname, remote, key) err := basicCallback(hostname, remote, key)
if err == nil { if err == nil {