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

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

09 Dec '13

commit aab03a3774f2ca1b9b038e557fe8c660a6a0ae5c Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 01:40:12 2013 -0800 Args interface. --- args.go | 25 +++++++++++++++++++++++++ args_test.go | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/args.go b/args.go new file mode 100644 index 0000000..6c8fb86 --- /dev/null +++ b/args.go @@ -0,0 +1,25 @@ +package pt + +// Key–value mappings for the representation of client and server options. + +// Args maps a string key to a list of values. It is similar to url.Values. +type Args map[string][]string + +// Get the first value associated with the given key. If there are any value +// associated with the key, the ok return value is true; otherwise it is false. +// If you need access to multiple values, use the map directly. +func (args Args) Get(key string) (value string, ok bool) { + if args == nil { + return "", false + } + vals, ok := args[key] + if !ok || len(vals) == 0 { + return "", false + } + return vals[0], true +} + +// Append value to the list of values for key. +func (args Args) Add(key, value string) { + args[key] = append(args[key], value) +} diff --git a/args_test.go b/args_test.go new file mode 100644 index 0000000..c89cef3 --- /dev/null +++ b/args_test.go @@ -0,0 +1,57 @@ +package pt + +import ( + "testing" +) + +func TestArgsGet(t *testing.T) { + args := Args{ + "a": []string{}, + "b": []string{"value"}, + "c": []string{"v1", "v2", "v3"}, + } + + var v string + var ok bool + v, ok = args.Get("a") + if ok { + t.Errorf("Unexpected Get success for %q", "a") + } + v, ok = args.Get("b") + if !ok { + t.Errorf("Unexpected Get failure for %q", "b") + } + if v != "value" { + t.Errorf("Get(%q) → %q (expected %q)", "b", v, "value") + } + v, ok = args.Get("c") + if !ok { + t.Errorf("Unexpected Get failure for %q", "c") + } + if v != "v1" { + t.Errorf("Get(%q) → %q (expected %q)", "c", v, "v1") + } + v, ok = args.Get("d") + if ok { + t.Errorf("Unexpected Get success for %q", "d") + } +} + +func TestArgsAdd(t *testing.T) { + args := make(Args) + if !argsEqual(args, Args{}) { + t.Error() + } + args.Add("k1", "v1") + if !argsEqual(args, Args{"k1": []string{"v1"}}) { + t.Error() + } + args.Add("k2", "v2") + if !argsEqual(args, Args{"k1": []string{"v1"}, "k2": []string{"v2"}}) { + t.Error() + } + args.Add("k1", "v3") + if !argsEqual(args, Args{"k1": []string{"v1", "v3"}, "k2": []string{"v2"}}) { + t.Error() + } +}

1 0

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

09 Dec '13

commit fb691a255911631b41b8eba33a034180e21a39a4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 02:32:33 2013 -0800 parseClientParameters. --- args.go | 80 +++++++++++++++++++++++++++++++++++++ args_test.go | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/args.go b/args.go index 6c8fb86..df3aced 100644 --- a/args.go +++ b/args.go @@ -1,5 +1,11 @@ package pt +import ( + "bytes" + "errors" + "fmt" +) + // Key–value mappings for the representation of client and server options. // Args maps a string key to a list of values. It is similar to url.Values. @@ -23,3 +29,77 @@ func (args Args) Get(key string) (value string, ok bool) { func (args Args) Add(key, value string) { args[key] = append(args[key], value) } + +// Return the index of the next unescaped byte in s that is in the term set, or +// else the length of the string if not terminators appear. Additionally return +// the unescaped string up to the returned index. +func indexUnescaped(s string, term []byte) (int, string, error) { + var i int + unesc := make([]byte, 0) + for i = 0; i < len(s); i++ { + b := s[i] + // A terminator byte? + if bytes.IndexByte(term, b) != -1 { + break + } + if b == '\\' { + i++ + if i >= len(s) { + return 0, "", errors.New(fmt.Sprintf("nothing following final escape in %q", s)) + } + b = s[i] + } + unesc = append(unesc, b) + } + return i, string(unesc), nil +} + +// Parse a name–value mapping as from an encoded SOCKS username/password. +// +// "If any [k=v] items are provided, they are configuration parameters for the +// proxy: Tor should separate them with semicolons ... If a key or value value +// must contain [an equals sign or] a semicolon or a backslash, it is escaped +// with a backslash." +func parseClientParameters(s string) (args Args, err error) { + args = make(Args) + if len(s) == 0 { + return + } + i := 0 + for { + var key, value string + var offset, begin int + + begin = i + // Read the key. + offset, key, err = indexUnescaped(s[i:], []byte{'=', ';'}) + if err != nil { + return + } + i += offset + // End of string or no equals sign? + if i >= len(s) || s[i] != '=' { + err = errors.New(fmt.Sprintf("no equals sign in %q", s[begin:i])) + return + } + // Skip the equals sign. + i++ + // Read the value. + offset, value, err = indexUnescaped(s[i:], []byte{';'}) + if err != nil { + return + } + i += offset + if len(key) == 0 { + err = errors.New(fmt.Sprintf("empty key in %q", s[begin:i])) + return + } + args.Add(key, value) + if i >= len(s) { + break + } + // Skip the semicolon. + i++ + } + return args, nil +} diff --git a/args_test.go b/args_test.go index c89cef3..69194fd 100644 --- a/args_test.go +++ b/args_test.go @@ -4,6 +4,34 @@ import ( "testing" ) +func stringSlicesEqual(a, b []string) bool { + if len(a) != len(b) { + return false + } + for i := range a { + if a[i] != b[i] { + return false + } + } + return true +} + +func argsEqual(a, b Args) bool { + for k, av := range a { + bv := b[k] + if !stringSlicesEqual(av, bv) { + return false + } + } + for k, bv := range b { + av := a[k] + if !stringSlicesEqual(av, bv) { + return false + } + } + return true +} + func TestArgsGet(t *testing.T) { args := Args{ "a": []string{}, @@ -55,3 +83,101 @@ func TestArgsAdd(t *testing.T) { t.Error() } } + +func TestParseClientParameters(t *testing.T) { + badTests := [...]string{ + "key", + "=value", + "==value", + "==key=value", + "key=value\\", + "a=b;key=value\\", + "a;b=c", + ";", + "key=value;", + ";key=value", + "key\\=value", + } + goodTests := [...]struct { + input string + expected Args + }{ + { + "", + Args{}, + }, + { + "key=", + Args{"key": []string{""}}, + }, + { + "key==", + Args{"key": []string{"="}}, + }, + { + "key=value", + Args{"key": []string{"value"}}, + }, + { + "a=b=c", + Args{"a": []string{"b=c"}}, + }, + { + "key=a\nb", + Args{"key": []string{"a\nb"}}, + }, + { + "key=value\\;", + Args{"key": []string{"value;"}}, + }, + { + "key=\"value\"", + Args{"key": []string{"\"value\""}}, + }, + { + "key=\"\"value\"\"", + Args{"key": []string{"\"\"value\"\""}}, + }, + { + "\"key=value\"", + Args{"\"key": []string{"value\""}}, + }, + { + "key=value;key=value", + Args{"key": []string{"value", "value"}}, + }, + { + "key=value1;key=value2", + Args{"key": []string{"value1", "value2"}}, + }, + { + "key1=value1;key2=value2;key1=value3", + Args{"key1": []string{"value1", "value3"}, "key2": []string{"value2"}}, + }, + { + "\\;=\\;;\\\\=\\;", + Args{";": []string{";"}, "\\": []string{";"}}, + }, + { + "a\\=b=c", + Args{"a=b": []string{"c"}}, + }, + } + + for _, input := range badTests { + _, err := parseClientParameters(input) + if err == nil { + t.Errorf("%q unexpectedly succeeded", input) + } + } + + for _, test := range goodTests { + args, err := parseClientParameters(test.input) + if err != nil { + t.Errorf("%q unexpectedly returned an error: %s", test.input, err) + } + if !argsEqual(args, test.expected) { + t.Errorf("%q → %q (expected %q)", test.input, args, test.expected) + } + } +}

1 0

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

09 Dec '13

commit 23e5be1a203cc4d04dcf7f35c6104884ffe3184b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 22:34:59 2013 -0800 Rearrange SocksRequest. --- socks.go | 4 ++-- socks_test.go | 38 ++++++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/socks.go b/socks.go index a3c5ede..583b999 100644 --- a/socks.go +++ b/socks.go @@ -18,10 +18,10 @@ const ( // SocksRequest describes a SOCKS request. type SocksRequest struct { - // The userid string sent by the client. - Username string // The endpoint requested by the client as a "host:port" string. Target string + // The userid string sent by the client. + Username string // The parsed contents of Username as a key–value mapping. Args Args } diff --git a/socks_test.go b/socks_test.go index bcd4433..6cfa967 100644 --- a/socks_test.go +++ b/socks_test.go @@ -26,38 +26,44 @@ func TestReadSocks4aConnect(t *testing.T) { } ipTests := [...]struct { input []byte - userid string addr net.TCPAddr + userid string }{ { []byte("\x04\x01\x12\x34\x01\x02\x03\x04key=value\x00"), - "key=value", net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, + net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, + "key=value", }, { []byte("\x04\x01\x12\x34\x01\x02\x03\x04\x00"), - "", net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, + net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, + "", }, } hostnameTests := [...]struct { input []byte - userid string target string + userid string }{ { []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00hostname\x00"), - "key=value", "hostname:4660", + "hostname:4660", + "key=value", }, { []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00hostname\x00"), - "", "hostname:4660", + "hostname:4660", + "", }, { []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00\x00"), - "key=value", ":4660", + ":4660", + "key=value", }, { []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00\x00"), - "", ":4660", + ":4660", + "", }, } @@ -77,10 +83,6 @@ func TestReadSocks4aConnect(t *testing.T) { 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, @@ -90,6 +92,10 @@ func TestReadSocks4aConnect(t *testing.T) { t.Errorf("%q → address %s (expected %s)", test.input, req.Target, test.addr.String()) } + if req.Username != test.userid { + t.Errorf("%q → username %q (expected %q)", test.input, + req.Username, test.userid) + } if req.Args == nil { t.Errorf("%q → unexpected nil Args from username %q", test.input, req.Username) } @@ -102,14 +108,14 @@ func TestReadSocks4aConnect(t *testing.T) { 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) } + if req.Username != test.userid { + t.Errorf("%q → username %q (expected %q)", test.input, + req.Username, test.userid) + } if req.Args == nil { t.Errorf("%q → unexpected nil Args from username %q", test.input, req.Username) }

1 0

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

09 Dec '13

commit 11d2149f1de4c0975ce70f8eaceb863b9058675c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 01:59:57 2013 -0800 parseServerTransportOptions. --- args.go | 70 +++++++++++++++++++++++++++++++++++++ args_test.go | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+) diff --git a/args.go b/args.go index df3aced..a0a3bd5 100644 --- a/args.go +++ b/args.go @@ -103,3 +103,73 @@ func parseClientParameters(s string) (args Args, err error) { } return args, nil } + +// Parse a transport–name–value mapping as from TOR_PT_SERVER_TRANSPORT_OPTIONS. +// +// "<value> is a k=v string value with options that are to be passed to the +// transport. Colons, semicolons, equal signs and backslashes must be escaped +// with a backslash." +// Example: trebuchet:secret=nou;trebuchet:cache=/tmp/cache;ballista:secret=yes +func parseServerTransportOptions(s string) (opts map[string]Args, err error) { + opts = make(map[string]Args) + if len(s) == 0 { + return + } + i := 0 + for { + var methodName, key, value string + var offset, begin int + + begin = i + // Read the method name. + offset, methodName, err = indexUnescaped(s[i:], []byte{':', '=', ';'}) + if err != nil { + return + } + i += offset + // End of string or no colon? + if i >= len(s) || s[i] != ':' { + err = errors.New(fmt.Sprintf("no colon in %q", s[begin:i])) + return + } + // Skip the colon. + i++ + // Read the key. + offset, key, err = indexUnescaped(s[i:], []byte{'=', ';'}) + if err != nil { + return + } + i += offset + // End of string or no equals sign? + if i >= len(s) || s[i] != '=' { + err = errors.New(fmt.Sprintf("no equals sign in %q", s[begin:i])) + return + } + // Skip the equals sign. + i++ + // Read the value. + offset, value, err = indexUnescaped(s[i:], []byte{';'}) + if err != nil { + return + } + i += offset + if len(methodName) == 0 { + err = errors.New(fmt.Sprintf("empty method name in %q", s[begin:i])) + return + } + if len(key) == 0 { + err = errors.New(fmt.Sprintf("empty key in %q", s[begin:i])) + return + } + if opts[methodName] == nil { + opts[methodName] = make(Args) + } + opts[methodName].Add(key, value) + if i >= len(s) { + break + } + // Skip the semicolon. + i++ + } + return opts, nil +} diff --git a/args_test.go b/args_test.go index 69194fd..078c79a 100644 --- a/args_test.go +++ b/args_test.go @@ -181,3 +181,113 @@ func TestParseClientParameters(t *testing.T) { } } } + +func optsEqual(a, b map[string]Args) bool { + for k, av := range a { + bv, ok := b[k] + if !ok || !argsEqual(av, bv) { + return false + } + } + for k, bv := range b { + av, ok := a[k] + if !ok || !argsEqual(av, bv) { + return false + } + } + return true +} + +func TestParseServerTransportOptions(t *testing.T) { + badTests := [...]string{ + ":=", + "t:=", + ":k=", + ":=v", + "t:=v", + "t:=v", + "t:k=v;", + "abc", + "t:", + "key=value", + "=value", + "t:k=v\\", + "t1:k=v;t2:k=v\\", + "t:=key=value", + "t:==key=value", + "t:;key=value", + "t:key\\=value", + } + goodTests := [...]struct { + input string + expected map[string]Args + }{ + { + "", + map[string]Args{}, + }, + { + "t:k=v", + map[string]Args{ + "t": Args{"k": []string{"v"}}, + }, + }, + { + "t1:k=v1;t2:k=v2;t1:k=v3", + map[string]Args{ + "t1": Args{"k": []string{"v1", "v3"}}, + "t2": Args{"k": []string{"v2"}}, + }, + }, + { + "t\\:1:k=v;t\\=2:k=v;t\\;3:k=v;t\\\\4:k=v", + map[string]Args{ + "t:1": Args{"k": []string{"v"}}, + "t=2": Args{"k": []string{"v"}}, + "t;3": Args{"k": []string{"v"}}, + "t\\4": Args{"k": []string{"v"}}, + }, + }, + { + "t:k\\:1=v;t:k\\=2=v;t:k\\;3=v;t:k\\\\4=v", + map[string]Args{ + "t": Args{ + "k:1": []string{"v"}, + "k=2": []string{"v"}, + "k;3": []string{"v"}, + "k\\4": []string{"v"}, + }, + }, + }, + { + "t:k=v\\:1;t:k=v\\=2;t:k=v\\;3;t:k=v\\\\4", + map[string]Args{ + "t": Args{"k": []string{"v:1", "v=2", "v;3", "v\\4"}}, + }, + }, + { + "trebuchet:secret=nou;trebuchet:cache=/tmp/cache;ballista:secret=yes", + map[string]Args{ + "trebuchet": Args{"secret": []string{"nou"}, "cache": []string{"/tmp/cache"}}, + "ballista": Args{"secret": []string{"yes"}}, + }, + }, + } + + for _, input := range badTests { + _, err := parseServerTransportOptions(input) + if err == nil { + t.Errorf("%q unexpectedly succeeded", input) + } + } + + for _, test := range goodTests { + opts, err := parseServerTransportOptions(test.input) + if err != nil { + t.Errorf("%q unexpectedly returned an error: %s", test.input, err) + } + if !optsEqual(opts, test.expected) { + t.Errorf("%q → %q (expected %q)", test.input, opts, test.expected) + } + } +}

1 0

[goptlib/master] Parse SOCKS userid parameters as SocksRequest.Args.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit a7d271a44bef29942d8a0c2489d61a5ddd2098a1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 7 22:26:46 2013 -0800 Parse SOCKS userid parameters as SocksRequest.Args. --- socks.go | 7 +++++++ socks_test.go | 28 ++++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/socks.go b/socks.go index 2ae1c5e..a3c5ede 100644 --- a/socks.go +++ b/socks.go @@ -22,6 +22,8 @@ type SocksRequest struct { Username string // The endpoint requested by the client as a "host:port" string. Target string + // The parsed contents of Username as a key–value mapping. + Args Args } // SocksConn encapsulates a net.Conn and information associated with a SOCKS request. @@ -145,6 +147,11 @@ func readSocks4aConnect(s io.Reader) (req SocksRequest, err error) { } req.Username = string(usernameBytes[:len(usernameBytes)-1]) + req.Args, err = parseClientParameters(req.Username) + if err != nil { + return + } + var port int var host string diff --git a/socks_test.go b/socks_test.go index 2fb8a8c..bcd4433 100644 --- a/socks_test.go +++ b/socks_test.go @@ -12,13 +12,15 @@ func TestReadSocks4aConnect(t *testing.T) { // missing userid []byte("\x04\x01\x12\x34\x01\x02\x03\x04"), // missing \x00 after userid - []byte("\x04\x01\x12\x34\x01\x02\x03\x04userid"), + []byte("\x04\x01\x12\x34\x01\x02\x03\x04key=value"), // missing hostname - []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00"), + []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00"), // missing \x00 after hostname - []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname"), + []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00hostname"), + // bad name–value mapping + []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname\x00"), // BIND request - []byte("\x04\x02\x12\x34\x01\x02\x03\x04userid\x00"), + []byte("\x04\x02\x12\x34\x01\x02\x03\x04\x00"), // SOCKS5 []byte("\x05\x01\x00"), } @@ -28,8 +30,8 @@ func TestReadSocks4aConnect(t *testing.T) { 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\x04key=value\x00"), + "key=value", net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 0x1234}, }, { []byte("\x04\x01\x12\x34\x01\x02\x03\x04\x00"), @@ -42,16 +44,16 @@ func TestReadSocks4aConnect(t *testing.T) { target string }{ { - []byte("\x04\x01\x12\x34\x00\x00\x00\x01userid\x00hostname\x00"), - "userid", "hostname:4660", + []byte("\x04\x01\x12\x34\x00\x00\x00\x01key=value\x00hostname\x00"), + "key=value", "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\x01key=value\x00\x00"), + "key=value", ":4660", }, { []byte("\x04\x01\x12\x34\x00\x00\x00\x01\x00\x00"), @@ -88,6 +90,9 @@ func TestReadSocks4aConnect(t *testing.T) { t.Errorf("%q → address %s (expected %s)", test.input, req.Target, test.addr.String()) } + if req.Args == nil { + t.Errorf("%q → unexpected nil Args from username %q", test.input, req.Username) + } } for _, test := range hostnameTests { @@ -105,6 +110,9 @@ func TestReadSocks4aConnect(t *testing.T) { t.Errorf("%q → target %q (expected %q)", test.input, req.Target, test.target) } + if req.Args == nil { + t.Errorf("%q → unexpected nil Args from username %q", test.input, req.Username) + } } }

1 0

[goptlib/master] Parse TOR_PT_SERVER_TRANSPORT_OPTIONS and include in Bindaddr.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit c2a6339b8c560cb49df1d9d703ac042293937034 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 02:39:30 2013 -0800 Parse TOR_PT_SERVER_TRANSPORT_OPTIONS and include in Bindaddr. --- pt.go | 14 +++++++++++++- pt_test.go | 12 ++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pt.go b/pt.go index 4f7f167..f389794 100644 --- a/pt.go +++ b/pt.go @@ -341,6 +341,9 @@ func ClientSetup(methodNames []string) (ClientInfo, error) { type Bindaddr struct { MethodName string Addr *net.TCPAddr + // Options from TOR_PT_SERVER_TRANSPORT_OPTIONS that pertain to this + // transport. + Options Args } // Resolve an address string into a net.TCPAddr. We are a bit more strict than @@ -398,10 +401,18 @@ func filterBindaddrs(addrs []Bindaddr, methodNames []string) []Bindaddr { // Return an array of Bindaddrs, those being the contents of // TOR_PT_SERVER_BINDADDR, with keys filtered by TOR_PT_SERVER_TRANSPORTS, and -// further filtered by the methods in methodNames. +// further filtered by the methods in methodNames. Transport-specific options +// from TOR_PT_SERVER_TRANSPORT_OPTIONS are assigned to the Options member. func getServerBindaddrs(methodNames []string) ([]Bindaddr, error) { var result []Bindaddr + // Parse the list of server transport options. + serverTransportOptions := getenv("TOR_PT_SERVER_TRANSPORT_OPTIONS") + optionsMap, err := parseServerTransportOptions(serverTransportOptions) + if err != nil { + return nil, envError(fmt.Sprintf("TOR_PT_SERVER_TRANSPORT_OPTIONS: %q: %s", serverTransportOptions, err.Error())) + } + // Get the list of all requested bindaddrs. serverBindaddr, err := getenvRequired("TOR_PT_SERVER_BINDADDR") if err != nil { @@ -420,6 +431,7 @@ func getServerBindaddrs(methodNames []string) ([]Bindaddr, error) { return nil, envError(fmt.Sprintf("TOR_PT_SERVER_BINDADDR: %q: %s", spec, err.Error())) } bindaddr.Addr = addr + bindaddr.Options = optionsMap[bindaddr.MethodName] result = append(result, bindaddr) } diff --git a/pt_test.go b/pt_test.go index 1d30ff2..1602fa8 100644 --- a/pt_test.go +++ b/pt_test.go @@ -280,8 +280,8 @@ func TestGetServerBindaddrs(t *testing.T) { "alpha,beta,gamma", []string{"alpha", "beta"}, []Bindaddr{ - {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}}, - {"beta", &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}}, + {MethodName: "alpha", Addr: &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}}, + {MethodName: "beta", Addr: &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}}, }, }, { @@ -301,8 +301,8 @@ func TestGetServerBindaddrs(t *testing.T) { "*", []string{"alpha", "beta"}, []Bindaddr{ - {"alpha", &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}}, - {"beta", &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}}, + {MethodName: "alpha", Addr: &net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 1111}}, + {MethodName: "beta", Addr: &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}}, }, }, { @@ -310,8 +310,8 @@ func TestGetServerBindaddrs(t *testing.T) { "trebuchet,ballista", []string{"trebuchet", "ballista"}, []Bindaddr{ - {"trebuchet", &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 1984}}, - {"ballista", &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 4891}}, + {MethodName: "trebuchet", Addr: &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 1984}}, + {MethodName: "ballista", Addr: &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 4891}}, }, }, }

1 0

[goptlib/master] Add examples from pt-spec.txt.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 736b0a63b6d2cd60a97682732c279ee56d7ccaa4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 02:32:19 2013 -0800 Add examples from pt-spec.txt. --- args_test.go | 8 ++++++++ pt_test.go | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/args_test.go b/args_test.go index 078c79a..ece7a50 100644 --- a/args_test.go +++ b/args_test.go @@ -162,6 +162,14 @@ func TestParseClientParameters(t *testing.T) { "a\\=b=c", Args{"a=b": []string{"c"}}, }, + { + "shared-secret=rahasia;secrets-file=/tmp/blob", + Args{"shared-secret": []string{"rahasia"}, "secrets-file": []string{"/tmp/blob"}}, + }, + { + "rocks=20;height=5.6", + Args{"rocks": []string{"20"}, "height": []string{"5.6"}}, + }, } for _, input := range badTests { diff --git a/pt_test.go b/pt_test.go index 6da0322..1d30ff2 100644 --- a/pt_test.go +++ b/pt_test.go @@ -305,6 +305,15 @@ func TestGetServerBindaddrs(t *testing.T) { {"beta", &net.TCPAddr{IP: net.ParseIP("1:2::3:4"), Port: 2222}}, }, }, + { + "trebuchet-127.0.0.1:1984,ballista-127.0.0.1:4891", + "trebuchet,ballista", + []string{"trebuchet", "ballista"}, + []Bindaddr{ + {"trebuchet", &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 1984}}, + {"ballista", &net.TCPAddr{IP: net.ParseIP("127.0.0.1"), Port: 4891}}, + }, + }, } Stdout = ioutil.Discard

1 0

[goptlib/master] I guess the convention is not to use the package prefix.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit a02de3aac1ba8f439b3043ab450b98fd0fb92869 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 11:06:55 2013 -0800 I guess the convention is not to use the package prefix. --- socks.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/socks.go b/socks.go index 500a1fa..d0b486d 100644 --- a/socks.go +++ b/socks.go @@ -118,7 +118,7 @@ func (ln *SocksListener) AcceptSocks() (*SocksConn, error) { return conn, nil } -// Returns "socks4", suitable to be included in a call to pt.Cmethod. +// Returns "socks4", suitable to be included in a call to Cmethod. func (ln *SocksListener) Version() string { return "socks4" }

1 0

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

09 Dec '13

commit eb552746f94bd2012de16c9c606b1298a144390e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 11:13:51 2013 -0800 Matching whitespace. --- socks.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/socks.go b/socks.go index d0b486d..bd57f40 100644 --- a/socks.go +++ b/socks.go @@ -58,9 +58,7 @@ func (conn *SocksConn) Reject() error { // if err != nil { // return err // } -// // // do something with conn and remote -// // return nil // } // ...

1 0

[goptlib/master] Use implicit return values in ClientSetup and ServerSetup.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 90ae129445f2b847ba3f51b4db805585e990a4dd Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 02:44:24 2013 -0800 Use implicit return values in ClientSetup and ServerSetup. --- pt.go | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pt.go b/pt.go index f389794..78892a8 100644 --- a/pt.go +++ b/pt.go @@ -319,18 +319,16 @@ type ClientInfo struct { // Check the client pluggable transports environments, emitting an error message // and returning a non-nil error if any error is encountered. Returns a // ClientInfo struct. -func ClientSetup(methodNames []string) (ClientInfo, error) { - var info ClientInfo - +func ClientSetup(methodNames []string) (info ClientInfo, err error) { ver, err := getManagedTransportVer() if err != nil { - return info, err + return } line("VERSION", ver) info.MethodNames, err = getClientTransports(methodNames) if err != nil { - return info, err + return } return info, nil @@ -500,34 +498,34 @@ type ServerInfo struct { // and returning a non-nil error if any error is encountered. Resolves the // various requested bind addresses, the server ORPort and extended ORPort, and // reads the auth cookie file. Returns a ServerInfo struct. -func ServerSetup(methodNames []string) (ServerInfo, error) { - var info ServerInfo - +func ServerSetup(methodNames []string) (info ServerInfo, err error) { ver, err := getManagedTransportVer() if err != nil { - return info, err + return } line("VERSION", ver) orPort, err := getenvRequired("TOR_PT_ORPORT") if err != nil { - return info, err + return } info.OrAddr, err = resolveAddr(orPort) if err != nil { - return info, envError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) + err = envError(fmt.Sprintf("cannot resolve TOR_PT_ORPORT %q: %s", orPort, err.Error())) + return } info.Bindaddrs, err = getServerBindaddrs(methodNames) if err != nil { - return info, err + return } var extendedOrPort = getenv("TOR_PT_EXTENDED_SERVER_PORT") 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())) + err = envError(fmt.Sprintf("cannot resolve TOR_PT_EXTENDED_SERVER_PORT %q: %s", extendedOrPort, err.Error())) + return } } @@ -535,7 +533,8 @@ 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())) + err = envError(fmt.Sprintf("error reading TOR_PT_AUTH_COOKIE_FILE %q: %s", authCookieFilename, err.Error())) + return } }

1 0