feat: support socks4a

This commit is contained in:
mzz2017 2020-12-07 14:56:01 +08:00
parent 42c15b9262
commit 121f3680e2

View File

@ -27,10 +27,12 @@ const (
type SOCKS4 struct {
dialer proxy.Dialer
addr string
socks4a bool
}
func init() {
proxy.RegisterDialer("socks4", NewSocks4Dialer)
proxy.RegisterDialer("socks4a", NewSocks4Dialer)
}
// NewSOCKS4 returns a socks4 proxy.
@ -44,6 +46,7 @@ func NewSOCKS4(s string, dialer proxy.Dialer) (*SOCKS4, error) {
h := &SOCKS4{
dialer: dialer,
addr: u.Host,
socks4a: u.Scheme == "socks4a",
}
return h, nil
@ -123,19 +126,36 @@ func (s *SOCKS4) connect(conn net.Conn, target string) error {
return errors.New("[socks4] port number out of range: " + portStr)
}
ip, err := s.lookupIP(host)
bufSize := 8
var ip net.IP
if ip = net.ParseIP(host); ip == nil {
if s.socks4a {
// The client should set the first three bytes of DSTIP to NULL
// and the last byte to a non-zero value.
ip = net.ParseIP("0.0.0.1")
bufSize += len(host) + 1
} else {
ip, err = s.lookupIP(host)
if err != nil {
return err
}
}
}
// taken from https://github.com/h12w/socks/blob/master/socks.go
buf := []byte{
// taken from https://github.com/h12w/socks/blob/master/socks.go and https://en.wikipedia.org/wiki/SOCKS
buf := pool.GetBuffer(bufSize)
defer pool.PutBuffer(buf)
copy(buf, []byte{
Version,
ConnectCommand,
byte(port >> 8), // higher byte of destination port
byte(port), // lower byte of destination port (big endian)
ip[0], ip[1], ip[2], ip[3],
0, // user id
})
if s.socks4a {
copy(buf[8:], host)
buf[len(buf)-1] = 0
}
resp := pool.GetBuffer(8)