bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-24 01:45:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

check: stop current check process when timeout (#159)

Browse Source
This commit is contained in:
nadoo 2020-05-04 15:33:26 +08:00
parent 061b3da42e
commit 3392db41de
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -381,4 +381,4 @@ glider -config CONFIGPATH -listen :8080 -verbose
- [conflag](https://github.com/nadoo/conflag): command line and config file parse support - [conflag](https://github.com/nadoo/conflag): command line and config file parse support
- [ArchLinux](https://www.archlinux.org/packages/community/x86_64/glider): a great linux distribution with glider pre-built package - [ArchLinux](https://www.archlinux.org/packages/community/x86_64/glider): a great linux distribution with glider pre-built package
- [urlEncode](https://www.w3schools.com/tags/ref_urlencode.asp): you should encode special characters in your sechme. e.g: `@`->`%40` - [urlencode](https://www.w3schools.com/tags/ref_urlencode.asp): you should encode special characters in scheme url. e.g: `@`->`%40`

17
proxy/ssh/ssh.go
View File

@ -49,8 +49,13 @@ func NewSSH(s string, d proxy.Dialer, p proxy.Proxy) (*SSH, error) {
config.Auth = []ssh.AuthMethod{ssh.Password(pass)} config.Auth = []ssh.AuthMethod{ssh.Password(pass)}
} }
if key := privateKeyFile(u.Query().Get("key")); key != nil { if key := u.Query().Get("key"); key != "" {
config.Auth = append(config.Auth, 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{ 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") 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) buffer, err := ioutil.ReadFile(file)
if err != nil { if err != nil {
return nil return nil, err
} }
key, err := ssh.ParsePrivateKey(buffer) key, err := ssh.ParsePrivateKey(buffer)
if err != nil { if err != nil {
return nil return nil, err
} }
return ssh.PublicKeys(key) return ssh.PublicKeys(key), nil
} }

2
strategy/strategy.go
View File

@ -252,6 +252,8 @@ func checkWebSite(fwdr *Forwarder, website string, timeout time.Duration, buf []
} }
defer rc.Close() defer rc.Close()
rc.SetDeadline(time.Now().Add(timeout))
_, err = rc.Write([]byte("GET / HTTP/1.0\r\n\r\n")) _, err = rc.Write([]byte("GET / HTTP/1.0\r\n\r\n"))
if err != nil { if err != nil {
fwdr.Disable() fwdr.Disable()