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

[obfsproxy/master] Don't do networking on connections that should be closed.
by asn＠torproject.org 08 May '14

08 May '14

commit 2ff160c0ad9258109d8c47eca162e7cd24e0f161 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 8 17:22:44 2014 +0100 Don't do networking on connections that should be closed. --- ChangeLog | 2 ++ obfsproxy/network/extended_orport.py | 3 +++ obfsproxy/network/network.py | 15 +++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 469988e..6e62a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ Changes in version 0.2.10 - UNRELEASED: + - Make sure that we don't try to do networking operations on a + connection that should be closed. Fixes #11769. - Only print ScrambleSuit disclaimer on startup (instead of printing it for every connection). Fixes #11768. diff --git a/obfsproxy/network/extended_orport.py b/obfsproxy/network/extended_orport.py index cb8ea4f..27220d4 100644 --- a/obfsproxy/network/extended_orport.py +++ b/obfsproxy/network/extended_orport.py @@ -121,6 +121,9 @@ class ExtORPortProtocol(network.GenericProtocol): """ We got some data, process it according to our current state. """ + if self.closed: + log.debug("%s: ExtORPort dataReceived called while closed. Ignoring.", self.name) + return self.buffer.write(data_rcvd) diff --git a/obfsproxy/network/network.py b/obfsproxy/network/network.py index fa4d1e6..aadbba5 100644 --- a/obfsproxy/network/network.py +++ b/obfsproxy/network/network.py @@ -120,6 +120,9 @@ class Circuit(Protocol): Circuit was just completed; that is, its endpoints are now connected. Do all the things we have to do now. """ + if self.closed: + log.debug("%s: Completed circuit while closed. Ignoring.", self.name) + return log.debug("%s: Circuit completed." % self.name) @@ -145,6 +148,10 @@ class Circuit(Protocol): Requires both downstream and upstream connections to be set. """ + if self.closed: + log.debug("%s: Calling circuit's dataReceived while closed. Ignoring.", self.name) + return + assert(self.downstream and self.upstream) assert((conn is self.downstream) or (conn is self.upstream)) @@ -208,6 +215,10 @@ class GenericProtocol(Protocol, object): """ Write 'buf' to the underlying transport. """ + if self.closed: + log.debug("%s: Calling write() while connection is closed. Ignoring.", self.name) + return + log.debug("%s: Writing %d bytes." % (self.name, len(buf))) self.transport.write(buf) @@ -291,6 +302,10 @@ class StaticDestinationProtocol(GenericProtocol): XXX: Can also be called with empty 'data' because of Circuit.setDownstreamConnection(). Document or split function. """ + if self.closed: + log.debug("%s: dataReceived called while closed. Ignoring.", self.name) + return + if (not self.buffer) and (not data): log.debug("%s: dataReceived called without a reason.", self.name) return

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 08 May '14

08 May '14

commit 3e7eb9e5fcf94d177f8bd4c46401e135908f5f3a Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 8 16:15:54 2014 +0000 Update translations for tails-iuk_completed --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 4b9e97d..72a9d34 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 17:54+0200\n" -"PO-Revision-Date: 2014-05-08 15:21+0000\n" +"PO-Revision-Date: 2014-05-08 16:00+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -155,7 +155,7 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "A atualização não pôde ser baixada.\\n\\nVerifique sua conexão de rede e reinicie Tails para tentar atualizar novamente.\\n\\nCaso o problema continue, vá para file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "O download da atualização não pôde ser feito.\\n\\nVerifique sua conexão de rede e reinicie Tails para tentar atualizar novamente.\\n\\nCaso o problema continue, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 msgid "Error while downloading the upgrade" @@ -174,7 +174,7 @@ msgstr "Erro ao criar um diretório temporário de download" #: ../lib/Tails/IUK/Frontend.pm:562 msgid "Failed to create temporary download directory" -msgstr "Falha ao criar uma pasta temporária de transferência" +msgstr "Falha ao criar um diretório temporário de download" #: ../lib/Tails/IUK/Frontend.pm:574 msgid ""

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 08 May '14

08 May '14

commit 059c0e456522a2cb114d85e7a9bc32f1f762dad2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 8 16:15:51 2014 +0000 Update translations for tails-iuk --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 4b9e97d..72a9d34 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 17:54+0200\n" -"PO-Revision-Date: 2014-05-08 15:21+0000\n" +"PO-Revision-Date: 2014-05-08 16:00+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -155,7 +155,7 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "A atualização não pôde ser baixada.\\n\\nVerifique sua conexão de rede e reinicie Tails para tentar atualizar novamente.\\n\\nCaso o problema continue, vá para file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "O download da atualização não pôde ser feito.\\n\\nVerifique sua conexão de rede e reinicie Tails para tentar atualizar novamente.\\n\\nCaso o problema continue, consulte o arquivo:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 msgid "Error while downloading the upgrade" @@ -174,7 +174,7 @@ msgstr "Erro ao criar um diretório temporário de download" #: ../lib/Tails/IUK/Frontend.pm:562 msgid "Failed to create temporary download directory" -msgstr "Falha ao criar uma pasta temporária de transferência" +msgstr "Falha ao criar um diretório temporário de download" #: ../lib/Tails/IUK/Frontend.pm:574 msgid ""

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 08 May '14

08 May '14

commit dca42658b79288354ed18b6e6c28ab838861a36e Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 8 16:15:48 2014 +0000 Update translations for torbutton-torbuttonproperties --- pt_BR/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbutton.properties b/pt_BR/torbutton.properties index 49a8ee8..b184eb8 100644 --- a/pt_BR/torbutton.properties +++ b/pt_BR/torbutton.properties @@ -41,7 +41,7 @@ torbutton.popup.pref_error = O Torbutton não pode atualizar as preferências na torbutton.popup.permission_denied = Por favor, restaure as permissões na pasta do Navegador Tor ou as copie para um outro lugar. torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere mais espaço ou mova o Navegador Tor para um novo dispositivo. torbutton.title.prompt_torbrowser = Informação Importante do Torbutton -torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de forma diferente: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Haviam muitos erros lá, bugs, que não poderiam ser resolvidos de outra maneira.\n\nSe você quiser continuar usando o Firefox normalmente, você deve desinstalar o Torbutton e baixar o Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá para as Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton. +torbutton.popup.prompt_torbrowser = O Torbutton agora está funcionando de forma diferente: você não pode mais desligá-lo.\n\nNós fizemos esta mudança porque não é seguro usar o Torbutton em um navegador que também é usado para navegação não-Tor. Havia muitos erros lá, bugs, que não poderiam ser resolvidos de outra maneira.\n\nSe você quiser continuar usando o Firefox normalmente, você deve desinstalar o Torbutton e fazer o download do Pacote do Navegador Tor. As configurações de privacidade do Navegador Tor também são superiores àquelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vá para as Ferramentas->Complementos->Extensões e clique no botão Remover próximo ao Torbutton. torbutton.popup.short_torbrowser = Informação Importante do Torbutton!\n\nO Torbutton agora estará sempre habilitado.\n\nClique no Torbutton para mais informações. torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua privacidade e o seu anonimato.\n\nEles também podem ignorar o Tor e revelar a sua localização atual e o endereço de IP.\n\nVocê tem certeza que deseja habilitar o uso de plugins?\n\n

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 08 May '14

08 May '14

commit f17f26eabe6b07cb49dd72046db446ace32c8fe4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 8 16:15:22 2014 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 01c32f5..df62a93 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-27 13:07+0200\n" -"PO-Revision-Date: 2014-05-08 15:40+0000\n" +"PO-Revision-Date: 2014-05-08 15:50+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 May '14

08 May '14

commit fcf1d1abcc82ad161205ad10bc823b903c0f6b39 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 8 16:15:20 2014 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 01c32f5..df62a93 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-27 13:07+0200\n" -"PO-Revision-Date: 2014-05-08 15:40+0000\n" +"PO-Revision-Date: 2014-05-08 15:50+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] changes file for 11648
by nickm＠torproject.org 08 May '14

08 May '14

commit c86b709a077b5ef10f7c91963af3fd092f739a86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 12:01:12 2014 -0400 changes file for 11648 --- changes/bug11648 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changes/bug11648 b/changes/bug11648 new file mode 100644 index 0000000..0e89274 --- /dev/null +++ b/changes/bug11648 @@ -0,0 +1,8 @@ + o Minor bugfixes (Directory server): + - When sending a compressed set of descriptors or microdescriptors, + make sure to finalize the zlib stream. Previously, we would write + all the compressed data, but if the last descriptor we wanted to + send was missing or too old, we would not mark the stream as + finished. This caused problems for decompression tools. Fixes bug + 11648; bugfix on 0.1.1.23. +

1 0

[tor/master] Merge remote-tracking branch 'public/bug11648'
by nickm＠torproject.org 08 May '14

08 May '14

commit 5b861ae53f411fc577ac603bd7bfcf6cd1ce5fa4 Merge: a32d7e1 c86b709 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 12:01:23 2014 -0400 Merge remote-tracking branch 'public/bug11648' changes/bug11648 | 8 ++++++++ src/or/dirserv.c | 14 ++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-)

1 0

[tor/master] Always finalize a zlib stream of server descriptors.
by nickm＠torproject.org 08 May '14

08 May '14

commit 6d39c8d156d6ac6f159af76a6b12dcb37cd27a7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 7 10:23:08 2014 -0400 Always finalize a zlib stream of server descriptors. Possible fix for bug 11648. --- src/or/dirserv.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f5994e0..2d623a6 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3296,8 +3296,6 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) } body = signed_descriptor_get_body(sd); if (conn->zlib_state) { - /* XXXX024 This 'last' business should actually happen on the last - * routerinfo, not on the last fingerprint. */ int last = ! smartlist_len(conn->fingerprint_stack); connection_write_to_buf_zlib(body, sd->signed_descriptor_len, conn, last); @@ -3314,6 +3312,11 @@ connection_dirserv_add_servers_to_outbuf(dir_connection_t *conn) if (!smartlist_len(conn->fingerprint_stack)) { /* We just wrote the last one; finish up. */ + if (conn->zlib_state) { + connection_write_to_buf_zlib("", 0, conn, 1); + tor_zlib_free(conn->zlib_state); + conn->zlib_state = NULL; + } conn->dir_spool_src = DIR_SPOOL_NONE; smartlist_free(conn->fingerprint_stack); conn->fingerprint_stack = NULL; @@ -3339,8 +3342,6 @@ connection_dirserv_add_microdescs_to_outbuf(dir_connection_t *conn) if (!md || !md->body) continue; if (conn->zlib_state) { - /* XXXX024 This 'last' business should actually happen on the last - * routerinfo, not on the last fingerprint. */ int last = !smartlist_len(conn->fingerprint_stack); connection_write_to_buf_zlib(md->body, md->bodylen, conn, last); if (last) { @@ -3352,6 +3353,11 @@ connection_dirserv_add_microdescs_to_outbuf(dir_connection_t *conn) } } if (!smartlist_len(conn->fingerprint_stack)) { + if (conn->zlib_state) { + connection_write_to_buf_zlib("", 0, conn, 1); + tor_zlib_free(conn->zlib_state); + conn->zlib_state = NULL; + } conn->dir_spool_src = DIR_SPOOL_NONE; smartlist_free(conn->fingerprint_stack); conn->fingerprint_stack = NULL;

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 08 May '14

08 May '14

commit dbf942910189ffa5cc24fb8140efe52dccb85662 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 8 15:46:11 2014 +0000 Update translations for tails-iuk_completed --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 9505607..4b9e97d 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 17:54+0200\n" -"PO-Revision-Date: 2014-05-08 15:15+0000\n" +"PO-Revision-Date: 2014-05-08 15:21+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "Fazendo download da atualização" #: ../lib/Tails/IUK/Frontend.pm:471 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "Baixando atualização para %{name}s %{version}s..." +msgstr "Fazendo download da atualização para %{name}s %{version}s..." #: ../lib/Tails/IUK/Frontend.pm:512 msgid ""

1 0