anytls: support cleartext mode
Build / Build (push) Has been cancelled

This commit is contained in:
nadoo committed 2026-06-24 00:07:19 +08:00
1 parent 73a594aae1
commit 533571f1ec
7 files changed
+173 -101

No files matched your search

+7 -1
View File
@@ -20,10 +20,12 @@ type AnyTLS struct {
addr string
password string
withTLS bool
serverName string
skipVerify bool
certFile string
keyFile string
fallback string
tlsConfig *tls.Config
synackTimeout time.Duration
@@ -41,10 +43,12 @@ func NewAnyTLS(s string, d proxy.Dialer, p proxy.Proxy) (*AnyTLS, error) {
proxy: p,
addr: u.Host,
password: u.User.Username(),
withTLS: true,
serverName: query.Get("serverName"),
skipVerify: query.Get("skipVerify") == "true",
certFile: query.Get("cert"),
keyFile: query.Get("key"),
fallback: query.Get("fallback"),
synackTimeout: 10 * time.Second,
}
if a.password == "" {
@@ -103,8 +107,10 @@ func init() {
proxy.AddUsage("anytls", `
AnyTLS client scheme:
anytls://password@host:port[?serverName=SERVERNAME][&skipVerify=true][&cert=PATH][&synackTimeout=10s]
anytlsc://password@host:port (cleartext, without TLS)
AnyTLS server scheme:
anytls://password@host:port?cert=PATH&key=PATH
anytls://password@host:port?cert=PATH&key=PATH[&fallback=127.0.0.1:80]
anytlsc://password@host:port[?fallback=127.0.0.1:80] (cleartext, without TLS)
`)
}
+23 -9
View File
@@ -12,6 +12,7 @@ import (
func init() {
proxy.RegisterDialer("anytls", NewAnyTLSDialer)
proxy.RegisterDialer("anytlsc", NewClearTextDialer)
}
func NewAnyTLSDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
@@ -23,6 +24,15 @@ func NewAnyTLSDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
return a, err
}
func NewClearTextDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
a, err := NewAnyTLS(s, d, nil)
if err != nil {
return nil, fmt.Errorf("[anytlsc] create instance error: %s", err)
}
a.withTLS = false
return a, nil
}
func (s *AnyTLS) Dial(network, addr string) (net.Conn, error) {
if network != "tcp" && network != "tcp4" && network != "tcp6" {
return nil, proxy.ErrNotSupported
@@ -63,18 +73,22 @@ func (s *AnyTLS) newClientSession() (*session, error) {
log.F("[anytls] dial to %s error: %s", s.addr, err)
return nil, err
}
tc := tls.Client(rc, s.tlsConfig)
if err := tc.Handshake(); err != nil {
_ = rc.Close()
c := rc
if s.withTLS {
tc := tls.Client(rc, s.tlsConfig)
if err := tc.Handshake(); err != nil {
_ = rc.Close()
return nil, err
}
c = tc
}
if err := writeAuth(c, s.password, s.padding.authPaddingLen()); err != nil {
_ = c.Close()
return nil, err
}
if err := writeAuth(tc, s.password, s.padding.authPaddingLen()); err != nil {
_ = tc.Close()
return nil, err
}
ss := newSession(tc)
ss := newSession(c)
if err := ss.writeFrame(frame{command: cmdSettings, data: clientSettings(s.padding)}); err != nil {
_ = tc.Close()
_ = c.Close()
return nil, err
}
ss.start()
+51 -9
View File
@@ -1,9 +1,11 @@
package anytls
import (
"bytes"
"crypto/tls"
"errors"
"fmt"
"io"
"net"
"strings"
@@ -14,6 +16,7 @@ import (
func init() {
proxy.RegisterServer("anytls", NewAnyTLSServer)
proxy.RegisterServer("anytlsc", NewClearTextServer)
}
func NewAnyTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
@@ -32,6 +35,15 @@ func NewAnyTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
return a, nil
}
func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
a, err := NewAnyTLS(s, nil, p)
if err != nil {
return nil, fmt.Errorf("[anytlsc] create instance error: %s", err)
}
a.withTLS = false
return a, nil
}
func (s *AnyTLS) ListenAndServe() {
l, err := net.Listen("tcp", s.addr)
if err != nil {
@@ -40,7 +52,7 @@ func (s *AnyTLS) ListenAndServe() {
}
defer l.Close()
log.F("[anytls] listening TCP on %s", s.addr)
log.F("[anytls] listening TCP on %s, with TLS: %v", s.addr, s.withTLS)
for {
c, err := l.Accept()
if err != nil {
@@ -52,19 +64,27 @@ func (s *AnyTLS) ListenAndServe() {
}
func (s *AnyTLS) Serve(c net.Conn) {
tlsConn := tls.Server(c, s.tlsConfig)
if err := tlsConn.Handshake(); err != nil {
_ = tlsConn.Close()
log.F("[anytls] error in tls handshake: %s", err)
return
if s.withTLS {
tlsConn := tls.Server(c, s.tlsConfig)
if err := tlsConn.Handshake(); err != nil {
_ = tlsConn.Close()
log.F("[anytls] error in tls handshake: %s", err)
return
}
c = tlsConn
}
if err := readAuth(tlsConn, s.password); err != nil {
_ = tlsConn.Close()
headBuf := bytes.NewBuffer(nil)
if err := readAuth(io.TeeReader(c, headBuf), s.password); err != nil {
if s.fallback != "" {
s.serveFallback(c, s.fallback, headBuf)
return
}
_ = c.Close()
log.F("[anytls] auth error from %s: %s", c.RemoteAddr(), err)
return
}
ss := newSession(tlsConn)
ss := newSession(c)
ss.start()
for {
st, err := ss.acceptStream()
@@ -76,6 +96,28 @@ func (s *AnyTLS) Serve(c net.Conn) {
}
}
func (s *AnyTLS) serveFallback(c net.Conn, target string, headBuf *bytes.Buffer) {
defer c.Close()
dialer := s.proxy.NextDialer(target)
rc, err := dialer.Dial("tcp", target)
if err != nil {
log.F("[anytls-fallback] %s <-> %s via %s, error in dial: %v", c.RemoteAddr(), target, dialer.Addr(), err)
return
}
defer rc.Close()
if _, err := rc.Write(headBuf.Bytes()); err != nil {
log.F("[anytls-fallback] write to rc error: %v", err)
return
}
log.F("[anytls-fallback] %s <-> %s via %s", c.RemoteAddr(), target, dialer.Addr())
if err := proxy.Relay(c, rc); err != nil {
log.F("[anytls-fallback] %s <-> %s via %s, relay error: %v", c.RemoteAddr(), target, dialer.Addr(), err)
}
}
func (s *AnyTLS) serveStream(ss *session, st *stream) {
defer st.Close()