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

[tor-browser-bundle/master] Disable HTTPS-Everywhere's first run tooltips.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 5153caee05ee3fdb8d84a7e2aacb1af1c91fd61b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 3 05:25:05 2013 -0800 Disable HTTPS-Everywhere's first run tooltips. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index dff61f5..206f868 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -13,6 +13,7 @@ pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); +pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); diff --git a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js index dff61f5..206f868 100644 --- a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js @@ -13,6 +13,7 @@ pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); +pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index dff61f5..206f868 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -13,6 +13,7 @@ pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); +pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess");

1 0

[tor-browser-bundle/master] Back out the python building from Mac and Windows.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 489bb4b51fa057e83d711a03beb5aa4883bad935 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 3 02:24:17 2013 -0800 Back out the python building from Mac and Windows. Their ubuntu base version already included 2.7. No need to build it. --- gitian/descriptors/mac/gitian-firefox.yml | 15 --------------- gitian/descriptors/windows/gitian-firefox.yml | 16 ---------------- 2 files changed, 31 deletions(-) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 74b4287..e252888 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -12,7 +12,6 @@ packages: - "autoconf2.13" - "faketime" - "yasm" -- "zlib1g-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" @@ -23,7 +22,6 @@ files: - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" -- "python.tar.bz2" - "versions" script: | INSTDIR="$HOME/install/" @@ -37,19 +35,6 @@ script: | mkdir -p $INSTDIR/TorBrowser.app/Contents/MacOS/ mkdir -p $OUTDIR/ # - # XXX: Refactor this out into a separate descriptor - # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship - # with Python 2.6. Thus, we compile 2.7 ourselves... - if [ ${TORBROWSER_VERSION::3} != "3.0" ]; then - mkdir python - cd python - tar -xjvf ../python.tar.bz2 - Python-*/configure - make - sudo make install - cd .. - fi - # sudo dpkg -i *.deb tar -xavf x86_64-apple-darwin10.tar.xz # XXX: Needed for the otool patch. But we should replace that one with a diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 94b6ba0..f985b56 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -32,7 +32,6 @@ files: - "i686-w64-mingw32-g++" - "i686-w64-mingw32-ld" - "msvcr100.dll" -- "python.tar.bz2" - "versions" script: | INSTDIR="$HOME/install" @@ -58,21 +57,6 @@ script: | # linked against msvcrt by default. See bug 9084 for a more detailed # discussion. - # - # XXX: Refactor this out into a separate descriptor - # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship - # with Python 2.6. Thus, we compile 2.7 ourselves... - if [ ${TORBROWSER_VERSION::3} != "3.0" ]; then - mkdir python - cd python - tar -xjvf ../python.tar.bz2 - Python-*/configure - make - sudo make install - cd .. - fi - # - # FIXME: We need sudo for all of this because otherwise # the toolchain can't find the alternate prefix for the CRT headers :/

1 0

[tor-browser-bundle/master] Pull git updates if we're not verifying tags.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit bfa5ab28e2d27499cdebcdc656751d0b555e1e37 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Dec 2 17:24:31 2013 -0800 Pull git updates if we're not verifying tags. The tags are likely branches in that case. --- gitian/fetch-inputs.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 5831002..9f54f61 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -97,6 +97,13 @@ update_git() { if [ -n "$tag" ]; then (cd "$dir" && git checkout "$tag") fi + + # If we're not verifying tags, then some of the tags + # may actually be branch names that require an update + if [ $VERIFY_TAGS -eq 0 -a -n "$tag" ]; + then + (cd "$dir" && git pull || true ) + fi } checkout_mingw() { @@ -246,14 +253,14 @@ cd inputs while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF -tbb-windows-installer https://github.com/moba/tbb-windows-installer.git -openssl https://github.com/nmathewson/openssl.git -zlib https://github.com/madler/zlib.git -libevent https://github.com/libevent/libevent.git -tor-launcher https://git.torproject.org/tor-launcher.git -tor https://git.torproject.org/tor.git -torbutton https://git.torproject.org/torbutton.git -https-everywhere https://git.torproject.org/https-everywhere.git +tbb-windows-installer https://github.com/moba/tbb-windows-installer.git $NSIS_TAG +openssl https://github.com/nmathewson/openssl.git $OPENSSL_TAG +zlib https://github.com/madler/zlib.git $ZLIB_TAG +libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG +tor https://git.torproject.org/tor.git $TOR_TAG +https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TAG +torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG +tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG EOF

1 0

[tor-browser-bundle/master] Update NoScript version.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit f670968b07c3be3a1ccab6404c8fccad0efedcf4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 3 16:39:11 2013 -0800 Update NoScript version. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index d0e1a51..571b2d3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -24,7 +24,7 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -37,7 +37,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f +NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 78033c1..fdbabfc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -24,7 +24,7 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.7-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip @@ -37,7 +37,7 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 -NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f +NOSCRIPT_HASH=5ac1a5c727a5101fd7673ba48179a52ca1804149ed1b67e6172724606355440e MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[goptlib/master] Nicer example, don't presume we're in a loop.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit a10a38f710c4467ba5f01c9509415daec8465fed Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 8 19:23:08 2013 -0800 Nicer example, don't presume we're in a loop. --- pt.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt.go b/pt.go index 39e7471..ec2407f 100644 --- a/pt.go +++ b/pt.go @@ -264,14 +264,14 @@ func Smethod(name string, addr net.Addr) { // will be added to the server's extrainfo document. // // This is an example of how to check for a required option: -// args := pt.Args{} // secret, ok := bindaddr.Options.Get("shared-secret") -// if !ok { +// if ok { +// args := pt.Args{} +// args.Add("shared-secret", secret) +// pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args) +// } else { // pt.SmethodError(bindaddr.MethodName, "need a shared-secret option") -// continue // } -// args.Add("shared-secret", secret) -// pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args) // Or, if you just want to echo back the options provided by Tor from the // TransportServerOptions configuration, // pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), bindaddr.Options)

1 0

[goptlib/master] Return the username from readSocks4aConnect.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit d58b6b6ef27edf4de034f99e62d51bcb753e9d5a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 2 08:58:34 2013 -0800 Return the username from readSocks4aConnect. --- socks/socks.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/socks/socks.go b/socks/socks.go index 8d2e870..8726ceb 100644 --- a/socks/socks.go +++ b/socks/socks.go @@ -21,7 +21,8 @@ const ( ) type Request struct { - Target string + Username string + Target string } // Read a SOCKS4a connect request, and call the given connect callback with the @@ -76,10 +77,12 @@ func readSocks4aConnect(s io.Reader) (req Request, err error) { return } - _, err = r.ReadBytes('\x00') + 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

1 0

[goptlib/master] Change error returns in readSocks4aConnect.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 73569ea2f431a62ca6eb8746cdb6c21c18c18abc Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 2 08:36:23 2013 -0800 Change error returns in readSocks4aConnect. --- socks/socks.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/socks/socks.go b/socks/socks.go index b82fba7..060f746 100644 --- a/socks/socks.go +++ b/socks/socks.go @@ -55,24 +55,26 @@ func AwaitSocks4aConnect(conn *net.TCPConn, connect func(string) (*net.TCPAddr, } // Read a SOCKS4a connect request. Returns a "host:port" string. -func readSocks4aConnect(s io.Reader) (string, error) { +func readSocks4aConnect(s io.Reader) (target string, err error) { r := bufio.NewReader(s) var h [8]byte - n, err := io.ReadFull(r, h[:]) + _, err = io.ReadFull(r, h[:]) if err != nil { - return "", errors.New(fmt.Sprintf("after %d bytes of SOCKS header: %s", n, err)) + return } if h[0] != socksVersion { - return "", errors.New(fmt.Sprintf("SOCKS header had version 0x%02x, not 0x%02x", 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 { - return "", errors.New(fmt.Sprintf("SOCKS header had command 0x%02x, not 0x%02x", h[1], socksCmdConnect)) + err = errors.New(fmt.Sprintf("SOCKS header had command 0x%02x, not 0x%02x", h[1], socksCmdConnect)) + return } _, err = r.ReadBytes('\x00') if err != nil { - return "", errors.New(fmt.Sprintf("reading SOCKS userid: %s", err)) + return } var port int @@ -80,9 +82,10 @@ func readSocks4aConnect(s io.Reader) (string, error) { port = int(h[2])<<8 | int(h[3])<<0 if h[4] == 0 && h[5] == 0 && h[6] == 0 && h[7] != 0 { - hostBytes, err := r.ReadBytes('\x00') + var hostBytes []byte + hostBytes, err = r.ReadBytes('\x00') if err != nil { - return "", errors.New(fmt.Sprintf("reading SOCKS4a destination: %s", err)) + return } host = string(hostBytes[:len(hostBytes)-1]) } else { @@ -90,10 +93,12 @@ func readSocks4aConnect(s io.Reader) (string, error) { } if r.Buffered() != 0 { - return "", errors.New(fmt.Sprintf("%d bytes left after SOCKS header", r.Buffered())) + err = errors.New(fmt.Sprintf("%d bytes left after SOCKS header", r.Buffered())) + return } - return fmt.Sprintf("%s:%d", host, port), nil + target = fmt.Sprintf("%s:%d", host, port) + return } // Send a SOCKS4a response with the given code and address.

1 0

[goptlib/master] Encapsulate SOCKS request information in a Request struct.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 9b3e369ce561f15ac433c5f8d53ef2874489dd1d Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 2 08:40:05 2013 -0800 Encapsulate SOCKS request information in a Request struct. --- socks/socks.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/socks/socks.go b/socks/socks.go index 060f746..8d2e870 100644 --- a/socks/socks.go +++ b/socks/socks.go @@ -20,6 +20,10 @@ const ( socksRequestFailed = 0x5b ) +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 @@ -40,12 +44,12 @@ const ( // defer remote.Close() // copyLoop(local, remote) func AwaitSocks4aConnect(conn *net.TCPConn, connect func(string) (*net.TCPAddr, error)) error { - dest, err := readSocks4aConnect(conn) + req, err := readSocks4aConnect(conn) if err != nil { sendSocks4aResponseFailed(conn) return err } - destAddr, err := connect(dest) + destAddr, err := connect(req.Target) if err != nil { sendSocks4aResponseFailed(conn) return err @@ -54,8 +58,8 @@ func AwaitSocks4aConnect(conn *net.TCPConn, connect func(string) (*net.TCPAddr, return nil } -// Read a SOCKS4a connect request. Returns a "host:port" string. -func readSocks4aConnect(s io.Reader) (target string, err error) { +// 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 @@ -97,7 +101,7 @@ func readSocks4aConnect(s io.Reader) (target string, err error) { return } - target = fmt.Sprintf("%s:%d", host, port) + req.Target = fmt.Sprintf("%s:%d", host, port) return }

1 0

[goptlib/master] Add tests for readSocks4aConnect.
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 8addf719f7dbc463a32463fa3e4949f2437f91e5 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 4 14:04:11 2013 -0800 Add tests for readSocks4aConnect. --- socks/socks_test.go | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/socks/socks_test.go b/socks/socks_test.go new file mode 100644 index 0000000..759bf4a --- /dev/null +++ b/socks/socks_test.go @@ -0,0 +1,113 @@ +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) + } + } +}

1 0

[goptlib/master] Change "failed" to "rejected".
by dcf＠torproject.org 09 Dec '13

09 Dec '13

commit 8ac7286c2e4ef1a35a384d1e43e74d2e347fbab2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Dec 4 23:22:22 2013 -0800 Change "failed" to "rejected". --- socks/socks.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/socks/socks.go b/socks/socks.go index 8726ceb..0cbbba8 100644 --- a/socks/socks.go +++ b/socks/socks.go @@ -17,7 +17,7 @@ const ( socksCmdConnect = 0x01 socksResponseVersion = 0x00 socksRequestGranted = 0x5a - socksRequestFailed = 0x5b + socksRequestRejected = 0x5b ) type Request struct { @@ -47,12 +47,12 @@ type Request struct { func AwaitSocks4aConnect(conn *net.TCPConn, connect func(string) (*net.TCPAddr, error)) error { req, err := readSocks4aConnect(conn) if err != nil { - sendSocks4aResponseFailed(conn) + sendSocks4aResponseRejected(conn) return err } destAddr, err := connect(req.Target) if err != nil { - sendSocks4aResponseFailed(conn) + sendSocks4aResponseRejected(conn) return err } sendSocks4aResponseGranted(conn, destAddr) @@ -131,6 +131,6 @@ func sendSocks4aResponseGranted(w io.Writer, addr *net.TCPAddr) error { } // Send a SOCKS4a response code 0x5b (with an all-zero address). -func sendSocks4aResponseFailed(w io.Writer) error { - return sendSocks4aResponse(w, socksRequestFailed, &emptyAddr) +func sendSocks4aResponseRejected(w io.Writer) error { + return sendSocks4aResponse(w, socksRequestRejected, &emptyAddr) }

1 0