October 2012 - tor-commits - lists.torproject.org

[tor/master] Make tor_addr_is_internal log the calling function on error
by nickm＠torproject.org 12 Oct '12

12 Oct '12

commit 8586611718ee9c4cc81eb8fe50c937619393ade6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 12 11:34:54 2012 -0400 Make tor_addr_is_internal log the calling function on error This might make it a little easier to track down bug 7086. --- changes/addr_is_internal_debug | 4 ++++ src/common/address.c | 7 ++++--- src/common/address.h | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/addr_is_internal_debug b/changes/addr_is_internal_debug new file mode 100644 index 0000000..6de221b --- /dev/null +++ b/changes/addr_is_internal_debug @@ -0,0 +1,4 @@ + o Minor features: + - Log the call-site of a failed tor_addr_is_internal(), so that we + can learn who is calling it with AF_UNSPECIFIED and fix the + second (unrelated) part of bug 7086. diff --git a/src/common/address.c b/src/common/address.c index 9a61872..2c0c97d 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -305,7 +305,8 @@ tor_addr_lookup(const char *name, uint16_t family, tor_addr_t *addr) * also treated as internal for now.) */ int -tor_addr_is_internal(const tor_addr_t *addr, int for_listening) +tor_addr_is_internal_(const tor_addr_t *addr, int for_listening, + const char *filename, int lineno) { uint32_t iph4 = 0; uint32_t iph6[4]; @@ -355,8 +356,8 @@ tor_addr_is_internal(const tor_addr_t *addr, int for_listening) /* unknown address family... assume it's not safe for external use */ /* rather than tor_assert(0) */ - log_warn(LD_BUG, "tor_addr_is_internal() called with a non-IP address of " - "type %d", (int)v_family); + log_warn(LD_BUG, "tor_addr_is_internal() called from %s:%d with a " + "non-IP address of type %d", filename, lineno, (int)v_family); tor_fragile_assert(); return 1; } diff --git a/src/common/address.h b/src/common/address.h index 68775fb..9e7d750 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -168,7 +168,10 @@ int tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, unsigned int tor_addr_hash(const tor_addr_t *addr); int tor_addr_is_v4(const tor_addr_t *addr); -int tor_addr_is_internal(const tor_addr_t *ip, int for_listening); +int tor_addr_is_internal_(const tor_addr_t *ip, int for_listening, + const char *filename, int lineno); +#define tor_addr_is_internal(addr, for_listening) \ + tor_addr_is_internal_((addr), (for_listening), _SHORT_FILE_, __LINE__) /** Longest length that can be required for a reverse lookup name. */ /* 32 nybbles, 32 dots, 8 characters of "ip6.arpa", 1 NUL: 73 characters. */

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 12 Oct '12

12 Oct '12

commit 3e06ec64cb59204b6e6de663c251b5d05350ca3e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 14:45:42 2012 +0000 Update translations for tails-greeter --- he/he.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/he/he.po b/he/he.po index 45d4765..2cb19ed 100644 --- a/he/he.po +++ b/he/he.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <aharonoosh1(a)gmail.com>, 2012. # יעקב פייקין <jacobpa9(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2012-10-05 10:33+0000\n" -"Last-Translator: יעקב פייקין <jacobpa9(a)gmail.com>\n" +"PO-Revision-Date: 2012-10-12 14:38+0000\n" +"Last-Translator: aharonoosh <aharonoosh1(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "ברוכים הבאים ל-Tails" #: ../glade/persistencewindow.glade.h:3 msgid "Use persistence?" -msgstr "" +msgstr "השתמש בעקשנות?" #: ../glade/persistencewindow.glade.h:4 msgid "Yes" @@ -64,7 +65,7 @@ msgstr "סיסמת מנהל" msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "" +msgstr "הזן את סיסמא של ממשל במקרה שאתם צריכים לבצע משימות ניהול.\n אחרת זה יהיה מושבת לאבטחה טובה יותר." #: ../glade/optionswindow.glade.h:6 msgid "Password:" @@ -76,13 +77,13 @@ msgstr "אימות סיסמה:" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" -msgstr "" +msgstr "הסוואה של Windows" #: ../glade/optionswindow.glade.h:10 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "אפשרות זו הופכת זנבות נראים יותר כמו Microsoft Windows XP. זה עשוי להיות שימושי במקומות ציבוריים, כדי להימנע מלמשוך חשד." #: ../glade/optionswindow.glade.h:11 msgid "Activate Microsoft Windows XP Camouflage"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 12 Oct '12

12 Oct '12

commit d9c9bd08978effcace5807057e50539da1d1c3ab Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 14:45:20 2012 +0000 Update translations for vidalia_help --- pt/log.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pt/log.po b/pt/log.po index e136195..640b363 100644 --- a/pt/log.po +++ b/pt/log.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-10-12 14:12+0000\n" +"PO-Revision-Date: 2012-10-12 14:16+0000\n" "Last-Translator: Elliz <jose.g.m.g(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "" " ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). " "See the help section on <a href=\"#severities\">message severities</a> for " "more information. <a name=\"severities\"/>" -msgstr "O registo de mensagens permite-te monitorizar a informação sobre um processo Tor aberto. <a name=\"basic\"/> Cada mensagem tem uma <i>Gravidade</i> associada, variando de <b>Erro</b> (a mais grave) <b>Debug</b> (a mais verbosa). Veja a secção de ajuda em <a href=\"#severities\">message severities</a> para mais informação. <a name=\"severities\"/>" +msgstr "O registo de mensagens permite-te monitorizar a informação sobre um processo Tor aberto. <a name=\"basic\"/> Cada mensagem tem uma <i>Gravidade</i> associada, variando de <b>Erro</b> (a mais grave) <b>Debug</b> (a mais verbosa). Veja a secção de ajuda em <a href=\"#severities\">Gravidade de Mensagens</a> para mais informação. <a name=\"severities\"/>" #. type: Content of: <html><body><h3> #: en/log.html:28 @@ -42,13 +42,13 @@ msgid "" "severity message usually indicates that something has gone wrong with Tor. " "Lower severity messages appear frequently during normal Tor operations and " "usually do not need to be logged." -msgstr "" +msgstr "A gravidade das mensagens diz-te quão importante é uma mensagem. Uma mensagem de gravidade mais elevada habitualmente indica que algo de errado se passa com o Tor. Mensagens de gravidade moderada aparecem frequentemente durante o funcionamento normal do Tor, e normalmente não necessitam intervenção." #. type: Content of: <html><body><p> #: en/log.html:37 msgid "" "The possible message severities, from most severe to least severe, are:" -msgstr "" +msgstr "A possibilidade de gravidade de mensagens, da mias grave para a menos são:" #. type: Content of: <html><body><ul><li> #: en/log.html:41

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 12 Oct '12

12 Oct '12

commit 9b53cef8ffaf34686138103707529d3d9c9990bf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 14:15:24 2012 +0000 Update translations for vidalia_help_completed --- pt/links.po | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/pt/links.po b/pt/links.po new file mode 100644 index 0000000..b369998 --- /dev/null +++ b/pt/links.po @@ -0,0 +1,80 @@ +# +# Translators: +# <jose.g.m.g(a)hotmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-05-05 20:21+0200\n" +"PO-Revision-Date: 2012-10-12 14:07+0000\n" +"Last-Translator: Elliz <jose.g.m.g(a)hotmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Content of: <html><body><h1> +#: links.html:16 +msgid "Helpful Links" +msgstr "Ligações úteis" + +#. type: Content of: <html><body><h3> +#: links.html:19 +msgid "Vidalia" +msgstr "Vidalia" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 +msgid "   " +msgstr "   " + +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 +msgid "Homepage" +msgstr "Homepage" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:25 +msgid "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" +msgstr "<a href=\"https://www.torproject.org/vidalia/\"> https://www.torproject.org/vidalia/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 +msgid "Wiki and Bugtracker" +msgstr "Wiki e Bugtracker" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:33 +msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" + +#. type: Content of: <html><body><h3> +#: links.html:39 +msgid "Tor" +msgstr "Tor" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:45 +msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" +msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 +msgid "FAQ" +msgstr "Perguntas Frequentes" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:52 +msgid "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" +msgstr "<a href=\"https://www.torproject.org/docs/faq.html\"> https://www.torproject.org/docs/faq.html</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:60 +msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" +msgstr "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 12 Oct '12

12 Oct '12

commit 5b558cd3fac2cfb811f7f126a36cd6f6e7fcb6b6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 14:15:19 2012 +0000 Update translations for vidalia_help --- pt/links.po | 33 ++++++++++++++++----------------- pt/log.po | 15 +++++++-------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/pt/links.po b/pt/links.po index 3b23474..b369998 100644 --- a/pt/links.po +++ b/pt/links.po @@ -1,81 +1,80 @@ # # Translators: +# <jose.g.m.g(a)hotmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-05 20:21+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-10-12 14:07+0000\n" +"Last-Translator: Elliz <jose.g.m.g(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: links.html:16 msgid "Helpful Links" -msgstr "" +msgstr "Ligações úteis" #. type: Content of: <html><body><h3> #: links.html:19 msgid "Vidalia" -msgstr "" +msgstr "Vidalia" #. type: Content of: <html><body><table><tr><td> #: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 msgid "   " -msgstr "" +msgstr "   " #. type: Content of: <html><body><table><tr><td> #: links.html:23 links.html:43 msgid "Homepage" -msgstr "" +msgstr "Homepage" #. type: Content of: <html><body><table><tr><td> #: links.html:25 msgid "" "<a href=\"https://www.torproject.org/vidalia/\"> " "https://www.torproject.org/vidalia/</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/vidalia/\"> https://www.torproject.org/vidalia/</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:31 links.html:58 msgid "Wiki and Bugtracker" -msgstr "" +msgstr "Wiki e Bugtracker" #. type: Content of: <html><body><table><tr><td> #: links.html:33 msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" #. type: Content of: <html><body><h3> #: links.html:39 msgid "Tor" -msgstr "" +msgstr "Tor" #. type: Content of: <html><body><table><tr><td> #: links.html:45 msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:50 msgid "FAQ" -msgstr "" +msgstr "Perguntas Frequentes" #. type: Content of: <html><body><table><tr><td> #: links.html:52 msgid "" "<a href=\"https://www.torproject.org/docs/faq.html\"> " "https://www.torproject.org/docs/faq.html</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/docs/faq.html\"> https://www.torproject.org/docs/faq.html</a>" #. type: Content of: <html><body><table><tr><td> #: links.html:60 msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" -msgstr "" - - +msgstr "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" diff --git a/pt/log.po b/pt/log.po index 0f87be0..e136195 100644 --- a/pt/log.po +++ b/pt/log.po @@ -1,23 +1,24 @@ # # Translators: +# <jose.g.m.g(a)hotmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-10-12 14:12+0000\n" +"Last-Translator: Elliz <jose.g.m.g(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/log.html:16 msgid "Message Log" -msgstr "" +msgstr "Registo de Mensagens" #. type: Content of: <html><body> #: en/log.html:19 @@ -27,12 +28,12 @@ msgid "" " ranging from <b>Error</b> (most serious) to <b>Debug</b> (most verbose). " "See the help section on <a href=\"#severities\">message severities</a> for " "more information. <a name=\"severities\"/>" -msgstr "" +msgstr "O registo de mensagens permite-te monitorizar a informação sobre um processo Tor aberto. <a name=\"basic\"/> Cada mensagem tem uma <i>Gravidade</i> associada, variando de <b>Erro</b> (a mais grave) <b>Debug</b> (a mais verbosa). Veja a secção de ajuda em <a href=\"#severities\">message severities</a> para mais informação. <a name=\"severities\"/>" #. type: Content of: <html><body><h3> #: en/log.html:28 msgid "Message Severities" -msgstr "" +msgstr "Gravidade de Mensagens" #. type: Content of: <html><body><p> #: en/log.html:30 @@ -157,5 +158,3 @@ msgstr "" #: en/log.html:100 msgid "Click <i>Save Settings</i> to save your log destination." msgstr "" - -

1 0

[tor/master] Install correct incoming cell handlers on reachability testing channels
by nickm＠torproject.org 12 Oct '12

12 Oct '12

commit 9c605ecb7eeb62823dcb2042a5fbfde835f98618 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Oct 12 00:45:31 2012 -0700 Install correct incoming cell handlers on reachability testing channels Fix for bug 7086. --- src/or/dirserv.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ac7b122..ec4ecfa 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -10,6 +10,7 @@ #include "confparse.h" #include "channel.h" #include "channeltls.h" +#include "command.h" #include "connection.h" #include "connection_or.h" #include "control.h" @@ -3398,6 +3399,7 @@ dirserv_should_launch_reachability_test(const routerinfo_t *ri, void dirserv_single_reachability_test(time_t now, routerinfo_t *router) { + channel_t *chan = NULL; node_t *node = NULL; tor_addr_t router_addr; (void) now; @@ -3410,8 +3412,9 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) log_debug(LD_OR,"Testing reachability of %s at %s:%u.", router->nickname, router->address, router->or_port); tor_addr_from_ipv4h(&router_addr, router->addr); - channel_tls_connect(&router_addr, router->or_port, - router->cache_info.identity_digest); + chan = channel_tls_connect(&router_addr, router->or_port, + router->cache_info.identity_digest); + if (chan) command_setup_channel(chan); /* Possible IPv6. */ if (get_options()->AuthDirHasIPv6Connectivity == 1 && @@ -3421,8 +3424,9 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) router->nickname, tor_addr_to_str(addrstr, &router->ipv6_addr, sizeof(addrstr), 1), router->ipv6_orport); - channel_tls_connect(&router->ipv6_addr, router->ipv6_orport, - router->cache_info.identity_digest); + chan = channel_tls_connect(&router->ipv6_addr, router->ipv6_orport, + router->cache_info.identity_digest); + if (chan) command_setup_channel(chan); } }

1 0

[flashproxy/master] Check parsing of "client" and "relay" parameters.
by dcf＠torproject.org 12 Oct '12

12 Oct '12

commit 419ec0346a4ee8a2235e8056364f03e7fa39306c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 12 04:55:38 2012 -0700 Check parsing of "client" and "relay" parameters. --- proxy/flashproxy.js | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index a2e8863..327c9a5 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -415,7 +415,17 @@ function FlashProxy() { } client_addr = get_query_param_addr(query, "client"); + if (client_addr === null) { + puts("Error: can't parse \"client\" parameter."); + this.die(); + return; + } relay_addr = get_query_param_addr(query, "relay"); + if (relay_addr === null) { + puts("Error: can't parse \"relay\" parameter."); + this.die(); + return; + } if (client_addr !== undefined && relay_addr !== undefined) { this.make_proxy_pair(client_addr, relay_addr); } else if (client_addr !== undefined) {

1 0

[flashproxy/master] Raise an exception on UID parsing failure.
by dcf＠torproject.org 12 Oct '12

12 Oct '12

commit 4cacc2c3a31530d67c7609f8f33e0c8f57ef4bf9 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 12 04:32:55 2012 -0700 Raise an exception on UID parsing failure. --- facilitator/facilitator-email-poller | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 5f26edd..8bb90ca 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -259,7 +259,8 @@ def imap_get_uid(imap, index): # This grepping for the UID is bogus, but imaplib doesn't properly break up # the list of name-value pairs for us. m = re.match(r'^\d+\s+$.*\bUID\s+(\d+)\b.*$\s*$', data[0]) - assert m is not None + if m is None: + raise imaplib.IMAP4.abort("Can't find UID in %s" % repr(data[0])) return m.group(1) # Gmail's IMAP folders are funny: they are not real folders, but actually views

1 0

[flashproxy/master] Check "OK" responses with an exception rather than an assertion.
by dcf＠torproject.org 12 Oct '12

12 Oct '12

commit 87b77670a0e391e53421cc404f383ffd14e87447 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Oct 12 04:30:35 2012 -0700 Check "OK" responses with an exception rather than an assertion. The program tries reconnecting with this kind of exception. --- facilitator/facilitator-email-poller | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index d6b1b75..5f26edd 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -240,11 +240,22 @@ def handle_message(msg): log(u"registering %s" % safe_str(fac.format_addr(client_addr))) fac.put_reg(FACILITATOR_ADDR, client_addr) +def truncate_repr(s, n): + if not isinstance(s, basestring): + s = repr(s) + if len(s) > n: + return repr(s[:n]) + "[...]" + else: + return repr(s) +def check_imap_return(typ, data): + if typ != "OK": + raise imaplib.IMAP4.abort("Got type \"%s\": %s" % (typ, truncate_repr(data, 100))) + def imap_get_uid(imap, index): typ, data = imap.fetch(str(index), "(UID)") if data[0] is None: return None - assert typ == "OK" + check_imap_return(typ, data) # This grepping for the UID is bogus, but imaplib doesn't properly break up # the list of name-value pairs for us. m = re.match(r'^\d+\s+$.*\bUID\s+(\d+)\b.*$\s*$', data[0]) @@ -266,11 +277,11 @@ def imap_loop(imap): # failsafe so that messages will eventually be deleted if we are not # able to retrieve them. This act of copying also deletes from All Mail. typ, data = imap.select("[Gmail]/All Mail") - assert typ == "OK" + check_imap_return(typ, data) imap.copy("1:*", "[Gmail]/Trash") typ, data = imap.select("[Gmail]/Trash") - assert typ == "OK" + check_imap_return(typ, data) exists = int(data[0]) if exists > 0: while True: @@ -281,12 +292,12 @@ def imap_loop(imap): break typ, data = imap.uid("FETCH", uid, "(BODY[])") - assert typ == "OK" + check_imap_return(typ, data) msg_text = data[0][1] typ, data = imap.uid("STORE", uid, "+FLAGS", "\\Deleted") - assert typ == "OK" + check_imap_return(typ, data) typ, data = imap.expunge() - assert typ == "OK" + check_imap_return(typ, data) try: msg = email.message_from_string(msg_text)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 Oct '12

12 Oct '12

commit 27f13b373d35e142b21fca27a8d96d5b5133d95c Merge: b910e7f cb980b0 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Oct 12 11:33:13 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0