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

[bridgedb/master] Merge branch 'release-0.2.2'
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit cb8b01bc70e6a9ff47d76d393bd1752cacc91e2e Merge: b7cd297 136ff6c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 23:37:49 2014 +0000 Merge branch 'release-0.2.2' .travis.requirements.txt | 9 + .travis.yml | 43 +- CHANGELOG | 134 ++++ bridgedb.conf | 2 +- doc/sphinx/source/bridgedb.EmailServer.rst | 8 - doc/sphinx/source/bridgedb.email.autoresponder.rst | 8 + doc/sphinx/source/bridgedb.email.dkim.rst | 8 + doc/sphinx/source/bridgedb.email.request.rst | 8 + doc/sphinx/source/bridgedb.email.server.rst | 8 + doc/sphinx/source/bridgedb.email.templates.rst | 8 + doc/sphinx/source/bridgedb.rst | 7 +- doc/sphinx/source/conf.py | 7 +- lib/bridgedb/HTTPServer.py | 5 +- lib/bridgedb/email/__init__.py | 1 + lib/bridgedb/email/autoresponder.py | 646 +++++++++++++++ lib/bridgedb/email/dkim.py | 55 ++ lib/bridgedb/email/server.py | 827 ++++++------------- lib/bridgedb/email/templates.py | 11 +- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 371 +++++++-- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 350 ++++++-- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 +- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 340 ++++++-- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 334 ++++++-- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 345 ++++++-- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 337 ++++++-- lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 +++ lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 341 ++++++-- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 340 ++++++-- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 339 ++++++-- lib/bridgedb/i18n/templates/bridgedb.pot | 126 +-- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 8 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 337 ++++++-- lib/bridgedb/strings.py | 24 + lib/bridgedb/templates/bridges.html | 4 +- lib/bridgedb/templates/options.html | 1 - lib/bridgedb/test/email_helpers.py | 160 ++++ lib/bridgedb/test/test_email_autoresponder.py | 562 +++++++++++++ lib/bridgedb/test/test_email_dkim.py | 86 ++ lib/bridgedb/test/test_email_server.py | 845 +++++++++++--------- lib/bridgedb/test/util.py | 10 + requirements.txt | 4 +- scripts/make-ssl-cert | 54 +- setup.py | 2 +- 43 files changed, 5645 insertions(+), 1583 deletions(-)

1 0

[bridgedb/master] Place "TRANSLATORS" comments directly above the string they refer to.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 65535969ab8068ea26a2d2db699463213c4f41cf Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 21:36:13 2014 +0000 Place "TRANSLATORS" comments directly above the string they refer to. Apparently, Transifex only displays comments which are for the string being translated, and only one string is viewed at a time. Sigh. * THANKS to Phoul on IRC for pointing out the issue with how Transifex handles TRANSLATOR comments. --- lib/bridgedb/strings.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index 4137621..a631da7 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -24,6 +24,7 @@ You have exceeded the rate limit. Please slow down! The minimum time between emails is %s hours. All further emails during this time period will be ignored."""), 3: _("""\ COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"""), + # TRANSLATORS: Please DO NOT translate the word "BridgeDB". 4: _("Welcome to BridgeDB!"), # TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". 5: _("Currently supported transport TYPEs:"), @@ -39,20 +40,26 @@ for %s on %s at %s."""), } WELCOME = { + # TRANSLATORS: Please DO NOT translate "BridgeDB". + # TRANSLATORS: Please DO NOT translate "Pluggable Transports". + # TRANSLATORS: Please DO NOT translate "Tor". + # TRANSLATORS: Please DO NOT translate "Tor Network". 0: _("""\ BridgeDB can provide bridges with several %stypes of Pluggable Transports%s, which can help obfuscate your connections to the Tor Network, making it more difficult for anyone watching your internet traffic to determine that you are using Tor.\n\n"""), + # TRANSLATORS: Please DO NOT translate "Pluggable Transports". 1: _("""\ Some bridges with IPv6 addresses are also available, though some Pluggable Transports aren't IPv6 compatible.\n\n"""), -# TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, regular, -# or unexciting". Like vanilla ice cream. It refers to bridges which do not -# have Pluggable Transports, and only speak the regular, boring Tor -# protocol. Translate it as you see fit. Have fun with it. + # TRANSLATORS: Please DO NOT translate "BridgeDB". + # TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, + # regular, or unexciting". Like vanilla ice cream. It refers to bridges + # which do not have Pluggable Transports, and only speak the regular, + # boring Tor protocol. Translate it as you see fit. Have fun with it. 2: _("""\ Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any Pluggable Transports %s which maybe doesn't sound as cool, but they can still @@ -81,7 +88,11 @@ send the email using an address from one of the following email providers: HELP = { 0: _("My bridges don't work! I need help!"), + # TRANSLATORS: Please DO NOT translate "Tor". 1: _("""If your Tor doesn't work, you should email %s."""), + # TRANSLATORS: Please DO NOT translate "Pluggable Transports". + # TRANSLATORS: Please DO NOT translate "Tor Browser". + # TRANSLATORS: Please DO NOT translate "Tor". 2: _("""\ Try including as much info about your case as you can, including the list of bridges and Pluggable Transports you tried to use, your Tor Browser version, @@ -106,15 +117,19 @@ CAPTCHA = { HOWTO_TBB = { 0: _("""How to start using your bridges"""), + # TRANSLATORS: Please DO NOT translate "Tor Browser". 1: _("""\ To enter bridges into Tor Browser, follow the instructions on the %s Tor Browser download page %s to start Tor Browser."""), + # TRANSLATORS: Please DO NOT translate "Tor". 2: _("""\ When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow the wizard until it asks:"""), + # TRANSLATORS: Please DO NOT translate "Tor". 3: _("""\ Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor network?"""), + # TRANSLATORS: Please DO NOT translate "Tor". 4: _("""\ Select 'Yes' and then click 'Next'. To configure your new bridges, copy and paste the bridge lines into the text input box. Finally, click 'Connect', and @@ -131,6 +146,8 @@ EMAIL_COMMANDS = { "get ipv6": _("Request IPv6 bridges."), # TRANSLATORS: Please DO NOT translate the word the word "TYPE". "get transport [TYPE]": _("Request a Pluggable Transport by TYPE."), + # TRANSLATORS: Please DO NOT translate "BridgeDB". + # TRANSLATORS: Please DO NOT translate "GnuPG". "get key": _("Get a copy of BridgeDB's public GnuPG key."), #"subscribe": _("Subscribe to receive new bridges once per week"), #"unsubscribe": _("Cancel a subscription to new bridges"),

1 0

[bridgedb/master] Update translation template file.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 136ff6cc8cf733b87ea2e8055fba7bb4eac1801f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 21:50:38 2014 +0000 Update translation template file. --- lib/bridgedb/i18n/templates/bridgedb.pot | 115 +++++++++++++++++------------- 1 file changed, 65 insertions(+), 50 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index 4691154..6d830ef 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -6,12 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.2.1-81-gabf170b-dirty\n" +"Project-Id-Version: bridgedb 0.2.1-101-g6553596-dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2014-06-06 17:46+0000\n" -"PO-Revision-Date: 2014-06-06 17:48+0000\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-06 21:46+0000\n" "Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -27,11 +27,10 @@ msgstr "" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -55,39 +54,44 @@ msgstr "" msgid "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "" -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -98,18 +102,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, regular, -#. or unexciting". Like vanilla ice cream. It refers to bridges which do not -#. have Pluggable Transports, and only speak the regular, boring Tor -#. protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:56 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any" @@ -120,20 +126,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:69 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:70 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:75 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:76 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you " @@ -142,77 +148,85 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:83 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "" -#: lib/bridgedb/strings.py:84 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:85 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:92 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:97 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:98 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:103 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:108 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:109 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:112 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:115 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:118 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and" @@ -221,27 +235,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:130 +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:131 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:134 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -312,28 +328,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -341,7 +356,7 @@ msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0

[bridgedb/master] Change MailMessage.validateFrom() to respect internal proxy hosts.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit add31550fb5d4ff1ab53d8e1079a89e2b4652336 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 17 02:13:21 2014 +0000 Change MailMessage.validateFrom() to respect internal proxy hosts. The online server was getting `ORIGIN: "<bridges@ponticum>"' for the `origin` parameter to bridgedb.email.server.MailMessage.validateFrom(). In order to automatically allow forwarded emails from localhost, we passthrough on the first check on canonical domains in the validateFrom() method if the domain matches the one returned from a socket.gethostbyname() or socket.gethostname(), otherwise we fallback to canonicalizeEmailDomain() later. --- lib/bridgedb/email/server.py | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 8549e8a..5b7ceb2 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -19,6 +19,7 @@ from __future__ import unicode_literals import logging import io +import socket import time from twisted.internet import defer @@ -224,6 +225,8 @@ class MailContext(object): self.nBridges = config.EMAIL_N_BRIDGES_PER_ANSWER self.username = (config.EMAIL_USERNAME or "bridges") + self.hostname = socket.gethostname() + self.hostaddr = socket.gethostbyname(self.hostname) self.fromAddr = (config.EMAIL_FROM_ADDR or "bridges(a)torproject.org") self.smtpFromAddr = (config.EMAIL_SMTP_FROM_ADDR or self.fromAddr) self.smtpServerPort = (config.EMAIL_SMTP_PORT or 25) @@ -682,18 +685,39 @@ class MailDelivery(object): return hdr def validateFrom(self, helo, origin): + """Validate the ``"From:"`` address on the incoming email. + + This is done at the SMTP layer. Meaning that if a Postfix or other + email server is proxying emails from the outside world to BridgeDB, + the ``origin.domain`` will be set to the local hostname. + + :type helo: tuple + :param helo: The lines received during SMTP client HELO. + :type origin: :api:`twisted.mail.smtp.Address` + :param origin: The email address we received this message from. + :raises: :api:`twisted.mail.smtp.SMTPBadSender` if the + ``origin.domain`` was neither our local hostname, nor one of the + canonical domains listed in :ivar:`context.canon`. + :rtype: :api:`twisted.mail.smtp.Address` + :returns: The ``origin``. We *must* return some non-``None`` data from + this method, or else Twisted will reply to the sender with a 503 + error. + """ try: - logging.debug("ORIGIN: %r" % repr(origin.addrstr)) - canonical = canonicalizeEmailDomain(origin.domain, - self.context.canon) + if ((origin.domain == self.context.hostname) or + (origin.domain == self.context.hostaddr)): + return origin + else: + logging.debug("ORIGIN DOMAIN: %r" % origin.domain) + canonical = canonicalizeEmailDomain(origin.domain, + self.context.canon) + logging.debug("Got canonical domain: %r" % canonical) + self.fromCanonical = canonical except UnsupportedDomain as error: logging.info(error) raise smtp.SMTPBadSender(origin.domain) except Exception as error: logging.exception(error) - else: - logging.debug("Got canonical domain: %r" % canonical) - self.fromCanonical = canonical return origin # This method *cannot* return None, or it'll cause a 503. def validateTo(self, user):

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit bb948f9e376d52a1917d3c3d43dffc4468f32f1b Merge: 136ff6c cb8b01b Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 23:38:08 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Fix Python2.7.3 UnicodeDecodeError in MailMessage.getIncoming().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit a8daa33de3e35d8108a7a0ee358d0b968f95d820 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 17 02:23:00 2014 +0000 Fix Python2.7.3 UnicodeDecodeError in MailMessage.getIncoming(). --- lib/bridgedb/email/server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 5b7ceb2..d011be4 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -515,7 +515,8 @@ class MailMessage(object): :returns: A ``Message`` comprised of all lines received thus far. """ rawMessage = io.StringIO() - rawMessage.writelines([unicode('{0}\n'.format(ln)) for ln in self.lines]) + for ln in self.lines: + rawMessage.writelines(unicode(ln) + unicode('\n')) rawMessage.seek(0) return smtp.rfc822.Message(rawMessage)

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 6fe6c6538b0284b70e78c2df2f0c289c6f93a792 Merge: b0f56a6 f848aa9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 16 18:48:38 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Fix GnuPG 'invalid dash escaped line: --\n' error in templates.getFooter().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit d78fe49acfadf945aa04584fb7517a81e1e9687b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 17 02:29:58 2014 +0000 Fix GnuPG 'invalid dash escaped line: --\n' error in templates.getFooter(). --- lib/bridgedb/email/templates.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/email/templates.py b/lib/bridgedb/email/templates.py index 901ba6b..eb5c528 100644 --- a/lib/bridgedb/email/templates.py +++ b/lib/bridgedb/email/templates.py @@ -103,9 +103,8 @@ def addHowto(template): def addFooter(template, clientAddress=None): """Add a footer. - -- + -- <3 BridgeDB - ________________________________________________________________________ Public Keys: https://bridges.torproject.org/keys @@ -115,8 +114,8 @@ def addFooter(template, clientAddress=None): now = datetime.utcnow() clientAddr = clientAddress.addrstr - footer = u'--\n' - footer += u' <3 BridgeDB\n\n' + footer = u' --\n' + footer += u' <3 BridgeDB\n' footer += u'_' * 70 footer += u'\n' footer += template.gettext(strings.EMAIL_MISC_TEXT[8])

1 0

[bridgedb/master] Fix GnuPG invalid armor header in email.templates.getFooter().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit d05cd1e55da29d0f38fffb9b1c06a1ad9cbf67a0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 17 02:24:39 2014 +0000 Fix GnuPG invalid armor header in email.templates.getFooter(). --- lib/bridgedb/email/templates.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/email/templates.py b/lib/bridgedb/email/templates.py index 8a7f4aa..901ba6b 100644 --- a/lib/bridgedb/email/templates.py +++ b/lib/bridgedb/email/templates.py @@ -106,7 +106,7 @@ def addFooter(template, clientAddress=None): -- <3 BridgeDB - ------------------------------------------------------------------------- + ________________________________________________________________________ Public Keys: https://bridges.torproject.org/keys This email was generated with rainbows, unicorns, and sparkles @@ -117,7 +117,7 @@ def addFooter(template, clientAddress=None): footer = u'--\n' footer += u' <3 BridgeDB\n\n' - footer += u'-' * 70 + footer += u'_' * 70 footer += u'\n' footer += template.gettext(strings.EMAIL_MISC_TEXT[8]) footer += u': https://bridges.torproject.org/keys\n'

1 0

[bridgedb/master] Whitespace fixes in lib/bridgedb/email/server.py.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 181f8eb6a71189edecc07e6fb2361f0aaedae9de Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 19 20:03:10 2014 +0000 Whitespace fixes in lib/bridgedb/email/server.py. --- lib/bridgedb/email/server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index d011be4..dbc0c67 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -318,7 +318,7 @@ class MailResponse(object): def read(self, *args, **kwargs): self.mailfile.read(*args, **kwargs) read.__doc__ = mailfile.read.__doc__ - + def readline(self, *args, **kwargs): self.mailfile.readline(*args, **kwargs) readline.__doc__ = mailfile.readline.__doc__ @@ -330,11 +330,11 @@ class MailResponse(object): def seek(self, *args, **kwargs): self.mailfile.seek(*args, **kwargs) seek.__doc__ = mailfile.seek.__doc__ - + def tell(self, *args, **kwargs): self.mailfile.tell(*args, **kwargs) tell.__doc__ = mailfile.tell.__doc__ - + def truncate(self, *args, **kwargs): self.mailfile.truncate(*args, **kwargs) truncate.__doc__ = mailfile.truncate.__doc__

1 0