trojan: add new scheme trojanc (trojan cleartext)

This commit is contained in:
nadoo committed 2020-10-11 01:15:28 +08:00
1 parent 175ef16a5c
commit 40ddd1be3a
8 files changed
+71 -29

No files matched your search

+20 -5
View File
@@ -10,6 +10,18 @@ import (
"github.com/nadoo/glider/proxy/socks"
)
// NewClearTextDialer returns a trojan cleartext proxy dialer.
func NewClearTextDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
t, err := NewTrojan(s, d, nil)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
}
t.clearText = true
return t, err
}
// NewTrojanDialer returns a trojan proxy dialer.
func NewTrojanDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
t, err := NewTrojan(s, d, nil)
@@ -49,9 +61,12 @@ func (s *Trojan) dial(network, addr string) (net.Conn, error) {
return nil, err
}
tlsConn := tls.Client(rc, s.tlsConfig)
if err := tlsConn.Handshake(); err != nil {
return nil, err
if !s.clearText {
tlsConn := tls.Client(rc, s.tlsConfig)
if err := tlsConn.Handshake(); err != nil {
return nil, err
}
rc = tlsConn
}
buf := pool.GetWriteBuffer()
@@ -68,9 +83,9 @@ func (s *Trojan) dial(network, addr string) (net.Conn, error) {
buf.Write(socks.ParseAddr(addr))
buf.WriteString("\r\n")
_, err = tlsConn.Write(buf.Bytes())
_, err = rc.Write(buf.Bytes())
return tlsConn, err
return rc, err
}
// DialUDP connects to the given address via the proxy.
+24 -9
View File
@@ -15,6 +15,18 @@ import (
"github.com/nadoo/glider/proxy/socks"
)
// NewClearTextServer returns a trojan cleartext proxy server.
func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
t, err := NewTrojan(s, nil, p)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
}
t.clearText = true
return t, nil
}
// NewTrojanServer returns a trojan proxy server.
func NewTrojanServer(s string, p proxy.Proxy) (proxy.Server, error) {
t, err := NewTrojan(s, nil, p)
@@ -60,18 +72,21 @@ func (s *Trojan) ListenAndServe() {
}
// Serve serves a connection.
func (s *Trojan) Serve(cc net.Conn) {
defer cc.Close()
func (s *Trojan) Serve(c net.Conn) {
defer c.Close()
if cc, ok := cc.(*net.TCPConn); ok {
cc.SetKeepAlive(true)
if c, ok := c.(*net.TCPConn); ok {
c.SetKeepAlive(true)
}
c := tls.Server(cc, s.tlsConfig)
err := c.Handshake()
if err != nil {
log.F("[trojan] error in tls handshake: %s", err)
return
if !s.clearText {
tlsConn := tls.Server(c, s.tlsConfig)
err := tlsConn.Handshake()
if err != nil {
log.F("[trojan] error in tls handshake: %s", err)
return
}
c = tlsConn
}
cmd, target, err := s.readHeader(c)
+14 -7
View File
@@ -18,20 +18,27 @@ import (
// Trojan is a base trojan struct.
type Trojan struct {
dialer proxy.Dialer
proxy proxy.Proxy
addr string
pass [56]byte
dialer proxy.Dialer
proxy proxy.Proxy
addr string
pass [56]byte
clearText bool
tlsConfig *tls.Config
serverName string
skipVerify bool
tlsConfig *tls.Config
certFile string
keyFile string
certFile string
keyFile string
}
func init() {
proxy.RegisterDialer("trojan", NewTrojanDialer)
proxy.RegisterServer("trojan", NewTrojanServer)
proxy.RegisterDialer("trojanc", NewClearTextDialer) // cleartext
proxy.RegisterServer("trojanc", NewClearTextServer) // cleartext
}
// NewTrojan returns a trojan proxy.