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

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit c365483e32b763908e319bf6a59df20d8e13c029 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 17:15:09 2014 +0000 Update translations for torcheck --- nn/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn/torcheck.po b/nn/torcheck.po index dcc75ca..06eacfa 100644 --- a/nn/torcheck.po +++ b/nn/torcheck.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-07-08 16:42+0000\n" +"PO-Revision-Date: 2014-07-08 16:51+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit ccbe7cb9452f0434579b2d1a0f2a0c275a325712 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 16:45:10 2014 +0000 Update translations for torcheck --- nn/torcheck.po | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/nn/torcheck.po b/nn/torcheck.po index 2157873..dcc75ca 100644 --- a/nn/torcheck.po +++ b/nn/torcheck.po @@ -2,12 +2,13 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-08 16:42+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "" +msgstr "Me gratulerer. Denne nettlesaren er konfigurert til å bruka Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -34,7 +35,7 @@ msgid "" msgstr "" msgid "Sorry. You are not using Tor." -msgstr "" +msgstr "Orsak. Du brukar ikkje Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -52,13 +53,13 @@ msgid "" msgstr "" msgid "Your IP address appears to be: " -msgstr "" +msgstr "IP-adressa di ser ut til å vera: " msgid "Are you using Tor?" -msgstr "" +msgstr "Brukar du Tor?" msgid "This page is also available in the following languages:" -msgstr "" +msgstr "Denne sida er òg tilgjengeleg på følgjande språk:" msgid "For more information about this exit relay, see:" msgstr "" @@ -69,28 +70,28 @@ msgid "" msgstr "" msgid "Learn More »" -msgstr "" +msgstr "Finn ut meir »" msgid "Go" -msgstr "" +msgstr "Gå" msgid "Short User Manual" -msgstr "" +msgstr "Kort brukarrettleiing" msgid "Donate to Support Tor" -msgstr "" +msgstr "Doner forå støtta Tor" msgid "Tor Q&A Site" msgstr "" msgid "Volunteer" -msgstr "" +msgstr "Friviljug" msgid "JavaScript is enabled." -msgstr "" +msgstr "JavaScript er slått på." msgid "JavaScript is disabled." -msgstr "" +msgstr "JavaScript er slått av." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Men det ser ikkje ut til å vera Tor-nettlesarpakken."

1 0

[bridgedb/develop] Remove superfluous normalizeEmail() call.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit c20c6a866c0b766a7f4ebbb1bce4622d933d7f12 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 19:51:30 2014 +0000 Remove superfluous normalizeEmail() call. * REMOVE second call to normalizeEmail() in EmailBasedDistributor.getBridgesForEmail(), and add note about where the checks are currently called. * ADD some extra logging when we receive imcoming requests from email addresses in the EMAIL_WHITELIST. * TODO check that incoming emails from addresses in EMAIL_WHITELIST have valid signatures made by the key with the corresponding GnuPG key fingerprint (as in EMAIL_WHITELIST, which is a mapping of addresses to fingerprints). --- lib/bridgedb/Dist.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 0ba2233..df1ce5b 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -404,16 +404,13 @@ class EmailBasedDistributor(Distributor): bridgeFilterRules=[] now = time.time() - emailaddr = None - try: - emailaddr = addr.normalizeEmail(emailaddress, - self.domainmap, - self.domainrules) - if not emailaddr: - raise addr.BadEmail("Couldn't normalize email address: %r" - % emailaddress) - except addr.BadEmail as error: - logging.warn(error) + # All checks on the email address, such as checks for whitelisting and + # canonicalization of domain name, are done in + # :meth:`bridgedb.email.autoresponder.getMailTo` and + # :meth:`bridgedb.email.autoresponder.SMTPAutoresponder.runChecks`. + if not emailaddress: + logging.error(("%s distributor can't get bridges for blank email " + "address!") % (self.name, emailaddress)) return [] with bridgedb.Storage.getDB() as db: @@ -424,7 +421,11 @@ class EmailBasedDistributor(Distributor): % (N, emailaddress)) if lastSaw is not None: - if (lastSaw + MAX_EMAIL_RATE) >= now: + if emailaddress in self.whitelist.keys(): + logging.info(("Whitelisted email address %s was last seen " + "%d seconds ago.") + % (emailaddress, now - lastSaw)) + elif (lastSaw + MAX_EMAIL_RATE) >= now: wait = (lastSaw + MAX_EMAIL_RATE) - now logging.info("Client %s must wait another %d seconds." % (emailaddress, wait))

1 0

[bridgedb/develop] Add whitelist attribute to bridgedb.Dist.EmailBasedDistributor.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 2795e102abfa067516bab89b834949a191e88dd8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 19:47:48 2014 +0000 Add whitelist attribute to bridgedb.Dist.EmailBasedDistributor. * ADD bridgedb.Dist.EmailBasedDistributor.whitelist attribute which should hold the contents of the EMAIL_WHITELIST setting in bridgedb.conf. * CHANGE createBridgeRings() function in bridgedb.Main module to use the new email distributor whitelist attribute, and pass it the settings from the parsed config file. --- lib/bridgedb/Dist.py | 6 +++++- lib/bridgedb/Main.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 5c0cbac..0ba2233 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -348,7 +348,7 @@ class EmailBasedDistributor(Distributor): """ def __init__(self, key, domainmap, domainrules, - answerParameters=None): + answerParameters=None, whitelist=None): """Create a bridge distributor which uses email. :type emailHmac: callable @@ -359,6 +359,9 @@ class EmailBasedDistributor(Distributor): in `bridgedb.conf`. :param domainrules: DOCDOC :param answerParameters: DOCDOC + :type whitelist: dict or ``None`` + :param whitelist: A dictionary that maps whitelisted email addresses + to GnuPG fingerprints. """ key1 = getHMAC(key, "Map-Addresses-To-Ring") self.emailHmac = getHMACFunc(key1, hex=False) @@ -367,6 +370,7 @@ class EmailBasedDistributor(Distributor): # XXXX clear the store when the period rolls over! self.domainmap = domainmap self.domainrules = domainrules + self.whitelist = whitelist or dict() self.answerParameters = answerParameters #XXX cache options not implemented diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index ccc844d..4f138f0 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -383,7 +383,8 @@ def createBridgeRings(cfg, proxyList, key): crypto.getHMAC(key, "Email-Dist-Key"), cfg.EMAIL_DOMAIN_MAP.copy(), cfg.EMAIL_DOMAIN_RULES.copy(), - answerParameters=ringParams) + answerParameters=ringParams, + whitelist=cfg.EMAIL_WHITELIST.copy()) splitter.addRing(emailDistributor, "email", cfg.EMAIL_SHARE) # As appropriate, tell the splitter to leave some bridges unallocated.

1 0

[bridgedb/develop] Merge branch 'hotfix/5463-email-line-recieved-logging' into develop
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 8939e6d4a981d5104f78d2e439c2a45e62b9d79e Merge: 33cf0d7 c20c6a8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 9 22:09:55 2014 +0000 Merge branch 'hotfix/5463-email-line-recieved-logging' into develop bridgedb.conf | 8 ++- lib/bridgedb/Dist.py | 29 +++++---- lib/bridgedb/Main.py | 3 +- lib/bridgedb/email/autoresponder.py | 83 ++++++++++++++++--------- lib/bridgedb/email/server.py | 25 ++++++-- lib/bridgedb/parse/addr.py | 2 + lib/bridgedb/test/email_helpers.py | 3 + lib/bridgedb/test/test_email_autoresponder.py | 4 +- 8 files changed, 110 insertions(+), 47 deletions(-)

1 0

[bridgedb/develop] Add TravisCI build status image to README.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 3be3aaa4a3edf3ba0f35b8efae6e2c6ce1334834 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 24 23:55:28 2014 +0000 Add TravisCI build status image to README. --- README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README b/README index e41fb4b..8d372de 100644 --- a/README +++ b/README @@ -1,5 +1,4 @@ -## BridgeDB [![Coverage Status](https://coveralls.io/repos/isislovecruft/bridgedb/badge.png)](https://coveralls.io/r/isislovecruft/bridgedb) ------------ +## BridgeDB [![Build Status](https://travis-ci.org/isislovecruft/bridgedb.svg)](https://travis-c… [![Coverage Status](https://coveralls.io/repos/isislovecruft/bridgedb/badge.png)](https://coveralls.io/r/isislovecruft/bridgedb) BridgeDB is a collection of backend servers used to distribute [Tor Bridges](https://www.torproject.org/docs/bridges). It currently consists

1 0

[bridgedb/develop] Bump Leekspin version to 0.1.4.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 65460d199eb2a6cd5a245334623e003b251b28a2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 24 23:56:37 2014 +0000 Bump Leekspin version to 0.1.4. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1338608..3654d0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ addons: env: global: - - LEEKSPIN_VERSION=0.1.3 + - LEEKSPIN_VERSION=0.1.4 - COVERAGE_VERSION=3.7.1 - COVERALLS_VERSION=0.4.2 - SURE_VERSION=1.2.2

1 0

[bridgedb/develop] Fix old-style class: bridgedb.Bridges.BridgeBlock.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit d6f0aaf19ecc11d9fec8d6a37d66abaf5797f2af Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 24 23:59:05 2014 +0000 Fix old-style class: bridgedb.Bridges.BridgeBlock. --- lib/bridgedb/Bridges.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index fdc4680..0cc9e1f 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1422,7 +1422,8 @@ class FilteredBridgeSplitter(BridgeHolder): def assignmentsArePersistent(self): return False -class BridgeBlock: + +class BridgeBlock(object): """Base class that abstracts bridge blocking""" def __init__(self): pass

1 0

[bridgedb/develop] Add generic mixin class metaclass to bridgedb.util.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit 80231a9ccffc20966f87b5e73523d036b6fe8fc1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 3 14:13:51 2014 +0000 Add generic mixin class metaclass to bridgedb.util. --- lib/bridgedb/util.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 66b228b..6d95129 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -13,6 +13,7 @@ from functools import partial +import abc import logging import logging.config import logging.handlers @@ -213,3 +214,53 @@ class JustifiedLogFormatter(logging.Formatter): """ record = self._formatCallingFuncName(record) return super(JustifiedLogFormatter, self).format(record) + + +class mixin: + """Subclasses of me can be used as a mixin class by registering another + class, ``ClassA``, which should be mixed with the ``mixin`` subclass, in + order to provide simple, less error-prone, multiple inheritance models:: + + >>> from __future__ import print_function + >>> from bridgedb.util import mixin + >>> + >>> class ClassA(object): + >>> def sayWhich(self): + >>> print("ClassA.sayWhich() called.") + >>> def doSuperThing(self): + >>> super(ClassA, self).__repr__() + >>> def doThing(self): + >>> print("ClassA is doing a thing.") + >>> + >>> class ClassB(ClassA): + >>> def sayWhich(self): + >>> print("ClassB.sayWhich() called.") + >>> def doSuperThing(self): + >>> super(ClassB, self).__repr__() + >>> def doOtherThing(self): + >>> print("ClassB is doing something else.") + >>> + >>> class ClassM(mixin): + >>> def sayWhich(self): + >>> print("ClassM.sayWhich() called.") + >>> + >>> ClassM.register(ClassA) + >>> + >>> class ClassC(ClassM, ClassB): + >>> def sayWhich(self): + >>> super(ClassC, self).sayWhich() + >>> + >>> c = ClassC() + >>> c.sayWhich() + ClassM.saywhich() called. + >>> c.doSuperThing() + <super: <class 'ClassA'>, NULL> + >>> c.doThing() + ClassA is doing a thing. + >>> c.doOtherThing() + ClassB is doing something else. + + .. info:: This class' name is lowercased because pylint is hardcoded to + expect mixin classes to end in ``'mixin'``. + """ + __metaclass__ = abc.ABCMeta

1 0

[bridgedb/develop] Remove obsolete doctest running code in bridgedb.test.util.
by isis＠torproject.org 08 Jul '14

08 Jul '14

commit def67944e4d7ccbc69df87409639010eb3422f06 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jul 3 14:19:21 2014 +0000 Remove obsolete doctest running code in bridgedb.test.util. --- lib/bridgedb/test/util.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 3bc2e56..5538a29 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -14,7 +14,6 @@ from __future__ import print_function from __future__ import unicode_literals -import doctest import os from functools import wraps @@ -73,7 +72,3 @@ def fileCheckDecorator(func): #: being run as a ``TestCase`` by ``twisted.trial``. TestCaseMixin = bdbutil.mixin TestCaseMixin.register(unittest.TestCase) - - -if __name__ == "__main__": - doctest.run_docstring_examples(fileCheckDecorator, None)

1 0