bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 09:25:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

proxy: support tunnel mode inkcp tls ws

Browse Source
This commit is contained in:
nadoo 2020-11-29 23:13:19 +08:00
parent 87f1f44912
commit e077cb86b4
3 changed files with 91 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
proxy/kcp/kcp.go
View File

@ -139,20 +139,16 @@ func NewKCPDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
func NewKCPServer(s string, p proxy.Proxy) (proxy.Server, error) { func NewKCPServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",") transport := strings.Split(s, ",")
// prepare transport listener
// TODO: check here
if len(transport) < 2 {
return nil, errors.New("[kcp] malformd listener:" + s)
}
k, err := NewKCP(transport[0], nil, p) k, err := NewKCP(transport[0], nil, p)
if err != nil { if err != nil {
return nil, err return nil, err
} }
k.server, err = proxy.ServerFromURL(transport[1], p) if len(transport) > 1 {
if err != nil { k.server, err = proxy.ServerFromURL(transport[1], p)
return nil, err if err != nil {
return nil, err
}
} }
return k, nil return k, nil
@ -190,11 +186,30 @@ func (s *KCP) ListenAndServe() {
// Serve serves connections. // Serve serves connections.
func (s *KCP) Serve(c net.Conn) { func (s *KCP) Serve(c net.Conn) {
// we know the internal server will close the connection after serve
// defer c.Close()
if s.server != nil { if s.server != nil {
s.server.Serve(c) s.server.Serve(c)
return
}
defer c.Close()
rc, dialer, err := s.proxy.Dial("tcp", "")
if err != nil {
log.F("[kcp] %s <-> %s via %s, error in dial: %v", c.RemoteAddr(), s.addr, dialer.Addr(), err)
s.proxy.Record(dialer, false)
return
}
defer rc.Close()
log.F("[kcp] %s <-> %s", c.RemoteAddr(), dialer.Addr())
if err = proxy.Relay(c, rc); err != nil {
log.F("[kcp] %s <-> %s, relay error: %v", c.RemoteAddr(), dialer.Addr(), err)
// record remote conn failure only
if !strings.Contains(err.Error(), s.addr) {
s.proxy.Record(dialer, false)
}
} }
} }

43
proxy/tls/tls.go
View File

@ -85,12 +85,6 @@ func NewTLSDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
func NewTLSServer(s string, p proxy.Proxy) (proxy.Server, error) { func NewTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",") transport := strings.Split(s, ",")
// prepare transport listener
// TODO: check here
if len(transport) < 2 {
return nil, errors.New("[tls] malformd listener:" + s)
}
t, err := NewTLS(transport[0], nil, p) t, err := NewTLS(transport[0], nil, p)
if err != nil { if err != nil {
return nil, err return nil, err
@ -111,9 +105,11 @@ func NewTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
MinVersion: stdtls.VersionTLS12, MinVersion: stdtls.VersionTLS12,
} }
t.server, err = proxy.ServerFromURL(transport[1], p) if len(transport) > 1 {
if err != nil { t.server, err = proxy.ServerFromURL(transport[1], p)
return nil, err if err != nil {
return nil, err
}
} }
return t, nil return t, nil
@ -142,13 +138,32 @@ func (s *TLS) ListenAndServe() {
} }
// Serve serves a connection. // Serve serves a connection.
func (s *TLS) Serve(c net.Conn) { func (s *TLS) Serve(cc net.Conn) {
// we know the internal server will close the connection after serve c := stdtls.Server(cc, s.config)
// defer c.Close()
if s.server != nil { if s.server != nil {
cc := stdtls.Server(c, s.config) s.server.Serve(c)
s.server.Serve(cc) return
}
defer c.Close()
rc, dialer, err := s.proxy.Dial("tcp", "")
if err != nil {
log.F("[tls] %s <-> %s via %s, error in dial: %v", c.RemoteAddr(), s.addr, dialer.Addr(), err)
s.proxy.Record(dialer, false)
return
}
defer rc.Close()
log.F("[tls] %s <-> %s", c.RemoteAddr(), dialer.Addr())
if err = proxy.Relay(c, rc); err != nil {
log.F("[tls] %s <-> %s, relay error: %v", c.RemoteAddr(), dialer.Addr(), err)
// record remote conn failure only
if !strings.Contains(err.Error(), s.addr) {
s.proxy.Record(dialer, false)
}
} }
} }

53
proxy/ws/server.go
View File

@ -20,20 +20,16 @@ func init() {
func NewWSServer(s string, p proxy.Proxy) (proxy.Server, error) { func NewWSServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",") transport := strings.Split(s, ",")
// prepare transport listener
// TODO: check here
if len(transport) < 2 {
return nil, errors.New("[ws] malformd listener:" + s)
}
w, err := NewWS(transport[0], nil, p) w, err := NewWS(transport[0], nil, p)
if err != nil { if err != nil {
return nil, err return nil, err
} }
w.server, err = proxy.ServerFromURL(transport[1], p) if len(transport) > 1 {
if err != nil { w.server, err = proxy.ServerFromURL(transport[1], p)
return nil, err if err != nil {
return nil, err
}
} }
return w, nil return w, nil
@ -62,18 +58,39 @@ func (s *WS) ListenAndServe() {
} }
// Serve serves a connection. // Serve serves a connection.
func (s *WS) Serve(c net.Conn) { func (s *WS) Serve(cc net.Conn) {
// we know the internal server will close the connection after serve c, err := s.NewServerConn(cc)
// defer c.Close() if err != nil {
log.F("[ws] handshake error: %s", err)
return
}
if s.server != nil { if s.server != nil {
sc, err := s.NewServerConn(c) s.server.Serve(c)
if err != nil { return
log.F("[ws] handshake error: %s", err)
return
}
s.server.Serve(sc)
} }
defer c.Close()
rc, dialer, err := s.proxy.Dial("tcp", "")
if err != nil {
log.F("[ws] %s <-> %s via %s, error in dial: %v", c.RemoteAddr(), s.addr, dialer.Addr(), err)
s.proxy.Record(dialer, false)
return
}
defer rc.Close()
log.F("[ws] %s <-> %s", c.RemoteAddr(), dialer.Addr())
if err = proxy.Relay(c, rc); err != nil {
log.F("[ws] %s <-> %s, relay error: %v", c.RemoteAddr(), dialer.Addr(), err)
// record remote conn failure only
if !strings.Contains(err.Error(), s.addr) {
s.proxy.Record(dialer, false)
}
}
} }
// ServerConn is a connection to ws client. // ServerConn is a connection to ws client.