ssh: reuse underlying connection (#251)

This commit is contained in:
nadoo committed 2021-04-20 15:28:52 +08:00
1 parent 2a7eed7667
commit ddfcaae49c
15 files changed
+46 -24

No files matched your search

+4
View File
@@ -53,6 +53,10 @@ func DialerFromURL(s string, dialer Dialer) (Dialer, error) {
return nil, errors.New("DialerFromURL: dialer cannot be nil")
}
if !strings.Contains(s, "://") {
s = s + "://"
}
scheme := s[:strings.Index(s, ":")]
c, ok := dialerCreators[strings.ToLower(scheme)]
if ok {
File renamed without changes.
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// NewSocks5Dialer returns a socks5 proxy dialer.
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// PktConn .
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// NewSocks5Server returns a socks5 proxy server.
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// NewSSDialer returns a ss proxy dialer.
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"net"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// PktConn .
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// NewSSServer returns a ss proxy server.
+29 -11
View File
@@ -17,7 +17,11 @@ type SSH struct {
dialer proxy.Dialer
proxy proxy.Proxy
addr string
config *ssh.ClientConfig
sshCfg *ssh.ClientConfig
sshConn ssh.Conn
sshChan <-chan ssh.NewChannel
sshReq <-chan *ssh.Request
}
func init() {
@@ -58,14 +62,18 @@ func NewSSH(s string, d proxy.Dialer, p proxy.Proxy) (*SSH, error) {
config.Auth = append(config.Auth, keyAuth)
}
ssh := &SSH{
t := &SSH{
dialer: d,
proxy: p,
addr: u.Host,
config: config,
sshCfg: config,
}
return ssh, nil
if _, port, _ := net.SplitHostPort(t.addr); port == "" {
t.addr = net.JoinHostPort(t.addr, "22")
}
return t, t.initConn()
}
// NewSSHDialer returns a ssh proxy dialer.
@@ -81,21 +89,31 @@ func (s *SSH) Addr() string {
return s.addr
}
// Dial connects to the address addr on the network net via the proxy.
func (s *SSH) Dial(network, addr string) (net.Conn, error) {
c, err := s.dialer.Dial(network, s.addr)
func (s *SSH) initConn() error {
c, err := s.dialer.Dial("tcp", s.addr)
if err != nil {
log.F("[ssh]: dial to %s error: %s", s.addr, err)
return nil, err
return err
}
sshc, ch, req, err := ssh.NewClientConn(c, s.addr, s.config)
s.sshConn, s.sshChan, s.sshReq, err = ssh.NewClientConn(c, s.addr, s.sshCfg)
if err != nil {
log.F("[ssh]: initial connection to %s error: %s", s.addr, err)
return nil, err
return err
}
return ssh.NewClient(sshc, ch, req).Dial(network, addr)
return nil
}
// Dial connects to the address addr on the network net via the proxy.
func (s *SSH) Dial(network, addr string) (c net.Conn, err error) {
c, err = ssh.NewClient(s.sshConn, s.sshChan, s.sshReq).Dial(network, addr)
if err != nil {
log.F("[ssh]: create conn to %s via %s error: %s, try again", addr, s.addr, err)
s.initConn()
c, err = ssh.NewClient(s.sshConn, s.sshChan, s.sshReq).Dial(network, addr)
}
return c, err
}
// DialUDP connects to the given address via the proxy.
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
"github.com/nadoo/glider/proxy/ssr/internal"
"github.com/nadoo/glider/proxy/ssr/internal/cipher"
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// NewClearTextDialer returns a trojan cleartext proxy dialer.
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// PktConn is a udp Packet.Conn.
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pool"
"github.com/nadoo/glider/proxy"
"github.com/nadoo/glider/proxy/socks"
"github.com/nadoo/glider/proxy/protocol/socks"
)
// NewClearTextServer returns a trojan cleartext proxy server.