December 2013 - tor-commits - lists.torproject.org

[goptlib/master] Move socks code into the pt package.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 37be077e66cbff6403e054b2351e2eab3037a292 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 20:50:27 2013 -0800 Move socks code into the pt package. --- examples/dummy-client/dummy-client.go | 7 +- pt.go | 9 +- socks.go | 189 +++++++++++++++++++++++++++++++++ socks/socks.go | 183 ------------------------------- socks/socks_test.go | 113 -------------------- socks_test.go | 109 +++++++++++++++++++ 6 files changed, 308 insertions(+), 302 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 10f7b8b..de56d99 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -20,7 +20,6 @@ import ( ) import "git.torproject.org/pluggable-transports/goptlib.git" -import "git.torproject.org/pluggable-transports/goptlib.git/socks" var ptInfo pt.ClientInfo @@ -44,7 +43,7 @@ func copyLoop(a, b net.Conn) { wg.Wait() } -func handleConnection(local *socks.Conn) error { +func handleConnection(local *pt.SocksConn) error { defer local.Close() handlerChan <- 1 @@ -68,7 +67,7 @@ func handleConnection(local *socks.Conn) error { return nil } -func acceptLoop(ln *socks.Listener) error { +func acceptLoop(ln *pt.SocksListener) error { for { conn, err := ln.AcceptSocks() if err != nil { @@ -80,7 +79,7 @@ func acceptLoop(ln *socks.Listener) error { } func startListener(addr string) (net.Listener, error) { - ln, err := socks.Listen("tcp", addr) + ln, err := pt.ListenSocks("tcp", addr) if err != nil { return nil, err } diff --git a/pt.go b/pt.go index 86632d9..ddecc29 100644 --- a/pt.go +++ b/pt.go @@ -8,15 +8,15 @@ // os.Exit(1) // } // for _, methodName := range ptInfo.MethodNames { -// ln, err := startSocksListener() +// ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") // if err != nil { // pt.CmethodError(methodName, err.Error()) // continue // } +// go acceptLoop(ln) // pt.Cmethod(methodName, "socks4", ln.Addr()) // } // pt.CmethodsDone() -// See the socks package for help with writing a SOCKS listener. // // Sample server usage: // func handler(conn net.Conn) { @@ -48,6 +48,11 @@ // // Extended ORPort Authentication: // https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/217-ext-orpo…. +// +// The package implements a SOCKS4a server sufficient for a Tor client transport +// plugin. +// +// http://ftp.icm.edu.pl/packages/socks/socks4/SOCKS4.protocol package pt import ( diff --git a/socks.go b/socks.go new file mode 100644 index 0000000..a5889fa --- /dev/null +++ b/socks.go @@ -0,0 +1,189 @@ +package pt + +import ( + "bufio" + "errors" + "fmt" + "io" + "net" +) + +const ( + socksVersion = 0x04 + socksCmdConnect = 0x01 + socksResponseVersion = 0x00 + socksRequestGranted = 0x5a + socksRequestRejected = 0x5b +) + +// SocksRequest describes a SOCKS request. +type SocksRequest struct { + Username string + Target string +} + +// SocksConn encapsulates a net.Conn and information associated with a SOCKS request. +type SocksConn struct { + net.Conn + Req SocksRequest +} + +// Send a message to the proxy client that access to the given address is +// granted. +func (conn *SocksConn) Grant(addr *net.TCPAddr) error { + return sendSocks4aResponseGranted(conn, addr) +} + +// Send a message to the proxy client that access was rejected or failed. +func (conn *SocksConn) Reject() error { + return sendSocks4aResponseRejected(conn) +} + +// SocksListener wraps a net.Listener in order to read a SOCKS request on Accept. +// +// func handleConn(conn *pt.SocksConn) error { +// defer conn.Close() +// +// remote, err := net.Dial("tcp", conn.Req.Target) +// if err != nil { +// conn.Reject() +// return err +// } +// err = conn.Grant(remote.RemoteAddr().(*net.TCPAddr)) +// if err != nil { +// return err +// } +// defer remote.Close() +// +// // do something with conn and remote +// } +// ... +// ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") +// if err != nil { +// panic(err.Error()) +// } +// for { +// conn, err := ln.AcceptSocks() +// if err != nil { +// break +// } +// go handleConn(conn) +// } +type SocksListener struct { + net.Listener +} + +// Open a net.Listener according to network and laddr, and return it as a +// SocksListener. +func ListenSocks(network, laddr string) (*SocksListener, error) { + ln, err := net.Listen(network, laddr) + if err != nil { + return nil, err + } + return NewSocksListener(ln), nil +} + +// Create a new SocksListener wrapping the given net.Listener. +func NewSocksListener(ln net.Listener) *SocksListener { + return &SocksListener{ln} +} + +// Accept is the same as AcceptSocks, except that it returns a generic net.Conn. +// It is present for the sake of satisfying the net.Listener interface. +func (ln *SocksListener) Accept() (net.Conn, error) { + return ln.AcceptSocks() +} + +// Call Accept on the wrapped net.Listener, do SOCKS negotiation, and return a +// SocksConn. After accepting, you must call either conn.Grant or conn.Reject +// (presumably after trying to connect to conn.Req.Target). +func (ln *SocksListener) AcceptSocks() (*SocksConn, error) { + c, err := ln.Listener.Accept() + if err != nil { + return nil, err + } + conn := new(SocksConn) + conn.Conn = c + conn.Req, err = readSocks4aConnect(conn) + if err != nil { + conn.Close() + return nil, err + } + return conn, nil +} + +// Read a SOCKS4a connect request. Returns a SocksRequest. +func readSocks4aConnect(s io.Reader) (req SocksRequest, err error) { + r := bufio.NewReader(s) + + var h [8]byte + _, err = io.ReadFull(r, h[:]) + if err != nil { + return + } + if h[0] != socksVersion { + err = errors.New(fmt.Sprintf("SOCKS header had version 0x%02x, not 0x%02x", h[0], socksVersion)) + return + } + if h[1] != socksCmdConnect { + err = errors.New(fmt.Sprintf("SOCKS header had command 0x%02x, not 0x%02x", h[1], socksCmdConnect)) + return + } + + var usernameBytes []byte + usernameBytes, err = r.ReadBytes('\x00') + if err != nil { + return + } + req.Username = string(usernameBytes[:len(usernameBytes)-1]) + + var port int + var host string + + port = int(h[2])<<8 | int(h[3])<<0 + if h[4] == 0 && h[5] == 0 && h[6] == 0 && h[7] != 0 { + var hostBytes []byte + hostBytes, err = r.ReadBytes('\x00') + if err != nil { + return + } + host = string(hostBytes[:len(hostBytes)-1]) + } else { + host = net.IPv4(h[4], h[5], h[6], h[7]).String() + } + + if r.Buffered() != 0 { + err = errors.New(fmt.Sprintf("%d bytes left after SOCKS header", r.Buffered())) + return + } + + req.Target = fmt.Sprintf("%s:%d", host, port) + return +} + +// Send a SOCKS4a response with the given code and address. +func sendSocks4aResponse(w io.Writer, code byte, addr *net.TCPAddr) error { + var resp [8]byte + resp[0] = socksResponseVersion + resp[1] = code + resp[2] = byte((addr.Port >> 8) & 0xff) + resp[3] = byte((addr.Port >> 0) & 0xff) + resp[4] = addr.IP[0] + resp[5] = addr.IP[1] + resp[6] = addr.IP[2] + resp[7] = addr.IP[3] + _, err := w.Write(resp[:]) + return err +} + +var emptyAddr = net.TCPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 0} + +// Send a SOCKS4a response code 0x5a. +func sendSocks4aResponseGranted(w io.Writer, addr *net.TCPAddr) error { + return sendSocks4aResponse(w, socksRequestGranted, addr) +} + +// Send a SOCKS4a response code 0x5b (with an all-zero address). +func sendSocks4aResponseRejected(w io.Writer) error { + return sendSocks4aResponse(w, socksRequestRejected, &emptyAddr) +} diff --git a/socks/socks.go b/socks/socks.go deleted file mode 100644 index 450c409..0000000 --- a/socks/socks.go +++ /dev/null @@ -1,183 +0,0 @@ -// Package socks implements a SOCKS4a server sufficient for a Tor client -// transport plugin. -// -// ln, err := socks.Listen("tcp", ":3128") -// if err != nil { -// return err -// } -// conn, err := ln.AcceptSocks() -// if err != nil { -// return err -// } -// defer conn.Close() -// remote, err := net.Dial("tcp", local.Req.Target) -// if err != nil { -// local.Reject() -// return err -// } -// err = local.Grant(remote.RemoteAddr().(*net.TCPAddr)) -// if err != nil { -// return err -// } -// -// http://ftp.icm.edu.pl/packages/socks/socks4/SOCKS4.protocol -package socks - -import ( - "bufio" - "errors" - "fmt" - "io" - "net" -) - -const ( - socksVersion = 0x04 - socksCmdConnect = 0x01 - socksResponseVersion = 0x00 - socksRequestGranted = 0x5a - socksRequestRejected = 0x5b -) - -// Request describes a SOCKS request. -type Request struct { - Username string - Target string -} - -// Conn encapsulates a net.Conn and information associated with a SOCKS request. -type Conn struct { - net.Conn - Req Request -} - -// Send a message to the proxy client that access to the given address is -// granted. -func (conn *Conn) Grant(addr *net.TCPAddr) error { - return sendSocks4aResponseGranted(conn, addr) -} - -// Send a message to the proxy client that access was rejected or failed. -func (conn *Conn) Reject() error { - return sendSocks4aResponseRejected(conn) -} - -// Listener wraps a net.Listener in order to read a SOCKS request on Accept. -type Listener struct { - net.Listener -} - -// Open a net.Listener according to network and laddr, and return it as a -// Listener. -func Listen(network, laddr string) (*Listener, error) { - ln, err := net.Listen(network, laddr) - if err != nil { - return nil, err - } - return NewListener(ln), nil -} - -// Create a new Listener wrapping the given net.Listener. -func NewListener(ln net.Listener) *Listener { - return &Listener{ln} -} - -// Accept is the same as AcceptSocks, except that it returns a generic net.Conn. -// It is present for the sake of satisfying the net.Listener interface. -func (ln *Listener) Accept() (net.Conn, error) { - return ln.AcceptSocks() -} - -// Call Accept on the wrapped net.Listener, do SOCKS negotiation, and return a -// Conn. After accepting, you must call either conn.Grant or conn.Reject -// (presumably after trying to connect to conn.Req.Target). -func (ln *Listener) AcceptSocks() (*Conn, error) { - c, err := ln.Listener.Accept() - if err != nil { - return nil, err - } - conn := new(Conn) - conn.Conn = c - conn.Req, err = readSocks4aConnect(conn) - if err != nil { - conn.Close() - return nil, err - } - return conn, nil -} - -// Read a SOCKS4a connect request. Returns a Request. -func readSocks4aConnect(s io.Reader) (req Request, err error) { - r := bufio.NewReader(s) - - var h [8]byte - _, err = io.ReadFull(r, h[:]) - if err != nil { - return - } - if h[0] != socksVersion { - err = errors.New(fmt.Sprintf("SOCKS header had version 0x%02x, not 0x%02x", h[0], socksVersion)) - return - } - if h[1] != socksCmdConnect { - err = errors.New(fmt.Sprintf("SOCKS header had command 0x%02x, not 0x%02x", h[1], socksCmdConnect)) - return - } - - var usernameBytes []byte - usernameBytes, err = r.ReadBytes('\x00') - if err != nil { - return - } - req.Username = string(usernameBytes[:len(usernameBytes)-1]) - - var port int - var host string - - port = int(h[2])<<8 | int(h[3])<<0 - if h[4] == 0 && h[5] == 0 && h[6] == 0 && h[7] != 0 { - var hostBytes []byte - hostBytes, err = r.ReadBytes('\x00') - if err != nil { - return - } - host = string(hostBytes[:len(hostBytes)-1]) - } else { - host = net.IPv4(h[4], h[5], h[6], h[7]).String() - } - - if r.Buffered() != 0 { - err = errors.New(fmt.Sprintf("%d bytes left after SOCKS header", r.Buffered())) - return - } - - req.Target = fmt.Sprintf("%s:%d", host, port) - return -} - -// Send a SOCKS4a response with the given code and address. -func sendSocks4aResponse(w io.Writer, code byte, addr *net.TCPAddr) error { - var resp [8]byte - resp[0] = socksResponseVersion - resp[1] = code - resp[2] = byte((addr.Port >> 8) & 0xff) - resp[3] = byte((addr.Port >> 0) & 0xff) - resp[4] = addr.IP[0] - resp[5] = addr.IP[1] - resp[6] = addr.IP[2] - resp[7] = addr.IP[3] - _, err := w.Write(resp[:]) - return err -} - -var emptyAddr = net.TCPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 0} - -// Send a SOCKS4a response code 0x5a. -func sendSocks4aResponseGranted(w io.Writer, addr *net.TCPAddr) error { - return sendSocks4aResponse(w, socksRequestGranted, addr) -} - -// Send a SOCKS4a response code 0x5b (with an all-zero address). -func sendSocks4aResponseRejected(w io.Writer) error { - return sendSocks4aResponse(w, socksRequestRejected, &emptyAddr) -} diff --git a/socks/socks_test.go b/socks/socks_test.go deleted file mode 100644 index 759bf4a..0000000 --- a/socks/socks_test.go +++ /dev/null @@ -1,113 +0,0 @@ -package socks - -import ( - "bytes" - "net" - "testing" -) - -func tcpAddrsEqual(a, b *net.TCPAddr) bool { - return a.IP.Equal(b.IP) && a.Port == b.Port -} - -func TestReadSocks4aConnect(t *testing.T) { - badTests := [...][]byte{ - []byte(""), - // missing userid - []byte("\x04\x01\x12\x34\x01\x02\x03\x04"), - // missing \x00 after userid - []byte("\x04\x01\x12\x34\x01\x02\x03\x04userid"), - // missing hostname - []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00"), - // missing \x00 after hostname - []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname"), - // BIND request - []byte("\x04\x02\x12\x34\x01\x02\x03\x04userid\x00"), - // SOCKS5 - []byte("\x05\x01\x00"), - } - ipTests := [...]struct { - input []byte - userid string - addr net.TCPAddr - }{ - { - []byte("\x04\x01\x12\x34\x01\x02\x03\x04userid\x00"), - "userid", net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, - }, - { - []byte("\x04\x01\x12\x34\x01\x02\x03\x04\x00"), - "", net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, - }, - } - hostnameTests := [...]struct { - input []byte - userid string - target string - }{ - { - []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname\x00"), - "userid", "hostname:4660", - }, - { - []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00hostname\x00"), - "", "hostname:4660", - }, - { - []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00\x00"), - "userid", ":4660", - }, - { - []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00\x00"), - "", ":4660", - }, - } - - for _, input := range badTests { - var buf bytes.Buffer - buf.Write(input) - _, err := readSocks4aConnect(&buf) - if err == nil { - t.Errorf("%q unexpectedly succeeded", input) - } - } - - for _, test := range ipTests { - var buf bytes.Buffer - buf.Write(test.input) - req, err := readSocks4aConnect(&buf) - if err != nil { - t.Errorf("%q unexpectedly returned an error: %s", test.input, err) - } - if req.Username != test.userid { - t.Errorf("%q → username %q (expected %q)", test.input, - req.Username, test.userid) - } - addr, err := net.ResolveTCPAddr("tcp", req.Target) - if err != nil { - t.Error("%q → target %q: cannot resolve: %s", test.input, - req.Target, err) - } - if !tcpAddrsEqual(addr, &test.addr) { - t.Errorf("%q → address %s (expected %s)", test.input, - req.Target, test.addr.String()) - } - } - - for _, test := range hostnameTests { - var buf bytes.Buffer - buf.Write(test.input) - req, err := readSocks4aConnect(&buf) - if err != nil { - t.Errorf("%q unexpectedly returned an error: %s", test.input, err) - } - if req.Username != test.userid { - t.Errorf("%q → username %q (expected %q)", test.input, - req.Username, test.userid) - } - if req.Target != test.target { - t.Errorf("%q → target %q (expected %q)", test.input, - req.Target, test.target) - } - } -} diff --git a/socks_test.go b/socks_test.go new file mode 100644 index 0000000..bb638b5 --- /dev/null +++ b/socks_test.go @@ -0,0 +1,109 @@ +package pt + +import ( + "bytes" + "net" + "testing" +) + +func TestReadSocks4aConnect(t *testing.T) { + badTests := [...][]byte{ + []byte(""), + // missing userid + []byte("\x04\x01\x12\x34\x01\x02\x03\x04"), + // missing \x00 after userid + []byte("\x04\x01\x12\x34\x01\x02\x03\x04userid"), + // missing hostname + []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00"), + // missing \x00 after hostname + []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname"), + // BIND request + []byte("\x04\x02\x12\x34\x01\x02\x03\x04userid\x00"), + // SOCKS5 + []byte("\x05\x01\x00"), + } + ipTests := [...]struct { + input []byte + userid string + addr net.TCPAddr + }{ + { + []byte("\x04\x01\x12\x34\x01\x02\x03\x04userid\x00"), + "userid", net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, + }, + { + []byte("\x04\x01\x12\x34\x01\x02\x03\x04\x00"), + "", net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, + }, + } + hostnameTests := [...]struct { + input []byte + userid string + target string + }{ + { + []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname\x00"), + "userid", "hostname:4660", + }, + { + []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00hostname\x00"), + "", "hostname:4660", + }, + { + []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00\x00"), + "userid", ":4660", + }, + { + []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00\x00"), + "", ":4660", + }, + } + + for _, input := range badTests { + var buf bytes.Buffer + buf.Write(input) + _, err := readSocks4aConnect(&buf) + if err == nil { + t.Errorf("%q unexpectedly succeeded", input) + } + } + + for _, test := range ipTests { + var buf bytes.Buffer + buf.Write(test.input) + req, err := readSocks4aConnect(&buf) + if err != nil { + t.Errorf("%q unexpectedly returned an error: %s", test.input, err) + } + if req.Username != test.userid { + t.Errorf("%q → username %q (expected %q)", test.input, + req.Username, test.userid) + } + addr, err := net.ResolveTCPAddr("tcp", req.Target) + if err != nil { + t.Error("%q → target %q: cannot resolve: %s", test.input, + req.Target, err) + } + if !tcpAddrsEqual(addr, &test.addr) { + t.Errorf("%q → address %s (expected %s)", test.input, + req.Target, test.addr.String()) + } + } + + for _, test := range hostnameTests { + var buf bytes.Buffer + buf.Write(test.input) + req, err := readSocks4aConnect(&buf) + if err != nil { + t.Errorf("%q unexpectedly returned an error: %s", test.input, err) + } + if req.Username != test.userid { + t.Errorf("%q → username %q (expected %q)", test.input, + req.Username, test.userid) + } + if req.Target != test.target { + t.Errorf("%q → target %q (expected %q)", test.input, + req.Target, test.target) + } + } +}

1 0

[goptlib/master] Whitespace.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit b867131d3e99f526e0182f32910e2a9f801928c5 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 01:01:50 2013 -0800 Whitespace. --- pt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt.go b/pt.go index f858c2a..86632d9 100644 --- a/pt.go +++ b/pt.go @@ -31,7 +31,7 @@ // var err error // ptInfo, err = pt.ServerSetup([]string{"foo"}) // if err != nil { -// os.Exit(1) +// os.Exit(1) // } // for _, bindaddr := range ptInfo.Bindaddrs { // ln, err := startListener(bindaddr.Addr, bindaddr.MethodName)

1 0

[goptlib/master] Convert IP to IPv4 before writing it in SOCKS response.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 7cbdfa4c1514b9667101b9e7fb6c7682de157ff3 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 21:26:15 2013 -0800 Convert IP to IPv4 before writing it in SOCKS response. This was a bug; if the IP was a 16-byte slice, then we would read the first four bytes, which were zero. Document that address families other than IPv4 fill the four address bytes with zero, so that we sort of work with IPv6. --- socks.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/socks.go b/socks.go index a5889fa..8534636 100644 --- a/socks.go +++ b/socks.go @@ -161,17 +161,22 @@ func readSocks4aConnect(s io.Reader) (req SocksRequest, err error) { return } -// Send a SOCKS4a response with the given code and address. +// Send a SOCKS4a response with the given code and address. If the IP field +// inside addr is not an IPv4 address, the IP portion of the response will be +// four zero bytes. func sendSocks4aResponse(w io.Writer, code byte, addr *net.TCPAddr) error { var resp [8]byte resp[0] = socksResponseVersion resp[1] = code resp[2] = byte((addr.Port >> 8) & 0xff) resp[3] = byte((addr.Port >> 0) & 0xff) - resp[4] = addr.IP[0] - resp[5] = addr.IP[1] - resp[6] = addr.IP[2] - resp[7] = addr.IP[3] + ipv4 := addr.IP.To4() + if ipv4 != nil { + resp[4] = ipv4[0] + resp[5] = ipv4[1] + resp[6] = ipv4[2] + resp[7] = ipv4[3] + } _, err := w.Write(resp[:]) return err }

1 0

[goptlib/master] Comment for socks.Request.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 96be3371bc98dc21b9e60f23d0e43b514cad0b7c Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 01:21:57 2013 -0800 Comment for socks.Request. --- socks/socks.go | 1 + 1 file changed, 1 insertion(+) diff --git a/socks/socks.go b/socks/socks.go index 04b7ccd..450c409 100644 --- a/socks/socks.go +++ b/socks/socks.go @@ -39,6 +39,7 @@ const ( socksRequestRejected = 0x5b ) +// Request describes a SOCKS request. type Request struct { Username string Target string

1 0

[goptlib/master] More consistent style.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 2919f2cb00a8adcfa518438d69b149febbff0ee7 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 21:40:10 2013 -0800 More consistent style. --- examples/dummy-client/dummy-client.go | 27 +++++++++------------------ examples/dummy-server/dummy-server.go | 22 ++++++++++------------ pt.go | 3 ++- socks.go | 5 +++-- 4 files changed, 24 insertions(+), 33 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index de56d99..9497f99 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -43,26 +43,25 @@ func copyLoop(a, b net.Conn) { wg.Wait() } -func handleConnection(local *pt.SocksConn) error { - defer local.Close() - +func handleConnection(conn *pt.SocksConn) error { handlerChan <- 1 defer func() { handlerChan <- -1 }() - remote, err := net.Dial("tcp", local.Req.Target) + defer conn.Close() + remote, err := net.Dial("tcp", conn.Req.Target) if err != nil { - local.Reject() + conn.Reject() return err } - err = local.Grant(remote.RemoteAddr().(*net.TCPAddr)) + defer remote.Close() + err = conn.Grant(remote.RemoteAddr().(*net.TCPAddr)) if err != nil { return err } - defer remote.Close() - copyLoop(local, remote) + copyLoop(conn, remote) return nil } @@ -78,15 +77,6 @@ func acceptLoop(ln *pt.SocksListener) error { return nil } -func startListener(addr string) (net.Listener, error) { - ln, err := pt.ListenSocks("tcp", addr) - if err != nil { - return nil, err - } - go acceptLoop(ln) - return ln, nil -} - func main() { var err error @@ -97,11 +87,12 @@ func main() { listeners := make([]net.Listener, 0) for _, methodName := range ptInfo.MethodNames { - ln, err := startListener("127.0.0.1:0") + ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") if err != nil { pt.CmethodError(methodName, err.Error()) continue } + go acceptLoop(ln) pt.Cmethod(methodName, "socks4", ln.Addr()) listeners = append(listeners, ln) } diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 0518737..7341b17 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -44,7 +44,9 @@ func copyLoop(a, b net.Conn) { wg.Wait() } -func handleConnection(conn net.Conn) { +func handleConnection(conn net.Conn) error { + defer conn.Close() + handlerChan <- 1 defer func() { handlerChan <- -1 @@ -52,9 +54,13 @@ func handleConnection(conn net.Conn) { or, err := pt.ConnectOr(&ptInfo, conn.RemoteAddr(), "dummy") if err != nil { - return + return err } + defer or.Close() + copyLoop(conn, or) + + return nil } func acceptLoop(ln net.Listener) error { @@ -68,15 +74,6 @@ func acceptLoop(ln net.Listener) error { return nil } -func startListener(addr *net.TCPAddr) (net.Listener, error) { - ln, err := net.ListenTCP("tcp", addr) - if err != nil { - return nil, err - } - go acceptLoop(ln) - return ln, nil -} - func main() { var err error @@ -87,11 +84,12 @@ func main() { listeners := make([]net.Listener, 0) for _, bindaddr := range ptInfo.Bindaddrs { - ln, err := startListener(bindaddr.Addr) + ln, err := net.ListenTCP("tcp", bindaddr.Addr) if err != nil { pt.SmethodError(bindaddr.MethodName, err.Error()) continue } + go acceptLoop(ln) pt.Smethod(bindaddr.MethodName, ln.Addr()) listeners = append(listeners, ln) } diff --git a/pt.go b/pt.go index ddecc29..345a7bd 100644 --- a/pt.go +++ b/pt.go @@ -34,11 +34,12 @@ // os.Exit(1) // } // for _, bindaddr := range ptInfo.Bindaddrs { -// ln, err := startListener(bindaddr.Addr, bindaddr.MethodName) +// ln, err := net.ListenTCP("tcp", bindaddr.Addr) // if err != nil { // pt.SmethodError(bindaddr.MethodName, err.Error()) // continue // } +// go acceptLoop(ln) // pt.Smethod(bindaddr.MethodName, ln.Addr()) // } // pt.SmethodsDone() diff --git a/socks.go b/socks.go index 8534636..c982c7a 100644 --- a/socks.go +++ b/socks.go @@ -43,19 +43,20 @@ func (conn *SocksConn) Reject() error { // // func handleConn(conn *pt.SocksConn) error { // defer conn.Close() -// // remote, err := net.Dial("tcp", conn.Req.Target) // if err != nil { // conn.Reject() // return err // } +// defer remote.Close() // err = conn.Grant(remote.RemoteAddr().(*net.TCPAddr)) // if err != nil { // return err // } -// defer remote.Close() // // // do something with conn and remote +// +// return nil // } // ... // ln, err := pt.ListenSocks("tcp", "127.0.0.1:0")

1 0

[goptlib/master] Implement socks as a Listener.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit a0eeefa02086248e7253ba3c1cf4780c1cfe69da Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 01:21:04 2013 -0800 Implement socks as a Listener. --- examples/dummy-client/dummy-client.go | 25 ++++---- socks/socks.go | 102 ++++++++++++++++++++++++--------- 2 files changed, 85 insertions(+), 42 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 783788a..10f7b8b 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -44,7 +44,7 @@ func copyLoop(a, b net.Conn) { wg.Wait() } -func handleConnection(local net.Conn) error { +func handleConnection(local *socks.Conn) error { defer local.Close() handlerChan <- 1 @@ -52,28 +52,25 @@ func handleConnection(local net.Conn) error { handlerChan <- -1 }() - var remote net.Conn - err := socks.AwaitSocks4aConnect(local.(*net.TCPConn), func(dest string) (*net.TCPAddr, error) { - var err error - // set remote in outer function environment - remote, err = net.Dial("tcp", dest) - if err != nil { - return nil, err - } - return remote.RemoteAddr().(*net.TCPAddr), nil - }) + remote, err := net.Dial("tcp", local.Req.Target) + if err != nil { + local.Reject() + return err + } + err = local.Grant(remote.RemoteAddr().(*net.TCPAddr)) if err != nil { return err } + defer remote.Close() copyLoop(local, remote) return nil } -func acceptLoop(ln net.Listener) error { +func acceptLoop(ln *socks.Listener) error { for { - conn, err := ln.Accept() + conn, err := ln.AcceptSocks() if err != nil { return err } @@ -83,7 +80,7 @@ func acceptLoop(ln net.Listener) error { } func startListener(addr string) (net.Listener, error) { - ln, err := net.Listen("tcp", addr) + ln, err := socks.Listen("tcp", addr) if err != nil { return nil, err } diff --git a/socks/socks.go b/socks/socks.go index 0cbbba8..04b7ccd 100644 --- a/socks/socks.go +++ b/socks/socks.go @@ -1,6 +1,25 @@ // Package socks implements a SOCKS4a server sufficient for a Tor client // transport plugin. // +// ln, err := socks.Listen("tcp", ":3128") +// if err != nil { +// return err +// } +// conn, err := ln.AcceptSocks() +// if err != nil { +// return err +// } +// defer conn.Close() +// remote, err := net.Dial("tcp", local.Req.Target) +// if err != nil { +// local.Reject() +// return err +// } +// err = local.Grant(remote.RemoteAddr().(*net.TCPAddr)) +// if err != nil { +// return err +// } +// // http://ftp.icm.edu.pl/packages/socks/socks4/SOCKS4.protocol package socks @@ -25,38 +44,65 @@ type Request struct { Target string } -// Read a SOCKS4a connect request, and call the given connect callback with the -// requested destination string. If the callback returns an error, sends a SOCKS -// request failed message. Otherwise, sends a SOCKS request granted message for -// the destination address returned by the callback. -// var remote net.Conn -// err := socks.AwaitSocks4aConnect(local.(*net.TCPConn), func(dest string) (*net.TCPAddr, error) { -// var err error -// // set remote in outer function environment -// remote, err = net.Dial("tcp", dest) -// if err != nil { -// return nil, err -// } -// return remote.RemoteAddr().(*net.TCPAddr), nil -// }) -// if err != nil { -// return err -// } -// defer remote.Close() -// copyLoop(local, remote) -func AwaitSocks4aConnect(conn *net.TCPConn, connect func(string) (*net.TCPAddr, error)) error { - req, err := readSocks4aConnect(conn) +// Conn encapsulates a net.Conn and information associated with a SOCKS request. +type Conn struct { + net.Conn + Req Request +} + +// Send a message to the proxy client that access to the given address is +// granted. +func (conn *Conn) Grant(addr *net.TCPAddr) error { + return sendSocks4aResponseGranted(conn, addr) +} + +// Send a message to the proxy client that access was rejected or failed. +func (conn *Conn) Reject() error { + return sendSocks4aResponseRejected(conn) +} + +// Listener wraps a net.Listener in order to read a SOCKS request on Accept. +type Listener struct { + net.Listener +} + +// Open a net.Listener according to network and laddr, and return it as a +// Listener. +func Listen(network, laddr string) (*Listener, error) { + ln, err := net.Listen(network, laddr) + if err != nil { + return nil, err + } + return NewListener(ln), nil +} + +// Create a new Listener wrapping the given net.Listener. +func NewListener(ln net.Listener) *Listener { + return &Listener{ln} +} + +// Accept is the same as AcceptSocks, except that it returns a generic net.Conn. +// It is present for the sake of satisfying the net.Listener interface. +func (ln *Listener) Accept() (net.Conn, error) { + return ln.AcceptSocks() +} + +// Call Accept on the wrapped net.Listener, do SOCKS negotiation, and return a +// Conn. After accepting, you must call either conn.Grant or conn.Reject +// (presumably after trying to connect to conn.Req.Target). +func (ln *Listener) AcceptSocks() (*Conn, error) { + c, err := ln.Listener.Accept() if err != nil { - sendSocks4aResponseRejected(conn) - return err + return nil, err } - destAddr, err := connect(req.Target) + conn := new(Conn) + conn.Conn = c + conn.Req, err = readSocks4aConnect(conn) if err != nil { - sendSocks4aResponseRejected(conn) - return err + conn.Close() + return nil, err } - sendSocks4aResponseGranted(conn, destAddr) - return nil + return conn, nil } // Read a SOCKS4a connect request. Returns a Request.

1 0

[goptlib/master] Add SocksListener.Version to return the "socks4" string.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit ed01efcdf1e96664c998d2e91ff2d3ce78f0a447 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 21:45:19 2013 -0800 Add SocksListener.Version to return the "socks4" string. --- examples/dummy-client/dummy-client.go | 2 +- pt.go | 2 +- socks.go | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 9497f99..f619e7c 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -93,7 +93,7 @@ func main() { continue } go acceptLoop(ln) - pt.Cmethod(methodName, "socks4", ln.Addr()) + pt.Cmethod(methodName, ln.Version(), ln.Addr()) listeners = append(listeners, ln) } pt.CmethodsDone() diff --git a/pt.go b/pt.go index 345a7bd..45dc795 100644 --- a/pt.go +++ b/pt.go @@ -14,7 +14,7 @@ // continue // } // go acceptLoop(ln) -// pt.Cmethod(methodName, "socks4", ln.Addr()) +// pt.Cmethod(methodName, ln.Version(), ln.Addr()) // } // pt.CmethodsDone() // diff --git a/socks.go b/socks.go index c982c7a..6cbecc6 100644 --- a/socks.go +++ b/socks.go @@ -95,6 +95,11 @@ func (ln *SocksListener) Accept() (net.Conn, error) { return ln.AcceptSocks() } +// Returns "socks4", suitable to be included in a call to pt.Cmethod. +func (ln *SocksListener) Version() string { + return "socks4" +} + // Call Accept on the wrapped net.Listener, do SOCKS negotiation, and return a // SocksConn. After accepting, you must call either conn.Grant or conn.Reject // (presumably after trying to connect to conn.Req.Target).

1 0

[goptlib/master] Unexpose Line, EnvError, and VersionError.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 1428ea38330bd18c1068db6deb2e9248e269ad8c Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 22:14:09 2013 -0800 Unexpose Line, EnvError, and VersionError. --- pt.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pt.go b/pt.go index bd715c0..18c3b73 100644 --- a/pt.go +++ b/pt.go @@ -164,7 +164,7 @@ type ptErr struct { // Implements the error interface. func (err *ptErr) Error() string { - return formatLine(err.Keyword, err.Args...) + return formatline(err.Keyword, err.Args...) } func getenv(key string) string { @@ -175,7 +175,7 @@ func getenv(key string) string { func getenvRequired(key string) (string, error) { value := os.Getenv(key) if value == "" { - return "", EnvError(fmt.Sprintf("no %s environment variable", key)) + return "", envError(fmt.Sprintf("no %s environment variable", key)) } return value, nil } @@ -198,7 +198,7 @@ func escape(s string) string { return buf.String() } -func formatLine(keyword string, v ...string) string { +func formatline(keyword string, v ...string) string { var buf bytes.Buffer buf.WriteString(keyword) for _, x := range v { @@ -209,25 +209,25 @@ func formatLine(keyword string, v ...string) string { // Print a pluggable transports protocol line to Stdout. The line consists of an // unescaped keyword, followed by any number of escaped strings. -func Line(keyword string, v ...string) { - fmt.Fprintln(Stdout, formatLine(keyword, v...)) +func line(keyword string, v ...string) { + fmt.Fprintln(Stdout, formatline(keyword, v...)) } // Emit and return the given error as a ptErr. func doError(keyword string, v ...string) *ptErr { - Line(keyword, v...) + line(keyword, v...) return &ptErr{keyword, v} } // Emit an ENV-ERROR line with explanation text. Returns a representation of the // error. -func EnvError(msg string) error { +func envError(msg string) error { return doError("ENV-ERROR", msg) } // Emit a VERSION-ERROR line with explanation text. Returns a representation of // the error. -func VersionError(msg string) error { +func versionError(msg string) error { return doError("VERSION-ERROR", msg) } @@ -246,22 +246,22 @@ func SmethodError(methodName, msg string) error { // Emit a CMETHOD line. socks must be "socks4" or "socks5". Call this once for // each listening client SOCKS port. func Cmethod(name string, socks string, addr net.Addr) { - Line("CMETHOD", name, socks, addr.String()) + line("CMETHOD", name, socks, addr.String()) } // Emit a CMETHODS DONE line. Call this after opening all client listeners. func CmethodsDone() { - Line("CMETHODS", "DONE") + line("CMETHODS", "DONE") } // Emit an SMETHOD line. Call this once for each listening server port. func Smethod(name string, addr net.Addr) { - Line("SMETHOD", name, addr.String()) + line("SMETHOD", name, addr.String()) } // Emit an SMETHODS DONE line. Call this after opening all server listeners. func SmethodsDone() { - Line("SMETHODS", "DONE") + line("SMETHODS", "DONE") } // Get a pluggable transports version offered by Tor and understood by us, if @@ -278,7 +278,7 @@ func getManagedTransportVer() (string, error) { return offered, nil } } - return "", VersionError("no-version") + return "", versionError("no-version") } // Get the intersection of the method names offered by Tor and those in @@ -320,7 +320,7 @@ func ClientSetup(methodNames []string) (ClientInfo, error) { if err != nil { return info, err } - Line("VERSION", ver) + line("VERSION", ver) info.MethodNames, err = getClientTransports(methodNames) if err != nil { @@ -406,12 +406,12 @@ func getServerBindaddrs(methodNames []string) ([]Bindaddr, error) { parts := strings.SplitN(spec, "-", 2) if len(parts) != 2 { - return nil, EnvError(fmt.Sprintf("TOR_PT_SERVER_BINDADDR: %q: doesn't contain \"-\"", spec)) + return nil, envError(fmt.Sprintf("TOR_PT_SERVER_BINDADDR: %q: doesn't contain \"-\"", spec)) } bindaddr.MethodName = parts[0] addr, err := resolveAddr(parts[1]) if err != nil { - return nil, EnvError(fmt.Sprintf("TOR_PT_SERVER_BINDADDR: %q: %s", spec, err.Error())) + return nil, envError(fmt.Sprintf("TOR_PT_SERVER_BINDADDR: %q: %s", spec, err.Error())) } bindaddr.Addr = addr result = append(result, bindaddr) @@ -489,7 +489,7 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { if err != nil { return info, err } - Line("VERSION", ver) + line("VERSION", ver) orPort, err := getenvRequired("TOR_PT_ORPORT") if err != nil { @@ -497,7 +497,7 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { } info.OrAddr, err = resolveAddr(orPort) if err != nil { - return info, EnvError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) + return info, envError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) } info.Bindaddrs, err = getServerBindaddrs(methodNames) @@ -509,7 +509,7 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { if extendedOrPort != "" { info.ExtendedOrAddr, err = resolveAddr(extendedOrPort) if err != nil { - return info, EnvError(fmt.Sprintf("cannot resolve TOR_PT_EXTENDED_SERVER_PORT %q: %s", extendedOrPort, err.Error())) + return info, envError(fmt.Sprintf("cannot resolve TOR_PT_EXTENDED_SERVER_PORT %q: %s", extendedOrPort, err.Error())) } } @@ -517,7 +517,7 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { if authCookieFilename != "" { info.AuthCookie, err = readAuthCookieFile(authCookieFilename) if err != nil { - return info, EnvError(fmt.Sprintf("error reading TOR_PT_AUTH_COOKIE_FILE %q: %s", authCookieFilename, err.Error())) + return info, envError(fmt.Sprintf("error reading TOR_PT_AUTH_COOKIE_FILE %q: %s", authCookieFilename, err.Error())) } }

1 0

[goptlib/master] Fuller client and server examples.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 12340199b5c80b1d97f928d42b42a6f01ae8988d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 21:58:20 2013 -0800 Fuller client and server examples. --- examples/dummy-client/dummy-client.go | 4 +- examples/dummy-server/dummy-server.go | 4 +- pt.go | 98 ++++++++++++++++++++++++--------- 3 files changed, 77 insertions(+), 29 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index f619e7c..876fc87 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -43,7 +43,7 @@ func copyLoop(a, b net.Conn) { wg.Wait() } -func handleConnection(conn *pt.SocksConn) error { +func handler(conn *pt.SocksConn) error { handlerChan <- 1 defer func() { handlerChan <- -1 @@ -72,7 +72,7 @@ func acceptLoop(ln *pt.SocksListener) error { if err != nil { return err } - go handleConnection(conn) + go handler(conn) } return nil } diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 7341b17..0ca901c 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -44,7 +44,7 @@ func copyLoop(a, b net.Conn) { wg.Wait() } -func handleConnection(conn net.Conn) error { +func handler(conn net.Conn) error { defer conn.Close() handlerChan <- 1 @@ -69,7 +69,7 @@ func acceptLoop(ln net.Listener) error { if err != nil { return err } - go handleConnection(conn) + go handler(conn) } return nil } diff --git a/pt.go b/pt.go index 45dc795..bd715c0 100644 --- a/pt.go +++ b/pt.go @@ -2,47 +2,95 @@ // // Sample client usage: // var ptInfo pt.ClientInfo -// var err error -// ptInfo, err = pt.ClientSetup([]string{"foo"}) -// if err != nil { -// os.Exit(1) +// ... +// func handler(conn *pt.SocksConn) error { +// defer conn.Close() +// remote, err := net.Dial("tcp", conn.Req.Target) +// if err != nil { +// conn.Reject() +// return err +// } +// defer remote.Close() +// err = conn.Grant(remote.RemoteAddr().(*net.TCPAddr)) +// if err != nil { +// return err +// } +// // do something with conn and or. +// return nil // } -// for _, methodName := range ptInfo.MethodNames { -// ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") +// func acceptLoop(ln *pt.SocksListener) error { +// for { +// conn, err := ln.AcceptSocks() +// if err != nil { +// return err +// } +// go handler(conn) +// } +// return nil +// } +// ... +// func main() { +// var err error +// ptInfo, err = pt.ClientSetup([]string{"foo"}) // if err != nil { -// pt.CmethodError(methodName, err.Error()) -// continue +// os.Exit(1) +// } +// for _, methodName := range ptInfo.MethodNames { +// ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") +// if err != nil { +// pt.CmethodError(methodName, err.Error()) +// continue +// } +// go acceptLoop(ln) +// pt.Cmethod(methodName, ln.Version(), ln.Addr()) // } -// go acceptLoop(ln) -// pt.Cmethod(methodName, ln.Version(), ln.Addr()) +// pt.CmethodsDone() // } -// pt.CmethodsDone() // // Sample server usage: -// func handler(conn net.Conn) { +// var ptInfo pt.ServerInfo +// ... +// func handler(conn net.Conn) error { +// defer conn.Close() // or, err := pt.ConnectOr(&ptInfo, conn.RemoteAddr(), "foo") // if err != nil { // return // } +// defer or.Close() // // do something with or and conn +// return nil // } -// ... -// var ptInfo pt.ServerInfo -// var err error -// ptInfo, err = pt.ServerSetup([]string{"foo"}) -// if err != nil { -// os.Exit(1) +// func acceptLoop(ln net.Listener) error { +// for { +// conn, err := ln.Accept() +// if err != nil { +// return err +// } +// go handler(conn) +// } +// return nil // } -// for _, bindaddr := range ptInfo.Bindaddrs { -// ln, err := net.ListenTCP("tcp", bindaddr.Addr) +// ... +// func main() { +// var err error +// ptInfo, err = pt.ServerSetup([]string{"foo"}) // if err != nil { -// pt.SmethodError(bindaddr.MethodName, err.Error()) -// continue +// os.Exit(1) // } -// go acceptLoop(ln) -// pt.Smethod(bindaddr.MethodName, ln.Addr()) +// for _, bindaddr := range ptInfo.Bindaddrs { +// ln, err := net.ListenTCP("tcp", bindaddr.Addr) +// if err != nil { +// pt.SmethodError(bindaddr.MethodName, err.Error()) +// continue +// } +// go acceptLoop(ln) +// pt.Smethod(bindaddr.MethodName, ln.Addr()) +// } +// pt.SmethodsDone() // } -// pt.SmethodsDone() +// +// Some additional care is needed to handle SIGINT and shutdown properly. See +// the example programs dummy-client and dummy-server. // // Tor pluggable transports specification: // https://gitweb.torproject.org/torspec.git/blob/HEAD:/pt-spec.txt.

1 0

[goptlib/master] Comment SocksRequest members.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 96cbb3ae4e8f0252b59a31f3a26951230df78ac7 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 22:18:23 2013 -0800 Comment SocksRequest members. --- socks.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/socks.go b/socks.go index 6cbecc6..2ae1c5e 100644 --- a/socks.go +++ b/socks.go @@ -18,8 +18,10 @@ const ( // SocksRequest describes a SOCKS request. type SocksRequest struct { + // The userid string sent by the client. Username string - Target string + // The endpoint requested by the client as a "host:port" string. + Target string } // SocksConn encapsulates a net.Conn and information associated with a SOCKS request.

1 0