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

[goptlib/master] Add tests for extOrPortSendUserAddr.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit 25b94879100ca5416a10c7285e3195d2691e4faf Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 22:46:12 2013 -0800 Add tests for extOrPortSendUserAddr. --- pt_test.go | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pt_test.go b/pt_test.go index 1201e8a..cd9c280 100644 --- a/pt_test.go +++ b/pt_test.go @@ -2,6 +2,7 @@ package pt import ( "bytes" + "encoding/binary" "fmt" "io/ioutil" "net" @@ -431,3 +432,41 @@ func TestExtOrSendCommand(t *testing.T) { } } } + +func TestExtOrSendUserAddr(t *testing.T) { + addrs := [...]net.TCPAddr{ + net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0}, + net.TCPAddr{IP: net.ParseIP("1.2.3.4"), Port: 9999}, + net.TCPAddr{IP: net.ParseIP("255.255.255.255"), Port: 65535}, + net.TCPAddr{IP: net.ParseIP("::"), Port: 0}, + net.TCPAddr{IP: net.ParseIP("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"), Port: 65535}, + } + + for _, addr := range addrs { + var buf bytes.Buffer + err := extOrPortSendUserAddr(&buf, &addr) + if err != nil { + t.Errorf("%s unexpectedly returned an error: %s", addr, err) + } + var cmd, length uint16 + binary.Read(&buf, binary.BigEndian, &cmd) + if cmd != extOrCmdUserAddr { + t.Errorf("%s → cmd 0x%04x (expected 0x%04x)", addr, cmd, extOrCmdUserAddr) + } + binary.Read(&buf, binary.BigEndian, &length) + p := make([]byte, length+1) + n, err := buf.Read(p) + if n != int(length) { + t.Errorf("%s said length %d but had at least %d", addr, length, n) + } + // test that parsing the address gives something equivalent to + // the original. + outputAddr, err := resolveAddr(string(p)) + if err != nil { + t.Fatal(err) + } + if !tcpAddrsEqual(&addr, outputAddr) { + t.Errorf("%s → %s", addr, outputAddr) + } + } +}

1 0

[goptlib/master] Put more information in an error.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit be389272dd608f55b0bc3a5825475654cef3e1a3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 22:23:57 2013 -0800 Put more information in an error. --- pt.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt.go b/pt.go index a5a0107..58a6824 100644 --- a/pt.go +++ b/pt.go @@ -580,7 +580,7 @@ const ( func extOrPortSendCommand(s io.Writer, cmd uint16, body []byte) error { var buf bytes.Buffer if len(body) > 65535 { - return errors.New("command exceeds maximum length of 65535") + return errors.New(fmt.Sprintf("body length %d exceeds maximum of 65535", len(body))) } err := binary.Write(&buf, binary.BigEndian, cmd) if err != nil {

1 0

[goptlib/master] Have extOrPortSendUserAddr take an Addr, not a Conn.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit 483a23c0fbd9dbd54dbb963425f9673d2dfca347 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 22:42:44 2013 -0800 Have extOrPortSendUserAddr take an Addr, not a Conn. --- pt.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt.go b/pt.go index 58a6824..1bbd911 100644 --- a/pt.go +++ b/pt.go @@ -604,8 +604,8 @@ func extOrPortSendCommand(s io.Writer, cmd uint16, body []byte) error { // Send a USERADDR command on s. See section 3.1.2.1 of // 196-transport-control-ports.txt. -func extOrPortSendUserAddr(s io.Writer, conn net.Conn) error { - return extOrPortSendCommand(s, extOrCmdUserAddr, []byte(conn.RemoteAddr().String())) +func extOrPortSendUserAddr(s io.Writer, addr net.Addr) error { + return extOrPortSendCommand(s, extOrCmdUserAddr, []byte(addr.String())) } // Send a TRANSPORT command on s. See section 3.1.2.2 of @@ -651,7 +651,7 @@ func extOrPortRecvCommand(s io.Reader) (cmd uint16, body []byte, err error) { func extOrPortSetup(s io.ReadWriter, conn net.Conn, methodName string) error { var err error - err = extOrPortSendUserAddr(s, conn) + err = extOrPortSendUserAddr(s, conn.RemoteAddr()) if err != nil { return err }

1 0

[goptlib/master] Add tests for extOrPortSendCommand.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit a9b670802070c304e233533af8dd9e2712fd0b9b Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 22:41:07 2013 -0800 Add tests for extOrPortSendCommand. --- pt_test.go | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/pt_test.go b/pt_test.go index 979dd56..1201e8a 100644 --- a/pt_test.go +++ b/pt_test.go @@ -2,6 +2,7 @@ package pt import ( "bytes" + "fmt" "io/ioutil" "net" "os" @@ -372,3 +373,61 @@ func TestReadAuthCookie(t *testing.T) { } } } + +// Elide a byte slice in case it's really long. +func fmtBytes(s []byte) string { + if len(s) > 100 { + return fmt.Sprintf("%q...(%d bytes)", s[:5], len(s)) + } else { + return fmt.Sprintf("%q", s) + } +} + +func TestExtOrSendCommand(t *testing.T) { + badTests := [...]struct { + cmd uint16 + body []byte + }{ + {0x0, make([]byte, 65536)}, + {0x1234, make([]byte, 65536)}, + } + longBody := [65535 + 2 + 2]byte{0x12, 0x34, 0xff, 0xff} + goodTests := [...]struct { + cmd uint16 + body []byte + expected []byte + }{ + {0x0, []byte(""), []byte("\x00\x00\x00\x00")}, + {0x5, []byte(""), []byte("\x00\x05\x00\x00")}, + {0xfffe, []byte(""), []byte("\xff\xfe\x00\x00")}, + {0xffff, []byte(""), []byte("\xff\xff\x00\x00")}, + {0x1234, []byte("hello"), []byte("\x12\x34\x00\x05hello")}, + {0x1234, make([]byte, 65535), longBody[:]}, + } + + for _, test := range badTests { + var buf bytes.Buffer + err := extOrPortSendCommand(&buf, test.cmd, test.body) + if err == nil { + t.Errorf("0x%04x %s unexpectedly succeeded", test.cmd, fmtBytes(test.body)) + } + } + + for _, test := range goodTests { + var buf bytes.Buffer + err := extOrPortSendCommand(&buf, test.cmd, test.body) + if err != nil { + t.Errorf("0x%04x %s unexpectedly returned an error: %s", test.cmd, fmtBytes(test.body), err) + } + p := make([]byte, 65535+2+2) + n, err := buf.Read(p) + if err != nil { + t.Fatal(err) + } + output := p[:n] + if !bytes.Equal(output, test.expected) { + t.Errorf("0x%04x %s → %s (expected %s)", test.cmd, fmtBytes(test.body), + fmtBytes(output), fmtBytes(test.expected)) + } + } +}

1 0

[goptlib/master] I guess this should be "Send" and not "Write" for consistency.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit be347696f13369a181ad717c3d6903f00c58f1d8 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 22:14:17 2013 -0800 I guess this should be "Send" and not "Write" for consistency. --- pt.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt.go b/pt.go index eb7048b..a5a0107 100644 --- a/pt.go +++ b/pt.go @@ -577,7 +577,7 @@ const ( extOrCmdDeny = 0x1001 ) -func extOrPortWriteCommand(s io.Writer, cmd uint16, body []byte) error { +func extOrPortSendCommand(s io.Writer, cmd uint16, body []byte) error { var buf bytes.Buffer if len(body) > 65535 { return errors.New("command exceeds maximum length of 65535") @@ -605,18 +605,18 @@ func extOrPortWriteCommand(s io.Writer, cmd uint16, body []byte) error { // Send a USERADDR command on s. See section 3.1.2.1 of // 196-transport-control-ports.txt. func extOrPortSendUserAddr(s io.Writer, conn net.Conn) error { - return extOrPortWriteCommand(s, extOrCmdUserAddr, []byte(conn.RemoteAddr().String())) + return extOrPortSendCommand(s, extOrCmdUserAddr, []byte(conn.RemoteAddr().String())) } // Send a TRANSPORT command on s. See section 3.1.2.2 of // 196-transport-control-ports.txt. func extOrPortSendTransport(s io.Writer, methodName string) error { - return extOrPortWriteCommand(s, extOrCmdTransport, []byte(methodName)) + return extOrPortSendCommand(s, extOrCmdTransport, []byte(methodName)) } // Send a DONE command on s. See section 3.1 of 196-transport-control-ports.txt. func extOrPortSendDone(s io.Writer) error { - return extOrPortWriteCommand(s, extOrCmdDone, []byte{}) + return extOrPortSendCommand(s, extOrCmdDone, []byte{}) } func extOrPortRecvCommand(s io.Reader) (cmd uint16, body []byte, err error) {

1 0

[goptlib/master] Make compute{Server, Client}Hash take authCookie directly.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit 2d3d1ebda05aa8324d9d24fbf41fb2466a83eac1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 23:31:37 2013 -0800 Make compute{Server,Client}Hash take authCookie directly. --- pt.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pt.go b/pt.go index 1bbd911..2caac33 100644 --- a/pt.go +++ b/pt.go @@ -472,8 +472,8 @@ func ServerSetup(methodNames []string) (ServerInfo, error) { } // See 217-ext-orport-auth.txt section 4.2.1.3. -func computeServerHash(info *ServerInfo, clientNonce, serverNonce []byte) []byte { - h := hmac.New(sha256.New, info.AuthCookie) +func computeServerHash(authCookie, clientNonce, serverNonce []byte) []byte { + h := hmac.New(sha256.New, authCookie) io.WriteString(h, "ExtORPort authentication server-to-client hash") h.Write(clientNonce) h.Write(serverNonce) @@ -481,8 +481,8 @@ func computeServerHash(info *ServerInfo, clientNonce, serverNonce []byte) []byte } // See 217-ext-orport-auth.txt section 4.2.1.3. -func computeClientHash(info *ServerInfo, clientNonce, serverNonce []byte) []byte { - h := hmac.New(sha256.New, info.AuthCookie) +func computeClientHash(authCookie, clientNonce, serverNonce []byte) []byte { + h := hmac.New(sha256.New, authCookie) io.WriteString(h, "ExtORPort authentication client-to-server hash") h.Write(clientNonce) h.Write(serverNonce) @@ -541,12 +541,12 @@ func extOrPortAuthenticate(s io.ReadWriter, info *ServerInfo) error { return err } - expectedServerHash := computeServerHash(info, clientNonce, serverNonce) + expectedServerHash := computeServerHash(info.AuthCookie, clientNonce, serverNonce) if subtle.ConstantTimeCompare(serverHash, expectedServerHash) != 1 { return errors.New(fmt.Sprintf("mismatch in server hash")) } - clientHash = computeClientHash(info, clientNonce, serverNonce) + clientHash = computeClientHash(info.AuthCookie, clientNonce, serverNonce) _, err = s.Write(clientHash) if err != nil { return err

1 0

[goptlib/master] Add tests for extOrPortSendTransport.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit a5e7e453bb39396c1b019f81c28c3d6cb052389d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 23:27:21 2013 -0800 Add tests for extOrPortSendTransport. --- pt_test.go | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pt_test.go b/pt_test.go index 5628a96..4579fbd 100644 --- a/pt_test.go +++ b/pt_test.go @@ -471,6 +471,35 @@ func TestExtOrSendUserAddr(t *testing.T) { } } +func TestExtOrPortSendTransport(t *testing.T) { + tests := [...]struct { + methodName string + expected []byte + }{ + {"", []byte("\x00\x02\x00\x00")}, + {"a", []byte("\x00\x02\x00\x01a")}, + {"alpha", []byte("\x00\x02\x00\x05alpha")}, + } + + for _, test := range tests { + var buf bytes.Buffer + err := extOrPortSendTransport(&buf, test.methodName) + if err != nil { + t.Errorf("%q unexpectedly returned an error: %s", test.methodName, err) + } + p := make([]byte, 1024) + n, err := buf.Read(p) + if err != nil { + t.Fatal(err) + } + output := p[:n] + if !bytes.Equal(output, test.expected) { + t.Errorf("%q → %s (expected %s)", test.methodName, + fmtBytes(output), fmtBytes(test.expected)) + } + } +} + func TestExtOrPortSendDone(t *testing.T) { expected := []byte("\x00\x00\x00\x00")

1 0

[goptlib/master] Add test for extOrPortSendDone.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit 58b259d4dfb92fe712375553bf63f28b644f5f03 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 23:19:00 2013 -0800 Add test for extOrPortSendDone. --- pt_test.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pt_test.go b/pt_test.go index cd9c280..5628a96 100644 --- a/pt_test.go +++ b/pt_test.go @@ -470,3 +470,22 @@ func TestExtOrSendUserAddr(t *testing.T) { } } } + +func TestExtOrPortSendDone(t *testing.T) { + expected := []byte("\x00\x00\x00\x00") + + var buf bytes.Buffer + err := extOrPortSendDone(&buf) + if err != nil { + t.Errorf("unexpectedly returned an error: %s", err) + } + p := make([]byte, 1024) + n, err := buf.Read(p) + if err != nil { + t.Fatal(err) + } + output := p[:n] + if !bytes.Equal(output, expected) { + t.Errorf("→ %s (expected %s)", fmtBytes(output), fmtBytes(expected)) + } +}

1 0

[goptlib/master] Add tests for extOrPortRecvCommand.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit 8a12de97587e4a828381c30d8b80526b8a3a31fa Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 23:46:53 2013 -0800 Add tests for extOrPortRecvCommand. --- pt_test.go | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/pt_test.go b/pt_test.go index 4579fbd..6dc8845 100644 --- a/pt_test.go +++ b/pt_test.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/binary" "fmt" + "io" "io/ioutil" "net" "os" @@ -518,3 +519,71 @@ func TestExtOrPortSendDone(t *testing.T) { t.Errorf("→ %s (expected %s)", fmtBytes(output), fmtBytes(expected)) } } + +func TestExtOrPortRecvCommand(t *testing.T) { + badTests := [...][]byte{ + []byte(""), + []byte("\x12"), + []byte("\x12\x34"), + []byte("\x12\x34\x00"), + []byte("\x12\x34\x00\x01"), + } + goodTests := [...]struct { + input []byte + cmd uint16 + body []byte + leftover []byte + }{ + { + []byte("\x12\x34\x00\x00"), + 0x1234, []byte(""), []byte(""), + }, + { + []byte("\x12\x34\x00\x00more"), + 0x1234, []byte(""), []byte("more"), + }, + { + []byte("\x12\x34\x00\x04body"), + 0x1234, []byte("body"), []byte(""), + }, + { + []byte("\x12\x34\x00\x04bodymore"), + 0x1234, []byte("body"), []byte("more"), + }, + } + + for _, input := range badTests { + var buf bytes.Buffer + buf.Write(input) + _, _, err := extOrPortRecvCommand(&buf) + if err == nil { + t.Errorf("%q unexpectedly succeeded", fmtBytes(input)) + } + } + + for _, test := range goodTests { + var buf bytes.Buffer + buf.Write(test.input) + cmd, body, err := extOrPortRecvCommand(&buf) + if err != nil { + t.Errorf("%s unexpectedly returned an error: %s", fmtBytes(test.input), err) + } + if cmd != test.cmd { + t.Errorf("%s → cmd 0x%04x (expected 0x%04x)", fmtBytes(test.input), cmd, test.cmd) + } + if !bytes.Equal(body, test.body) { + t.Errorf("%s → body %s (expected %s)", fmtBytes(test.input), + fmtBytes(body), fmtBytes(test.body)) + } + p := make([]byte, 1024) + n, err := buf.Read(p) + if err != nil && err != io.EOF { + t.Fatal(err) + } + leftover := p[:n] + if !bytes.Equal(leftover, test.leftover) { + t.Errorf("%s → leftover %s (expected %s)", fmtBytes(test.input), + fmtBytes(leftover), fmtBytes(test.leftover)) + } + } +}

1 0

[goptlib/master] Have ConnectOr take an Addr, not a Conn.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit 537dbd836dc468a9e193bee0418d4b9cc8347da9 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 26 23:50:10 2013 -0800 Have ConnectOr take an Addr, not a Conn. --- examples/dummy-server/dummy-server.go | 2 +- pt.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 86176d7..0518737 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -50,7 +50,7 @@ func handleConnection(conn net.Conn) { handlerChan <- -1 }() - or, err := pt.ConnectOr(&ptInfo, conn, "dummy") + or, err := pt.ConnectOr(&ptInfo, conn.RemoteAddr(), "dummy") if err != nil { return } diff --git a/pt.go b/pt.go index 2caac33..c2a5d8c 100644 --- a/pt.go +++ b/pt.go @@ -20,7 +20,7 @@ // // Sample server usage: // func handler(conn net.Conn) { -// or, err := pt.ConnectOr(&ptInfo, conn, "foo") +// or, err := pt.ConnectOr(&ptInfo, conn.RemoteAddr(), "foo") // if err != nil { // return // } @@ -648,10 +648,10 @@ func extOrPortRecvCommand(s io.Reader) (cmd uint16, body []byte, err error) { // Send USERADDR and TRANSPORT commands followed by a DONE command. Wait for an // OKAY or DENY response command from the server. Returns nil if and only if // OKAY is received. -func extOrPortSetup(s io.ReadWriter, conn net.Conn, methodName string) error { +func extOrPortSetup(s io.ReadWriter, addr net.Addr, methodName string) error { var err error - err = extOrPortSendUserAddr(s, conn.RemoteAddr()) + err = extOrPortSendUserAddr(s, addr) if err != nil { return err } @@ -680,7 +680,7 @@ func extOrPortSetup(s io.ReadWriter, conn net.Conn, methodName string) error { // open *net.TCPConn. If connecting to the extended OR port, extended OR port // authentication à la 217-ext-orport-auth.txt is done before returning; an // error is returned if authentication fails. -func ConnectOr(info *ServerInfo, conn net.Conn, methodName string) (*net.TCPConn, error) { +func ConnectOr(info *ServerInfo, addr net.Addr, methodName string) (*net.TCPConn, error) { if info.ExtendedOrAddr == nil { return net.DialTCP("tcp", nil, info.OrAddr) } @@ -695,7 +695,7 @@ func ConnectOr(info *ServerInfo, conn net.Conn, methodName string) (*net.TCPConn s.Close() return nil, err } - err = extOrPortSetup(s, conn, methodName) + err = extOrPortSetup(s, addr, methodName) if err != nil { s.Close() return nil, err

1 0