ssh: handle error in init conn (#264)

This commit is contained in:
nadoo committed 2021-07-07 19:05:26 +08:00
1 parent 879e736f01
commit a62674838e
8 files changed
+26 -44

No files matched your search

+4 -8
View File
@@ -143,18 +143,14 @@ func NewKCPDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
// NewKCPServer returns a kcp proxy server.
func NewKCPServer(s string, p proxy.Proxy) (proxy.Server, error) {
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
k, err := NewKCP(server, nil, p)
schemes := strings.SplitN(s, ",", 2)
k, err := NewKCP(schemes[0], nil, p)
if err != nil {
return nil, err
}
if chain != "" {
k.server, err = proxy.ServerFromURL(chain, p)
if len(schemes) > 1 {
k.server, err = proxy.ServerFromURL(schemes[1], p)
if err != nil {
return nil, err
}
+4 -8
View File
@@ -24,12 +24,8 @@ func init() {
// NewSmuxServer returns a smux transport layer before the real server.
func NewSmuxServer(s string, p proxy.Proxy) (proxy.Server, error) {
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
u, err := url.Parse(server)
schemes := strings.SplitN(s, ",", 2)
u, err := url.Parse(schemes[0])
if err != nil {
log.F("[smux] parse url err: %s", err)
return nil, err
@@ -40,8 +36,8 @@ func NewSmuxServer(s string, p proxy.Proxy) (proxy.Server, error) {
addr: u.Host,
}
if chain != "" {
m.server, err = proxy.ServerFromURL(chain, p)
if len(schemes) > 1 {
m.server, err = proxy.ServerFromURL(schemes[1], p)
if err != nil {
return nil, err
}
+3 -1
View File
@@ -116,7 +116,9 @@ func (s *SSH) Dial(network, addr string) (net.Conn, error) {
return c, nil
}
s.sshConn.Close()
s.initConn()
if err := s.initConn(); err != nil {
return nil, err
}
return ssh.NewClient(s.sshConn, s.sshChan, s.sshReq).Dial(network, addr)
}
+4 -8
View File
@@ -81,12 +81,8 @@ func NewTLSDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
// NewTLSServer returns a tls transport layer before the real server.
func NewTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
t, err := NewTLS(server, nil, p)
schemes := strings.SplitN(s, ",", 2)
t, err := NewTLS(schemes[0], nil, p)
if err != nil {
return nil, err
}
@@ -106,8 +102,8 @@ func NewTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
MinVersion: stdtls.VersionTLS12,
}
if chain != "" {
t.server, err = proxy.ServerFromURL(chain, p)
if len(schemes) > 1 {
t.server, err = proxy.ServerFromURL(schemes[1], p)
if err != nil {
return nil, err
}
+4 -8
View File
@@ -17,18 +17,14 @@ func init() {
// NewUnixServer returns a unix domain socket server.
func NewUnixServer(s string, p proxy.Proxy) (proxy.Server, error) {
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
unix, err := NewUnix(server, nil, p)
schemes := strings.SplitN(s, ",", 2)
unix, err := NewUnix(schemes[0], nil, p)
if err != nil {
return nil, err
}
if chain != "" {
unix.server, err = proxy.ServerFromURL(chain, p)
if len(schemes) > 1 {
unix.server, err = proxy.ServerFromURL(schemes[1], p)
if err != nil {
return nil, err
}
+4 -8
View File
@@ -18,18 +18,14 @@ func init() {
// NewWSServer returns a ws transport server.
func NewWSServer(s string, p proxy.Proxy) (proxy.Server, error) {
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
w, err := NewWS(server, nil, p)
schemes := strings.SplitN(s, ",", 2)
w, err := NewWS(schemes[0], nil, p)
if err != nil {
return nil, err
}
if chain != "" {
w.server, err = proxy.ServerFromURL(chain, p)
if len(schemes) > 1 {
w.server, err = proxy.ServerFromURL(schemes[1], p)
if err != nil {
return nil, err
}