kayos/go-socks5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix udp packet bug

Browse Source
This commit is contained in:
mo 2020-04-23 23:40:00 +08:00
parent f2844250ff
commit 1a22ef1ad8
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packet.go
View File

@ -44,10 +44,10 @@ func NewPacket(destAddr string, data []byte) (p Packet, err error) {
if ip := net.ParseIP(host); ip != nil { if ip := net.ParseIP(host); ip != nil {
if ip4 := ip.To4(); ip4 != nil { if ip4 := ip.To4(); ip4 != nil {
p.ATYP = ATYPIPv4 p.ATYP = ATYPIPv4
p.DstAddr.IP = ip4 p.DstAddr.IP = ip
} else { } else {
p.ATYP = ATYPIPV6 p.ATYP = ATYPIPV6
p.DstAddr.IP = ip.To16() p.DstAddr.IP = ip
} }
} else { } else {
if len(host) > math.MaxUint8 { if len(host) > math.MaxUint8 {
@ -57,6 +57,7 @@ func NewPacket(destAddr string, data []byte) (p Packet, err error) {
p.ATYP = ATYPDomain p.ATYP = ATYPDomain
p.DstAddr.FQDN = host p.DstAddr.FQDN = host
} }
p.Data = data
return return
} }
@ -69,12 +70,15 @@ func (sf *Packet) Parses(b []byte) error {
// FRAG // FRAG
sf.Frag = b[2] sf.Frag = b[2]
sf.ATYP = b[3] sf.ATYP = b[3]
headLen := 4
switch sf.ATYP { switch sf.ATYP {
case ATYPIPv4: case ATYPIPv4:
headLen += net.IPv4len + 2
sf.DstAddr.IP = net.IPv4(b[4], b[5], b[6], b[7]) sf.DstAddr.IP = net.IPv4(b[4], b[5], b[6], b[7])
sf.DstAddr.Port = buildPort(b[4+net.IPv4len], b[4+net.IPv4len+1]) sf.DstAddr.Port = buildPort(b[4+net.IPv4len], b[4+net.IPv4len+1])
case ATYPIPV6: case ATYPIPV6:
if len(b) <= (4 + net.IPv6len + 2) { headLen += net.IPv6len + 2
if len(b) <= headLen {
return errors.New("too short") return errors.New("too short")
} }
@ -82,7 +86,8 @@ func (sf *Packet) Parses(b []byte) error {
sf.DstAddr.Port = buildPort(b[4+net.IPv6len], b[4+net.IPv6len+1]) sf.DstAddr.Port = buildPort(b[4+net.IPv6len], b[4+net.IPv6len+1])
case ATYPDomain: case ATYPDomain:
addrLen := int(b[4]) addrLen := int(b[4])
if len(b) <= (4 + 1 + addrLen + 2) { headLen += 1 + addrLen + 2
if len(b) <= headLen {
return errors.New("too short") return errors.New("too short")
} }
str := make([]byte, addrLen) str := make([]byte, addrLen)
@ -92,5 +97,25 @@ func (sf *Packet) Parses(b []byte) error {
default: default:
return errUnrecognizedAddrType return errUnrecognizedAddrType
} }
sf.Data = b[headLen:]
return nil return nil
} }
func (sf *Packet) Header() []byte {
bs := make([]byte, 0, 32)
bs = append(bs, []byte{byte(sf.RSV << 8), byte(sf.RSV), sf.Frag}...)
switch sf.ATYP {
case ATYPIPv4:
bs = append(bs, ATYPIPv4)
bs = append(bs, sf.DstAddr.IP...)
case ATYPIPV6:
bs = append(bs, ATYPIPV6)
bs = append(bs, sf.DstAddr.IP...)
case ATYPDomain:
bs = append(bs, ATYPDomain)
bs = append(bs, []byte(sf.DstAddr.FQDN)...)
}
hi, lo := breakPort(sf.DstAddr.Port)
bs = append(bs, hi, lo)
return bs
}

15
request.go
View File

@ -286,20 +286,7 @@ func (s *Server) handleAssociate(ctx context.Context, writer io.Writer, req *Req
} }
tmpBufPool := s.bufferPool.Get() tmpBufPool := s.bufferPool.Get()
proBuf := tmpBufPool proBuf := tmpBufPool
proBuf = append(proBuf, []byte{byte(pkb.RSV << 8), byte(pkb.RSV), pkb.Frag}...) proBuf = append(proBuf, pkb.Header()...)
hi, lo := breakPort(pkb.DstAddr.Port)
switch pkb.ATYP {
case ATYPIPv4:
proBuf = append(proBuf, ATYPIPv4)
proBuf = append(proBuf, pkb.DstAddr.IP...)
case ATYPIPV6:
proBuf = append(proBuf, ATYPIPV6)
proBuf = append(proBuf, pkb.DstAddr.IP...)
case ATYPDomain:
proBuf = append(proBuf, ATYPDomain)
proBuf = append(proBuf, []byte(pkb.DstAddr.FQDN)...)
}
proBuf = append(proBuf, hi, lo)
proBuf = append(proBuf, pkb.Data...) proBuf = append(proBuf, pkb.Data...)
if _, err := bindLn.WriteTo(proBuf, srcAddr); err != nil { if _, err := bindLn.WriteTo(proBuf, srcAddr); err != nil {
s.bufferPool.Put(tmpBufPool) s.bufferPool.Put(tmpBufPool)

1
socks5_test.go
View File

@ -137,6 +137,7 @@ func TestSOCKS5_Associate(t *testing.T) {
if err != nil { if err != nil {
return return
} }
if !bytes.Equal(buf[:n], []byte("ping")) { if !bytes.Equal(buf[:n], []byte("ping")) {
t.Fatalf("bad: %v", buf) t.Fatalf("bad: %v", buf)
} }