Skip to content

Commit

Permalink
Signed-off-by: arraykeys@gmail.com <arraykeys@gmail.com>
Browse files Browse the repository at this point in the history
  • Loading branch information
@snail007
snail007 committed Jul 4, 2018
1 parent 846956a commit bf72325
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 26 deletions.
180 changes: 157 additions & 23 deletions services/socks/socks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ package socks
import (
"crypto/tls"
"fmt"
"io"
"io/ioutil"
logger "log"
"net"
"runtime/debug"
"strconv"
"strings"
"time"

Expand Down Expand Up @@ -59,27 +61,29 @@ type SocksArgs struct {
ParentCompress *bool
}
type Socks struct {
cfg SocksArgs
checker utils.Checker
basicAuth utils.BasicAuth
sshClient *ssh.Client
lockChn chan bool
udpSC utils.ServerChannel
sc *utils.ServerChannel
domainResolver utils.DomainResolver
isStop bool
userConns utils.ConcurrentMap
log *logger.Logger
cfg SocksArgs
checker utils.Checker
basicAuth utils.BasicAuth
sshClient *ssh.Client
lockChn chan bool
udpSC utils.ServerChannel
sc *utils.ServerChannel
domainResolver utils.DomainResolver
isStop bool
userConns utils.ConcurrentMap
log *logger.Logger
udpRelatedPacketConns utils.ConcurrentMap
}

func NewSocks() services.Service {
return &Socks{
cfg: SocksArgs{},
checker: utils.Checker{},
basicAuth: utils.BasicAuth{},
lockChn: make(chan bool, 1),
isStop: false,
userConns: utils.NewConcurrentMap(),
cfg: SocksArgs{},
checker: utils.Checker{},
basicAuth: utils.BasicAuth{},
lockChn: make(chan bool, 1),
isStop: false,
userConns: utils.NewConcurrentMap(),
udpRelatedPacketConns: utils.NewConcurrentMap(),
}
}

Expand Down Expand Up @@ -220,6 +224,9 @@ func (s *Socks) StopService() {
for _, c := range s.userConns.Items() {
(*c.(*net.Conn)).Close()
}
for _, c := range s.udpRelatedPacketConns.Items() {
(*c.(*net.UDPConn)).Close()
}
}
func (s *Socks) Start(args interface{}, log *logger.Logger) (err error) {
s.log = log
Expand Down Expand Up @@ -438,7 +445,9 @@ func (s *Socks) socksConnCallback(inConn net.Conn) {
if err != nil {
methodReq.Reply(socks.Method_NONE_ACCEPTABLE)
utils.CloseConn(&inConn)
s.log.Printf("new methods request fail,ERR: %s", err)
if err != io.EOF {
s.log.Printf("new methods request fail,ERR: %s", err)
}
return
}

Expand Down Expand Up @@ -531,10 +540,132 @@ func (s *Socks) proxyUDP(inConn *net.Conn, methodReq socks.MethodsRequest, reque
utils.CloseConn(inConn)
return
}
inconnRemoteAddr := (*inConn).RemoteAddr().String()
localAddr := &net.UDPAddr{IP: net.IPv4zero, Port: 0}
udpListener, err := net.ListenUDP("udp", localAddr)
if err != nil {
(*inConn).Close()
udpListener.Close()
s.log.Printf("udp bind fail , %s", err)
return
}
host, _, _ := net.SplitHostPort((*inConn).LocalAddr().String())
_, port, _ := net.SplitHostPort(s.udpSC.UDPListener.LocalAddr().String())
s.log.Printf("proxy udp on %s", net.JoinHostPort(host, port))
_, port, _ := net.SplitHostPort(udpListener.LocalAddr().String())
s.log.Printf("proxy udp on %s , for %s", udpListener.LocalAddr(), inconnRemoteAddr)
request.UDPReply(socks.REP_SUCCESS, net.JoinHostPort(host, port))

s.userConns.Set(inconnRemoteAddr, inConn)
var outUDPConn *net.UDPConn
go func() {
buf := make([]byte, 1)
if _, err := (*inConn).Read(buf); err != nil {
laddr := ""
if outUDPConn != nil {
laddr = outUDPConn.LocalAddr().String()
}
s.log.Printf("udp related tcp conn disconnected , %s -> %s , %s", inconnRemoteAddr, laddr, err)
(*inConn).Close()
udpListener.Close()
s.userConns.Remove(inconnRemoteAddr)
if outUDPConn != nil {
outUDPConn.Close()
}
}
}()
if *s.cfg.Parent != "" {
outconn, err := s.getOutConn(nil, nil, "", false)
if err != nil {
(*inConn).Close()
udpListener.Close()
s.log.Printf("connect fail , %s", err)
return
}
client := socks.NewClientConn(&outconn, "udp", "", time.Millisecond*time.Duration(*s.cfg.Timeout), nil, nil)
if err = client.Handshake(); err != nil {
(*inConn).Close()
udpListener.Close()
s.log.Printf("handshake fail , %s", err)
}
outconnRemoteAddr := outconn.RemoteAddr().String()
outconnLocalAddr := outconn.LocalAddr().String()
s.userConns.Set(outconnLocalAddr, &outconn)
s.log.Printf("parent udp address %s", client.UDPAddr)
go func() {
buf := make([]byte, 1)
if _, err := outconn.Read(buf); err != nil {
s.log.Printf("udp parent net conn offline , %s", outconnRemoteAddr)
(*inConn).Close()
udpListener.Close()
s.userConns.Remove(outconnLocalAddr)
}
}()
} else {
for {
buf := utils.LeakyBuffer.Get()
defer utils.LeakyBuffer.Put(buf)
n, srcAddr, err := udpListener.ReadFromUDP(buf)
if err != nil {
(*inConn).Close()
udpListener.Close()
s.userConns.Remove(inconnRemoteAddr)
s.log.Printf("udp listener read fail , %s", err)
return
}
p := socks.NewPacketUDP()
err = p.Parse(buf[:n])
if err != nil {
(*inConn).Close()
udpListener.Close()
s.userConns.Remove(inconnRemoteAddr)
s.log.Printf("udp listener parse packet fail , %s , from : %s", err, srcAddr)
return
}

port, _ := strconv.Atoi(p.Port())
destAddr := &net.UDPAddr{IP: net.ParseIP(p.Host()), Port: port}
if v, ok := s.udpRelatedPacketConns.Get(srcAddr.String()); !ok {
outUDPConn, err = net.DialUDP("udp", localAddr, destAddr)
if err != nil {
s.log.Printf("create out udp conn fail , %s , from : %s", err, srcAddr)
continue
}
s.udpRelatedPacketConns.Set(srcAddr.String(), outUDPConn)
go func() {
//bind
for {
buf := utils.LeakyBuffer.Get()
defer utils.LeakyBuffer.Put(buf)
n, err := outUDPConn.Read(buf)
if err != nil {
s.udpRelatedPacketConns.Remove(srcAddr.String())
s.log.Printf("read out udp data fail , %s , from : %s", err, srcAddr)
if strings.Contains(err.Error(), "use of closed network connection") {
break
}
continue
}
rp := socks.NewPacketUDP()
rp.Build(srcAddr.String(), buf[:n])
_, err = udpListener.WriteTo(rp.Bytes(), srcAddr)
if err != nil {
s.udpRelatedPacketConns.Remove(srcAddr.String())
s.log.Printf("write out data to local fail , %s , from : %s", err, srcAddr)
if strings.Contains(err.Error(), "use of closed network connection") {
break
}
}
}
}()
} else {
outUDPConn = v.(*net.UDPConn)
}
_, err = outUDPConn.Write(p.Data())
if err != nil {
s.log.Printf("send out udp data fail , %s , from : %s", err, srcAddr)
continue
}
}
}
}
func (s *Socks) proxyTCP(inConn *net.Conn, methodReq socks.MethodsRequest, request socks.Request) {
var outConn net.Conn
Expand All @@ -554,7 +685,7 @@ func (s *Socks) proxyTCP(inConn *net.Conn, methodReq socks.MethodsRequest, reque
return
}
if *s.cfg.Always {
outConn, err = s.getOutConn(methodReq.Bytes(), request.Bytes(), request.Addr())
outConn, err = s.getOutConn(methodReq.Bytes(), request.Bytes(), request.Addr(), true)
} else {
if *s.cfg.Parent != "" {
host, _, _ := net.SplitHostPort(request.Addr())
Expand All @@ -569,7 +700,7 @@ func (s *Socks) proxyTCP(inConn *net.Conn, methodReq socks.MethodsRequest, reque
}
}
if useProxy {
outConn, err = s.getOutConn(methodReq.Bytes(), request.Bytes(), request.Addr())
outConn, err = s.getOutConn(methodReq.Bytes(), request.Bytes(), request.Addr(), true)
} else {
outConn, err = utils.ConnectHost(s.Resolve(request.Addr()), *s.cfg.Timeout)
}
Expand Down Expand Up @@ -609,7 +740,7 @@ func (s *Socks) proxyTCP(inConn *net.Conn, methodReq socks.MethodsRequest, reque
}
s.userConns.Set(inAddr, inConn)
}
func (s *Socks) getOutConn(methodBytes, reqBytes []byte, host string) (outConn net.Conn, err interface{}) {
func (s *Socks) getOutConn(methodBytes, reqBytes []byte, host string, handshake bool) (outConn net.Conn, err interface{}) {
switch *s.cfg.ParentType {
case "kcp":
fallthrough
Expand Down Expand Up @@ -637,6 +768,9 @@ func (s *Socks) getOutConn(methodBytes, reqBytes []byte, host string) (outConn n
Password: *s.cfg.ParentKey,
})
}
if !handshake {
return
}
var buf = make([]byte, 1024)
//var n int
outConn.SetDeadline(time.Now().Add(time.Millisecond * time.Duration(*s.cfg.Timeout)))
Expand Down
6 changes: 3 additions & 3 deletions utils/socks/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type ClientConn struct {
timeout time.Duration
addr string
network string
udpAddr string
UDPAddr string
}

// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given address
Expand Down Expand Up @@ -168,14 +168,14 @@ func (s *ClientConn) Handshake() error {
}
p := binary.BigEndian.Uint16([]byte{buf[0], buf[1]})
//log.Printf("%v", p)
s.udpAddr = net.JoinHostPort(ipStr, fmt.Sprintf("%d", p))
s.UDPAddr = net.JoinHostPort(ipStr, fmt.Sprintf("%d", p))
//log.Printf("%v", s.udpAddr)
(*s.conn).SetDeadline(time.Time{})
return nil
}
func (s *ClientConn) SendUDP(data []byte, addr string) (respData []byte, err error) {

c, err := net.DialTimeout("udp", s.udpAddr, s.timeout)
c, err := net.DialTimeout("udp", s.UDPAddr, s.timeout)
if err != nil {
return
}
Expand Down

0 comments on commit bf72325

Please sign in to comment.