package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-06 01:07:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feature: socks5 over unix domain socket(UDS) support

Browse Source 
this feature is compatible with tor proxy.
This commit is contained in:
xjasonlyu
2021-09-09 12:50:23 +08:00
parent e1ca5069e0
commit 07ce5e6422
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
engine/parse.go
View File

@@ -51,11 +51,11 @@ func parseProxy(s string) (proxy.Proxy, error) {
case proto.Reject.String(): case proto.Reject.String():
return proxy.NewReject(), nil return proxy.NewReject(), nil
case proto.HTTP.String(): case proto.HTTP.String():
return proxy.NewHTTP(parseAddrUserPass(u)) return proxy.NewHTTP(parseHTTP(u))
case proto.Socks4.String(): case proto.Socks4.String():
return proxy.NewSocks4(parseAddrUser(u)) return proxy.NewSocks4(parseSocks4(u))
case proto.Socks5.String(): case proto.Socks5.String():
return proxy.NewSocks5(parseAddrUserPass(u)) return proxy.NewSocks5(parseSocks5(u))
case proto.Shadowsocks.String(): case proto.Shadowsocks.String():
return proxy.NewShadowsocks(parseShadowsocks(u)) return proxy.NewShadowsocks(parseShadowsocks(u))
default: default:
@@ -63,14 +63,25 @@ func parseProxy(s string) (proxy.Proxy, error) {
} }
} }
func parseAddrUser(u *url.URL) (address, username string) { func parseHTTP(u *url.URL) (address, username, password string) {
address, username = u.Host, u.User.Username()
password, _ = u.User.Password()
return
}
func parseSocks4(u *url.URL) (address, username string) {
address, username = u.Host, u.User.Username() address, username = u.Host, u.User.Username()
return return
} }
func parseAddrUserPass(u *url.URL) (address, username, password string) { func parseSocks5(u *url.URL) (address, username, password string) {
address, username = parseAddrUser(u) address, username = u.Host, u.User.Username()
password, _ = u.User.Password() password, _ = u.User.Password()
// Socks5 over UDS
if address == "" {
address = u.Path
}
return return
} }

16
proxy/socks5.go
View File

@@ -2,6 +2,7 @@ package proxy
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"io" "io"
"net" "net"
@@ -19,6 +20,9 @@ type Socks5 struct {
user string user string
pass string pass string
// unix indicates if socks5 over UDS is enabled.
unix bool
} }
func NewSocks5(addr, user, pass string) (*Socks5, error) { func NewSocks5(addr, user, pass string) (*Socks5, error) {
@@ -29,11 +33,17 @@ func NewSocks5(addr, user, pass string) (*Socks5, error) {
}, },
user: user, user: user,
pass: pass, pass: pass,
unix: len(addr) > 0 && addr[0] == '/',
}, nil }, nil
} }
func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.Conn, err error) { func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.Conn, err error) {
c, err = dialer.DialContext(ctx, "tcp", ss.Addr()) var network = "tcp"
if ss.unix {
network = "unix"
}
c, err = dialer.DialContext(ctx, network, ss.Addr())
if err != nil { if err != nil {
return nil, fmt.Errorf("connect to %s: %w", ss.Addr(), err) return nil, fmt.Errorf("connect to %s: %w", ss.Addr(), err)
} }
@@ -54,6 +64,10 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
} }
func (ss *Socks5) DialUDP(*M.Metadata) (_ net.PacketConn, err error) { func (ss *Socks5) DialUDP(*M.Metadata) (_ net.PacketConn, err error) {
if ss.unix {
return nil, errors.New("not supported when unix domain socket is enabled")
}
ctx, cancel := context.WithTimeout(context.Background(), tcpConnectTimeout) ctx, cancel := context.WithTimeout(context.Background(), tcpConnectTimeout)
defer cancel() defer cancel()