mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
check: stop current check process when timeout (#159)
This commit is contained in:
1 parent
061b3da42e
commit
3392db41de
3 files changed
+14
-7
No files matched your search
+11
-6
@@ -49,8 +49,13 @@ func NewSSH(s string, d proxy.Dialer, p proxy.Proxy) (*SSH, error) {
|
||||
config.Auth = []ssh.AuthMethod{ssh.Password(pass)}
|
||||
}
|
||||
|
||||
if key := privateKeyFile(u.Query().Get("key")); key != nil {
|
||||
config.Auth = append(config.Auth, key)
|
||||
if key := u.Query().Get("key"); key != "" {
|
||||
keyAuth, err := privateKeyAuth(key)
|
||||
if err != nil {
|
||||
log.F("[ssh] read key file error: %s", err)
|
||||
return nil, err
|
||||
}
|
||||
config.Auth = append(config.Auth, keyAuth)
|
||||
}
|
||||
|
||||
ssh := &SSH{
|
||||
@@ -98,16 +103,16 @@ func (s *SSH) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.Addr
|
||||
return nil, nil, errors.New("ssh client does not support udp")
|
||||
}
|
||||
|
||||
func privateKeyFile(file string) ssh.AuthMethod {
|
||||
func privateKeyAuth(file string) (ssh.AuthMethod, error) {
|
||||
buffer, err := ioutil.ReadFile(file)
|
||||
if err != nil {
|
||||
return nil
|
||||
return nil, err
|
||||
}
|
||||
|
||||
key, err := ssh.ParsePrivateKey(buffer)
|
||||
if err != nil {
|
||||
return nil
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return ssh.PublicKeys(key)
|
||||
return ssh.PublicKeys(key), nil
|
||||
}
|
||||
Reference in new issue
Block a user