April 2014 - tor-commits - lists.torproject.org

[tor/maint-0.2.3] Stop leaking memory in error cases of md parsing
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 65575b0755f64d21d59532bf58e6c27e14086bbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 12:45:34 2014 -0400 Stop leaking memory in error cases of md parsing When clearing a list of tokens, it's important to do token_clear() on them first, or else any keys they contain will leak. This didn't leak memory on any of the successful microdescriptor parsing paths, but it does leak on some failing paths when the failure happens during tokenization. Fixes bug 11618; bugfix on 0.2.2.6-alpha. --- changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/md_leak_bug b/changes/md_leak_bug new file mode 100644 index 0000000..26270aa --- /dev/null +++ b/changes/md_leak_bug @@ -0,0 +1,5 @@ + o Major bugfixes (security, OOM) + - Fix a memory leak that could occur if a microdescriptor parse + fails during the tokenizing step. This could enable a memory + exhaustion attack by directory servers. Fixes bug #11649; bugfix + on 0.2.2.6-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 97e0bc8..3ff887c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4455,11 +4455,13 @@ microdescs_parse_from_string(const char *s, const char *eos, microdesc_free(md); md = NULL; + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_clear(area); smartlist_clear(tokens); s = start_of_next_microdesc; } + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_drop_all(area); smartlist_free(tokens);

1 0

[tor/master] Search for python by looking for "python2.7" and "python3.3" as well.
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit 057a2f8285ab5acc53a56eaefe166fe61065d3e8 Author: dana koch <dsk(a)google.com> Date: Tue Apr 29 10:45:16 2014 +1000 Search for python by looking for "python2.7" and "python3.3" as well. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f921dd5..ca7c9c0 100644 --- a/configure.ac +++ b/configure.ac @@ -201,7 +201,7 @@ AM_CONDITIONAL(MINIUPNPC, test x$upnp = xtrue) AM_PROG_CC_C_O AC_ARG_VAR(PYTHON) -AC_CHECK_PROGS(PYTHON, [python python2 python3]) +AC_CHECK_PROGS(PYTHON, [python python2 python2.7 python3 python3.3]) if test "x$PYTHON" = "x"; then AC_MSG_WARN([Python unavailable; some tests will not be run.]) fi

1 0

[tor/master] Changes file for bug 11632.
by nickm＠torproject.org 29 Apr '14

29 Apr '14

commit c0a73c8bf327e18b09b71cd77edcfac7fb9d3c69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 11:58:43 2014 -0400 Changes file for bug 11632. --- changes/bug11632 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug11632 b/changes/bug11632 new file mode 100644 index 0000000..0dc7f8f --- /dev/null +++ b/changes/bug11632 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When looking for versions of python that we could run the tests + with, check for "python2.7" and "python3.3"; previously we were + only looking for "python", "python2", and "python3". Patch from + Dana Koch. Fixes bug 11632; bugfix on 0.2.5.2-alpha.

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 29 Apr '14

29 Apr '14

commit 40b0738a1e50b628cb59ecde9c2f95ba2ca055a0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 29 15:15:13 2014 +0000 Update translations for torcheck_completed --- pt/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/torcheck.po b/pt/torcheck.po index 197a63a..89a3506 100644 --- a/pt/torcheck.po +++ b/pt/torcheck.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-04-29 14:34+0000\n" +"PO-Revision-Date: 2014-04-29 14:55+0000\n" "Last-Translator: dragulian <rocha.t80(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 29 Apr '14

29 Apr '14

commit 98958cb207882d6b9a662fbe1a68f7f50e35c17a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 29 15:15:10 2014 +0000 Update translations for torcheck --- pt/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/torcheck.po b/pt/torcheck.po index 197a63a..89a3506 100644 --- a/pt/torcheck.po +++ b/pt/torcheck.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-04-29 14:34+0000\n" +"PO-Revision-Date: 2014-04-29 14:55+0000\n" "Last-Translator: dragulian <rocha.t80(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 29 Apr '14

29 Apr '14

commit 491593593e0e4be56e3bc03f56e2e76550c4b5a8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 29 14:45:12 2014 +0000 Update translations for torcheck_completed --- pt/torcheck.po | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/pt/torcheck.po b/pt/torcheck.po index 75a8a5c..197a63a 100644 --- a/pt/torcheck.po +++ b/pt/torcheck.po @@ -1,16 +1,18 @@ # TorCheck gettext template -# Copyright (C) 2008-2012 The Tor Project, Inc +# Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: # flavioamieiro <flavioamieiro(a)gmail.com>, 2012 # SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 +# Nizia Dantas <niziadantasyouversion(a)gmail.com>, 2014 +# dragulian <rocha.t80(a)gmail.com>, 2014 # Zeca Gatilho <paulo.mosh(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-29 14:34+0000\n" +"Last-Translator: dragulian <rocha.t80(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,8 +21,8 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Parabéns. O seu browser está configurado para usar o Tor." +msgid "Congratulations. This browser is configured to use Tor." +msgstr "Parabéns. Este navegador está configurado para usar o Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -55,4 +57,42 @@ msgid "" msgstr "Uma falha temporária do sistema, impede-nos de confirmar a origem do seu endereço IP como um nó Tor, do projecto Tor <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "O seu endereço IP parece ser: " +msgstr "O seu endereço IP aparenta ser: " + +msgid "Are you using Tor?" +msgstr "Você utiliza o Tor?" + +msgid "This page is also available in the following languages:" +msgstr "Essa página também está disponível nos seguintes idiomas:" + +msgid "For more information about this exit relay, see:" +msgstr "Para mais informações sobre esta mensagem relay de saída, ver:" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "O Projeto Tor é uma organização sem fins lucrativos US 501(c)(3) dedicada à investigação, desenvolvimento e promoção de anonimidade e privacidade online." + +msgid "Learn More »" +msgstr "Saiba mais »" + +msgid "Go" +msgstr "Siga" + +msgid "Short User Manual" +msgstr "Manual de Utilizador Simplificado" + +msgid "Donate to Support Tor" +msgstr "Doar para o Supporte do Tor" + +msgid "Tor Q&A Site" +msgstr "Site \"Perguntas e Respotas\" do Tor" + +msgid "Volunteer" +msgstr "Voluntário" + +msgid "JavaScript is enabled." +msgstr "JavaScript activado." + +msgid "JavaScript is disabled." +msgstr "JavaScript desactivado."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 29 Apr '14

29 Apr '14

commit b00b79615c43ae87828464536476781abaf317cd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 29 14:45:09 2014 +0000 Update translations for torcheck --- pt/torcheck.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pt/torcheck.po b/pt/torcheck.po index d8e122a..197a63a 100644 --- a/pt/torcheck.po +++ b/pt/torcheck.po @@ -5,13 +5,14 @@ # flavioamieiro <flavioamieiro(a)gmail.com>, 2012 # SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 # Nizia Dantas <niziadantasyouversion(a)gmail.com>, 2014 +# dragulian <rocha.t80(a)gmail.com>, 2014 # Zeca Gatilho <paulo.mosh(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-04-04 14:00+0000\n" -"Last-Translator: Nizia Dantas <niziadantasyouversion(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-29 14:34+0000\n" +"Last-Translator: dragulian <rocha.t80(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Parabéns. Esse navegador está configurado para usar o Tor." +msgstr "Parabéns. Este navegador está configurado para usar o Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -56,16 +57,16 @@ msgid "" msgstr "Uma falha temporária do sistema, impede-nos de confirmar a origem do seu endereço IP como um nó Tor, do projecto Tor <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "O seu endereço IP parece ser: " +msgstr "O seu endereço IP aparenta ser: " msgid "Are you using Tor?" -msgstr "Você está usando o Tor?" +msgstr "Você utiliza o Tor?" msgid "This page is also available in the following languages:" msgstr "Essa página também está disponível nos seguintes idiomas:" msgid "For more information about this exit relay, see:" -msgstr "" +msgstr "Para mais informações sobre esta mensagem relay de saída, ver:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " @@ -73,25 +74,25 @@ msgid "" msgstr "O Projeto Tor é uma organização sem fins lucrativos US 501(c)(3) dedicada à investigação, desenvolvimento e promoção de anonimidade e privacidade online." msgid "Learn More »" -msgstr "" +msgstr "Saiba mais »" msgid "Go" -msgstr "" +msgstr "Siga" msgid "Short User Manual" -msgstr "" +msgstr "Manual de Utilizador Simplificado" msgid "Donate to Support Tor" -msgstr "" +msgstr "Doar para o Supporte do Tor" msgid "Tor Q&A Site" -msgstr "" +msgstr "Site \"Perguntas e Respotas\" do Tor" msgid "Volunteer" msgstr "Voluntário" msgid "JavaScript is enabled." -msgstr "JavaScript está habilitado." +msgstr "JavaScript activado." msgid "JavaScript is disabled." -msgstr "JavaScript está desabilitado." +msgstr "JavaScript desactivado."

1 0

[meek/master] A few doc comments.
by dcf＠torproject.org 29 Apr '14

29 Apr '14

commit 90f4223a329f6791b0cbfc8f65e2dd37f31b976a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 26 21:15:22 2014 -0700 A few doc comments. --- appengine/reflect.go | 9 +++++++++ firefox/components/main.js | 3 +++ latencytest/README | 3 +++ latencytest/latencytest.go | 3 +++ meek-client/meek-client.go | 1 + 5 files changed, 19 insertions(+) diff --git a/appengine/reflect.go b/appengine/reflect.go index 863a738..27c5941 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -1,3 +1,5 @@ +// A web app for Google App Engine that proxies HTTP requests and responses to a +// Tor relay running meek-server. package reflect import ( @@ -18,6 +20,7 @@ const ( var context appengine.Context +// Join two URL paths. func pathJoin(a, b string) string { if len(a) > 0 && a[len(a)-1] == '/' { a = a[:len(a)-1] @@ -37,11 +40,15 @@ var reflectedHeaderFields = []string{ "X-Session-Id", } +// Make a copy of r, with the URL being changed to be relative to forwardURL, +// and including only the headers in reflectedHeaderFields. func copyRequest(r *http.Request) (*http.Request, error) { u, err := url.Parse(forwardURL) if err != nil { return nil, err } + // Append the requested path to the path in forwardURL, so that + // forwardURL can be something like "http://example.com/reflect". u.Path = pathJoin(u.Path, r.URL.Path) c, err := http.NewRequest(r.Method, u.String(), r.Body) if err != nil { @@ -64,6 +71,8 @@ func handler(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) return } + // Use urlfetch.Transport directly instead of urlfetch.Client because we + // want only a single HTTP transaction, not following redirects. transport := urlfetch.Transport{ Context: context, // Despite the name, Transport.Deadline is really a timeout and diff --git a/firefox/components/main.js b/firefox/components/main.js index b07ed84..bef833f 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -229,12 +229,15 @@ MeekHTTPHelper.RequestReader = function(transport, callback) { Components.interfaces.nsITransport.OPEN_BLOCKING | Components.interfaces.nsITransport.OPEN_UNBUFFERED, 0, 0); this.state = this.STATE_READING_LENGTH; + // Initially size the buffer to read the 4-byte length. this.buf = new Uint8Array(4); this.bytesToRead = this.buf.length; this.deadline = Date.now() + MeekHTTPHelper.LOCAL_READ_TIMEOUT * 1000; this.asyncWait(); }; MeekHTTPHelper.RequestReader.prototype = { + // The onInputStreamReady callback is called for all read events. These + // constants keep track of the state of parsing. STATE_READING_LENGTH: 1, STATE_READING_OBJECT: 2, STATE_DONE: 3, diff --git a/latencytest/README b/latencytest/README new file mode 100644 index 0000000..c96e60c --- /dev/null +++ b/latencytest/README @@ -0,0 +1,3 @@ +This is an App Engine web app that measures the latency between the App +Engine servers and other endpoints. A copy of this app is running at +http://meek-latency-test.appspot.com/. diff --git a/latencytest/latencytest.go b/latencytest/latencytest.go index 0244bd6..4c248a2 100644 --- a/latencytest/latencytest.go +++ b/latencytest/latencytest.go @@ -1,3 +1,6 @@ +// This program tests the HTTP round-trip time from App Engine to various +// endpoints. It does several POSTS to each endpoint and then draws a graph +// showing the round-trip time. package latencytest import ( diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index d6b095f..f293b67 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -151,6 +151,7 @@ func handler(conn *pt.SocksConn) error { }() defer conn.Close() + // Ignore the IP address in the SOCKS request. err := conn.Grant(&net.TCPAddr{IP: net.ParseIP("0.0.0.0"), Port: 0}) if err != nil { return err

1 0

[metrics-db/master] Update authority IPs in default configuration.
by karsten＠torproject.org 29 Apr '14

29 Apr '14

commit 6ebd8a0442881e57ef9f32b5354efed1357285bf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 29 15:29:52 2014 +0200 Update authority IPs in default configuration. --- src/org/torproject/ernie/db/main/Configuration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/ernie/db/main/Configuration.java b/src/org/torproject/ernie/db/main/Configuration.java index 85d889e..eeb0d36 100644 --- a/src/org/torproject/ernie/db/main/Configuration.java +++ b/src/org/torproject/ernie/db/main/Configuration.java @@ -39,9 +39,9 @@ public class Configuration { private String bridgeSnapshotsDirectory = "in/bridge-descriptors/"; private boolean downloadRelayDescriptors = false; private List<String> downloadFromDirectoryAuthorities = Arrays.asList(( - "86.59.21.38,76.73.17.194:9030,213.115.239.118:443," + "86.59.21.38,76.73.17.194:9030,171.25.193.9:443," + "193.23.244.244,208.83.223.34:443,128.31.0.34:9131," - + "194.109.206.212,212.112.245.170").split(",")); + + "194.109.206.212,212.112.245.170,154.35.32.5").split(",")); private List<String> downloadVotesByFingerprint = Arrays.asList(( "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4," + "27B6B5996C426270A5C95488AA5BCEB6BCC86956,"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 29 Apr '14

29 Apr '14

commit d6ee5c35f4986f2b97972502d33c55de7437dedd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 29 10:15:14 2014 +0000 Update translations for torcheck_completed --- it/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/torcheck.po b/it/torcheck.po index a8ca398..4e2af69 100644 --- a/it/torcheck.po +++ b/it/torcheck.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-04-29 07:05+0000\n" +"PO-Revision-Date: 2014-04-29 09:58+0000\n" "Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n"

1 0