ss: handle unexpect situation to avoid panic #132

This commit is contained in:
nadoo committed 2020-04-11 21:08:10 +08:00
1 parent 4e1cb6ebf6
commit 2520a1c8b4
7 files changed
+33 -16

No files matched your search

+8
View File
@@ -1,6 +1,7 @@
package socks5
import (
"errors"
"net"
"github.com/nadoo/glider/common/log"
@@ -57,6 +58,10 @@ func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
return n, raddr, err
}
if n < socks.MinAddrLen {
return n, raddr, errors.New("not enough size to get addr")
}
// https://tools.ietf.org/html/rfc1928#section-7
// +----+------+------+----------+----------+----------+
// |RSV | FRAG | ATYP | DST.ADDR | DST.PORT | DATA |
@@ -64,6 +69,9 @@ func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
// | 2 | 1 | 1 | Variable | 2 | Variable |
// +----+------+------+----------+----------+----------+
tgtAddr := socks.SplitAddr(buf[3:])
if tgtAddr == nil {
return n, raddr, errors.New("can not get addr")
}
copy(b, buf[3+len(tgtAddr):])
//test
+8
View File
@@ -1,6 +1,7 @@
package ss
import (
"errors"
"net"
"github.com/nadoo/glider/common/socks"
@@ -38,7 +39,14 @@ func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
return n, raddr, err
}
if n < socks.MinAddrLen {
return n, raddr, errors.New("not enough size to get addr")
}
tgtAddr := socks.SplitAddr(buf)
if tgtAddr == nil {
return n, raddr, errors.New("can not get addr")
}
copy(b, buf[len(tgtAddr):])
//test
+1 -1
View File
@@ -128,7 +128,7 @@ func (s *Trojan) Dial(network, addr string) (net.Conn, error) {
var buf bytes.Buffer
buf.Write(s.pass[:])
buf.WriteString("\r\n")
buf.WriteByte(1)
buf.WriteByte(socks.CmdConnect)
buf.Write(socks.ParseAddr(addr))
buf.WriteString("\r\n")
_, err = tlsConn.Write(buf.Bytes())