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

[bridgedb/develop] Fix typo in IBridgeRequest.addressClass specification.
by isis＠torproject.org 15 May '14

15 May '14

commit a92433d9634a17321acf9a35f65200feaa0124cc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 23:19:00 2014 +0000 Fix typo in IBridgeRequest.addressClass specification. * THANKS to sysrqb for pointing it out! (on the #5463 thread) --- lib/bridgedb/bridgerequest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index 4f32f67..0d7fb5a 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -26,7 +26,7 @@ class IBridgeRequest(Interface): """Interface specification of client options for requested bridges.""" addressClass = Attribute( - "The IP version of bridges addresses to distribute to the client.") + "The IP version of bridge addresses to distribute to the client.") filters = Attribute( "A list of callables used to filter bridges from a hashring.") transports = Attribute(

1 0

[bridgedb/develop] Add unittests for bridgedb.schedule module.
by isis＠torproject.org 15 May '14

15 May '14

commit b58e062ee248de19767614da152776b3ad6bbaae Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 03:18:51 2014 +0000 Add unittests for bridgedb.schedule module. --- lib/bridgedb/test/test_schedule.py | 201 ++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) diff --git a/lib/bridgedb/test/test_schedule.py b/lib/bridgedb/test/test_schedule.py new file mode 100644 index 0000000..24c45ef --- /dev/null +++ b/lib/bridgedb/test/test_schedule.py @@ -0,0 +1,201 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# :copyright: (c) 2014, Isis Lovecruft +# (c) 2014, The Tor Project, Inc. +# :license: see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.schedule` module.""" + +from __future__ import print_function + +from twisted.trial import unittest + +from bridgedb import schedule + + +class UnscheduledTests(unittest.TestCase): + """Tests for :class:`bridgedb.scheduled.Unscheduled`.""" + + def setUp(self): + self.sched = schedule.Unscheduled() + + def test_Unscheduled_init(self): + """The instance should be an instance of its class.""" + self.assertIsInstance(self.sched, schedule.Unscheduled) + + def test_Unscheduled_providesISchedule(self): + """Unscheduled should implement the ISchedule interface.""" + schedule.ISchedule.namesAndDescriptions() + self.assertTrue(schedule.ISchedule.providedBy(self.sched)) + + def test_Unscheduled_intervalStart_noargs(self): + time = self.sched.intervalStart() + self.assertIsInstance(time, int) + self.assertEquals(time, -62135596800) + + def test_Unscheduled_getInterval_noargs(self): + time = self.sched.getInterval() + self.assertIsInstance(time, str) + self.assertEquals(time, "1970-01-01 00:00:00") + + def test_Unscheduled_nextIntervalStarts_noargs(self): + time = self.sched.nextIntervalStarts() + self.assertIsInstance(time, int) + self.assertEquals(time, 253402300799) + + +class ScheduledIntervalTests(unittest.TestCase): + """Tests for :class:`bridgedb.scheduled.ScheduledInterval`.""" + + def setUp(self): + import time + self.now = time.time + self.sched = schedule.ScheduledInterval + + def test_ScheduledInterval_providesISchedule(self): + """ScheduledInterval should implement the ISchedule interface.""" + self.assertTrue(schedule.ISchedule.providedBy(self.sched('month', 1))) + + def _check_init(self, sched): + """The instance should be an instance of its class.""" + self.assertIsInstance(sched, schedule.ScheduledInterval) + + def test_ScheduledInterval_init_month(self): + self._check_init(self.sched('month', 1)) + + def test_ScheduledInterval_init_week(self): + self._check_init(self.sched('week', 2)) + + def test_ScheduledInterval_init_day(self): + self._check_init(self.sched('days', 5)) + + def test_ScheduledInterval_init_hour(self): + self._check_init(self.sched('hours', 12)) + + def test_ScheduledInterval_init_minute(self): + self._check_init(self.sched('minute', 10)) + + def test_ScheduledInterval_init_seconds(self): + self._check_init(self.sched('seconds', 30)) + + def test_ScheduledInterval_init_badIntervalPeriod(self): + self.assertRaises(schedule.UnknownInterval, + self.sched, 'decades', 2) + + def test_ScheduledInterval_init_badIntervalCount(self): + self.assertRaises(schedule.UnknownInterval, + self.sched, 'minutes', 'd20') + + def test_ScheduledInterval_init_negativeIntervalCount(self): + sched = self.sched('days', -100000) + self.assertEquals(sched.intervalCount, 1) + self.assertEquals(sched.intervalPeriod, 'day') + + def test_ScheduledInterval_init_noargs(self): + """Check that the defaults parameters function as expected.""" + sched = self.sched() + self.assertEquals(sched.intervalCount, 1) + self.assertEquals(sched.intervalPeriod, 'hour') + + def _check_intervalStart(self, period='second', count=30, variance=30): + """Test the ScheduledInterval.intervalStart() method. + + :param str period: The interval type for the period. + :param int count: The number of **period**s within an interval. + :param int variance: The amount of variance (in seconds) to tolerate + between the start of the interval containing now, and now. + """ + now = int(self.now()) + sched = self.sched(period, count) + time = sched.intervalStart(now) + self.assertIsInstance(time, int) + self.assertApproximates(now, time, variance) + + def test_ScheduledInterval_intervalStart_month(self): + self._check_intervalStart('month', 1, 31*24*60*60) + + def test_ScheduledInterval_intervalStart_week(self): + self._check_intervalStart('week', 2, 14*24*60*60) + + def test_ScheduledInterval_intervalStart_day(self): + self._check_intervalStart('days', 5, 5*24*60*60) + + def test_ScheduledInterval_intervalStart_hour(self): + self._check_intervalStart('hours', 12, 12*60*60) + + def test_ScheduledInterval_intervalStart_minute(self): + self._check_intervalStart('minute', 10, 10*60) + + def test_ScheduledInterval_intervalStart_seconds(self): + self._check_intervalStart('seconds', 30, 30) + + def _check_getInterval(self, period='second', count=30, variance=30): + """Test the ScheduledInterval.getInterval() method. + + :param str period: The interval type for the period. + :param int count: The number of **period**s within an interval. + :param int variance: The amount of variance (in seconds) to tolerate + between the start of the interval containing now, and now. + """ + now = int(self.now()) + sched = self.sched(period, count) + ts = sched.getInterval(now) + self.assertIsInstance(ts, str) + secs = [int(x) for x in ts.replace('-', ' ').replace(':', ' ').split()] + [secs.append(0) for _ in xrange(6-len(secs))] + secs = schedule.calendar.timegm(secs) + self.assertApproximates(now, secs, variance) + + def test_ScheduledInterval_getInterval_month(self): + self._check_getInterval('month', 2, 2*31*24*60*60) + + def test_ScheduledInterval_getInterval_week(self): + self._check_getInterval('week', 1, 7*24*60*60) + + def test_ScheduledInterval_getInterval_day(self): + self._check_getInterval('days', 4, 4*24*60*60) + + def test_ScheduledInterval_getInterval_hour(self): + self._check_getInterval('hours', 23, 23*60*60) + + def test_ScheduledInterval_getInterval_minute(self): + self._check_getInterval('minutes', 15, 15*60) + + def test_ScheduledInterval_getInterval_seconds(self): + self._check_getInterval('seconds', 10, 60) + + def _check_nextIntervalStarts(self, period='second', count=30, variance=30): + """Test the ScheduledInterval.nextIntervalStarts() method. + + :param str period: The interval type for the period. + :param int count: The number of **period**s within an interval. + :param int variance: The amount of variance (in seconds) to tolerate + between the start of the interval containing now, and now. + """ + now = int(self.now()) + sched = self.sched(period, count) + time = sched.nextIntervalStarts(now) + self.assertIsInstance(time, int) + # (now + variance - time) should be > variance + self.assertApproximates(now + variance, time, variance) + + def test_ScheduledInterval_nextIntervalStarts_month(self): + self._check_nextIntervalStarts('month', 2, 2*31*24*60*60) + + def test_ScheduledInterval_nextIntervalStarts_week(self): + self._check_nextIntervalStarts('week', 1, 7*24*60*60) + + def test_ScheduledInterval_nextIntervalStarts_day(self): + self._check_nextIntervalStarts('days', 4, 4*24*60*60) + + def test_ScheduledInterval_nextIntervalStarts_hour(self): + self._check_nextIntervalStarts('hours', 23, 23*60*60) + + def test_ScheduledInterval_nextIntervalStarts_minute(self): + self._check_nextIntervalStarts('minutes', 15, 15*60) + + def test_ScheduledInterval_nextIntervalStarts_seconds(self): + self._check_nextIntervalStarts('seconds', 10, 10)

1 0

[bridgedb/develop] Document instance variables for the email.server.MailMessage class.
by isis＠torproject.org 15 May '14

15 May '14

commit 8e2b3bd5259e261ddc8670586ac242bfbe9f097b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 15 00:09:41 2014 +0000 Document instance variables for the email.server.MailMessage class. * FIXES the `list` ivar accidentally being documented in the __init__() method as a parameter. * THANKS to sysrqb for pointing out the mistake. --- lib/bridgedb/email/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index e963e61..f550052 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -457,13 +457,18 @@ class MailResponse(object): class MailMessage(object): - """Plugs into the Twisted Mail and receives an incoming message.""" + """Plugs into the Twisted Mail and receives an incoming message. + + :ivar list lines: A list of lines from an incoming email message. + :ivar int nBytes: The number of bytes received thus far. + :ivar bool ignoring: If ``True``, we're ignoring the rest of this message + because it exceeded :ivar:`MailContext.maximumSize`. + """ implements(smtp.IMessage) def __init__(self, context, fromCanonical=None): """Create a new MailMessage from a MailContext. - :param list lines: A list of lines from an incoming email message. :type context: :class:`MailContext` :param context: The configured context for the email server. :type canonicalFrom: str or None

1 0

[bridgedb/develop] Rewrite test_createChallenge_decryptedAnswerMatches() unittest.
by isis＠torproject.org 15 May '14

15 May '14

commit 3c342d7d6e69ebc887cdbd4a7c3b991ef60fd409 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 23:03:51 2014 +0000 Rewrite test_createChallenge_decryptedAnswerMatches() unittest. * CHANGE GimpCaptchaTests.test_createChallenge_decryptedAnswerMatches() unittest to also check embedded timestamp. --- lib/bridgedb/test/test_captcha.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index 536f29e..a5083d7 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -10,8 +10,9 @@ """Unittests for the :mod:`bridgedb.captcha` module.""" -import shutil import os +import shutil +import time from base64 import urlsafe_b64decode @@ -170,15 +171,18 @@ class GimpCaptchaTests(unittest.TestCase): """The HMAC in createChallenge() return value should be valid.""" c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) - answer = 'ThisAnswerShouldDecryptToThis' - challenge = c.createChallenge(answer) + challenge = c.createChallenge('ThisAnswerShouldDecryptToThis') decoded = urlsafe_b64decode(challenge) hmac = decoded[:20] orig = decoded[20:] correctHMAC = crypto.getHMAC(self.hmacKey, orig) self.assertEqual(hmac, correctHMAC) + decrypted = self.sekrit.decrypt(orig) - self.assertEqual(answer, decrypted) + timestamp = int(decrypted[:12].lstrip('0')) + # The timestamp should be within 30 seconds of right now. + self.assertApproximates(timestamp, int(time.time()), 30) + self.assertEqual('ThisAnswerShouldDecryptToThis', decrypted[12:]) def test_get(self): """GimpCaptcha.get() should return image and challenge strings."""

1 0

[bridgedb/develop] Add a ScheduledInterval timeout to make GimpCaptcha stale.
by isis＠torproject.org 15 May '14

15 May '14

commit 2d16b608449be112023cbeb3bccfe901502c5e44 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 21:54:39 2014 +0000 Add a ScheduledInterval timeout to make GimpCaptcha stale. * FIXES #11215 which describes a problem where a successful challenge string and CAPTCHA solution pair can be replayed to the server, once per bridge hashring rotation period (every three hours) to get a new set of bridges without solving a CAPTCHA. * ADD a `GimpCaptcha.sched` attribute which holds a `bridgedb.schedule.ScheduledInterval` for determining which time period the CAPTCHA was created in, as well as for determining if we're still in the same time period during CAPTCHA solution verification. * ADD a padded timestamp to the encrypted bloc, ENC_BLOB, inside the format of the GimpCaptcha.challenge strings. * ADD a captcha.CaptchaExpired exception which is raised when we're checking a CAPTCHA solution that is no longer in the allowed time interval. --- lib/bridgedb/HTTPServer.py | 12 +++++-- lib/bridgedb/captcha.py | 79 ++++++++++++++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 24 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 8289be3..9d76e28 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -313,14 +313,20 @@ class GimpCaptchaProtectedResource(CaptchaProtectedResource): :rtupe: bool :returns: True, if the CAPTCHA solution was valid; False otherwise. """ + valid = False challenge, solution = self.extractClientSolution(request) clientIP = self.getClientIP(request) clientHMACKey = crypto.getHMAC(self.hmacKey, clientIP) - valid = captcha.GimpCaptcha.check(challenge, solution, - self.secretKey, clientHMACKey) + + try: + valid = captcha.GimpCaptcha.check(challenge, solution, + self.secretKey, clientHMACKey) + except captcha.CaptchaExpired as error: + logging.warn(error) + valid = False + logging.debug("%sorrect captcha from %r: %r." % ("C" if valid else "Inc", clientIP, solution)) - return valid def getCaptchaImage(self, request): diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index e10bc81..758c1f3 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -39,6 +39,7 @@ \_ GimpCaptcha - Class for obtaining a CAPTCHA from a local cache. |- hmacKey - A client-specific key for HMAC generation. |- cacheDir - The path to the local CAPTCHA cache directory. + |- sched - A class for timing out CAPTCHAs after an interval. \_ get() - Get a CAPTCHA image from the cache and create a challenge. .. @@ -58,6 +59,7 @@ from base64 import urlsafe_b64decode import logging import random import os +import time import urllib2 from BeautifulSoup import BeautifulSoup @@ -65,9 +67,13 @@ from BeautifulSoup import BeautifulSoup from zope.interface import Interface, Attribute, implements from bridgedb import crypto +from bridgedb import schedule from bridgedb.txrecaptcha import API_SSL_SERVER +class CaptchaExpired(ValueError): + """Raised when a client's CAPTCHA is too stale.""" + class CaptchaKeyError(Exception): """Raised if a CAPTCHA system's keys are invalid or missing.""" @@ -200,6 +206,8 @@ class GimpCaptcha(Captcha): .. _gimp-captcha: https://github.com/isislovecruft/gimp-captcha """ + sched = schedule.ScheduledInterval('minutes', 30) + def __init__(self, publicKey=None, secretKey=None, hmacKey=None, cacheDir=None): """Create a ``GimpCaptcha`` which retrieves images from **cacheDir**. @@ -242,37 +250,52 @@ class GimpCaptcha(Captcha): :param str secretKey: A PKCS#1 OAEP-padded, private RSA key, used for verifying the client's solution to the CAPTCHA. :param bytes hmacKey: A private key for generating HMACs. + :raises CaptchaExpired: if the **solution** was for a stale CAPTCHA. :rtype: bool - :returns: True if the CAPTCHA solution was correct. + :returns: ``True`` if the CAPTCHA solution was correct and not + stale. ``False`` otherwise. """ - validHMAC = False + hmacIsValid = False if not solution: - return validHMAC + return hmacIsValid logging.debug("Checking CAPTCHA solution %r against challenge %r" % (solution, challenge)) try: decoded = urlsafe_b64decode(challenge) - hmac = decoded[:20] - original = decoded[20:] - verified = crypto.getHMAC(hmacKey, original) - validHMAC = verified == hmac + hmacFromBlob = decoded[:20] + encBlob = decoded[20:] + hmacNew = crypto.getHMAC(hmacKey, encBlob) + hmacIsValid = hmacNew == hmacFromBlob except Exception: return False finally: - if validHMAC: + if hmacIsValid: try: - decrypted = secretKey.decrypt(original) + answerBlob = secretKey.decrypt(encBlob) + + timestamp = answerBlob[:12].lstrip('0') + then = cls.sched.nextIntervalStarts(int(timestamp)) + now = int(time.time()) + answer = answerBlob[12:] except Exception as error: logging.warn(error.message) else: - if solution.lower() == decrypted.lower(): + # If the beginning of the 'next' interval (the interval + # after the one when the CAPTCHA timestamp was created) + # has already passed, then the CAPTCHA is stale. + if now >= then: + exp = schedule.fromUnixSeconds(then).isoformat(sep=' ') + raise CaptchaExpired("Solution %r was for a CAPTCHA " + "which already expired at %s." + % (solution, exp)) + if solution.lower() == answer.lower(): return True return False def createChallenge(self, answer): - """Encrypt-then-HMAC the CAPTCHA **answer**. + """Encrypt-then-HMAC a timestamp plus the CAPTCHA **answer**. A challenge string consists of a URL-safe, base64-encoded string which contains an ``HMAC`` concatenated with an ``ENC_BLOB``, in the @@ -295,34 +318,48 @@ class GimpCaptcha(Captcha): | | applying :func:`~crypto.getHMAC` to the | | | | ``ENC_BLOB``. | | +-------------+--------------------------------------------+----------+ - | ENC_BLOB | An encrypted ``ANSWER``, created with | varies | + | ENC_BLOB | An encrypted ``ANSWER_BLOB``, created with | varies | | | a PKCS#1 OAEP-padded RSA :ivar:`publicKey`.| | +-------------+--------------------------------------------+----------+ + | ANSWER_BLOB | Contains the concatenated ``TIMESTAMP`` | varies | + | | and ``ANSWER``. | | + +-------------+--------------------------------------------+----------+ + | TIMESTAMP | A Unix Epoch timestamp, in seconds, | 12 bytes | + | | left-padded with "0"s. | | + +-------------+--------------------------------------------+----------+ | ANSWER | A string containing answer to this | 8 bytes | | | CAPTCHA :ivar:`image`. | | +-------------+--------------------------------------------+----------+ The steps taken to produce a ``CHALLENGE`` are then: - 1. Encrypt the ``ANSWER`` to :ivar:`publicKey` to create - the ``ENC_BLOB``. + 1. Create a ``TIMESTAMP``, and pad it on the left with ``0``s to 12 + bytes in length. + + 2. Next, take the **answer** to this CAPTCHA :ivar:`image: and + concatenate the padded ``TIMESTAMP`` and the ``ANSWER``, forming + an ``ANSWER_BLOB``. + + 3. Encrypt the resulting ``ANSWER_BLOB`` to :ivar:`publicKey` to + create the ``ENC_BLOB``. - 2. Use the client-specific :ivar:`hmacKey` to apply the + 4. Use the client-specific :ivar:`hmacKey` to apply the :func:`~crypto.getHMAC` function to the ``ENC_BLOB``, obtaining an ``HMAC``. - 3. Create the final ``CHALLENGE`` string by concatenating the + 5. Create the final ``CHALLENGE`` string by concatenating the ``HMAC`` and ``ENC_BLOB``, then base64-encoding the result. :param str answer: The answer to a CAPTCHA. :rtype: str :returns: A challenge string. """ - encrypted = self.publicKey.encrypt(answer) - hmac = crypto.getHMAC(self.hmacKey, encrypted) - challenge = hmac + encrypted - encoded = urlsafe_b64encode(challenge) - return encoded + timestamp = str(int(time.time())).zfill(12) + blob = timestamp + answer + encBlob = self.publicKey.encrypt(blob) + hmac = crypto.getHMAC(self.hmacKey, encBlob) + challenge = urlsafe_b64encode(hmac + encBlob) + return challenge def get(self): """Get a random CAPTCHA from the cache directory.

1 0

[bridgedb/develop] Rewrite MailMessage.getRecipient docstring.
by isis＠torproject.org 15 May '14

15 May '14

commit 6ebb9520bce10588fb76bea14fd1ae20f4672932 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 15 02:15:19 2014 +0000 Rewrite MailMessage.getRecipient docstring. --- lib/bridgedb/email/server.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index f550052..8549e8a 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -551,16 +551,14 @@ class MailMessage(object): return client def getRecipient(self, incoming): - """Find our **address** in a list of ``('NAME', '<ADDRESS>')`` pairs. + """Find our address in the recipients list of the **incoming** message. - If our address isn't found (which can't happen), return the default - context :header:`From` address so we can keep on working. - - :param str address: Our email address, as set in the - ``EMAIL_SMTP_FROM`` config option. - :param list addressList: A list of 2-tuples of strings, the first - string is a full name, username, common name, etc., and the second - is the entity's email address. + :type incoming: :api:`twisted.mail.smtp.rfc822.Message` + :param incoming: An incoming ``Message``, i.e. as returned from + :meth:`getIncomingMessage`. + :rtype: str + :return: Our address from the recipients list. If we can't find it + return our default ``SMTP_FROM_ADDRESS`` from the config file. """ address = self.context.fromAddr addressList = incoming.getaddrlist("To")

1 0

[bridgedb/develop] Merge branch 'fix/11215-captcha-timeouts' into develop
by isis＠torproject.org 15 May '14

15 May '14

commit 77293a3cca19b1fbe9d58cc1596f54cd0bd140a4 Merge: 5ccdda5 3c342d7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 23:16:40 2014 +0000 Merge branch 'fix/11215-captcha-timeouts' into develop doc/sphinx/source/bridgedb.rst | 1 + doc/sphinx/source/bridgedb.schedule.rst | 10 ++ doc/sphinx/source/conf.py | 1 + lib/bridgedb/HTTPServer.py | 18 ++- lib/bridgedb/Main.py | 10 +- lib/bridgedb/Tests.py | 4 +- lib/bridgedb/Time.py | 132 --------------- lib/bridgedb/captcha.py | 79 ++++++--- lib/bridgedb/email/server.py | 4 +- lib/bridgedb/schedule.py | 267 +++++++++++++++++++++++++++++++ lib/bridgedb/test/test_HTTPServer.py | 4 +- lib/bridgedb/test/test_captcha.py | 12 +- lib/bridgedb/test/test_email_server.py | 6 +- lib/bridgedb/test/test_schedule.py | 201 +++++++++++++++++++++++ 14 files changed, 572 insertions(+), 177 deletions(-)

1 0

[bridgedb/develop] Add file header and docstring to bridgedb.email.request module.
by isis＠torproject.org 15 May '14

15 May '14

commit 0becfd4423fb03b8580c4e8f098f348a879f5cfb Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 23:23:30 2014 +0000 Add file header and docstring to bridgedb.email.request module. * THANKS again to sysrqb for the catch! --- lib/bridgedb/email/request.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/bridgedb/email/request.py b/lib/bridgedb/email/request.py index 92e3c38..a6326fe 100644 --- a/lib/bridgedb/email/request.py +++ b/lib/bridgedb/email/request.py @@ -1,4 +1,20 @@ # -*- coding: utf-8; test-case-name: bridgedb.test.test_email_request; -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Nick Mathewson <nickm(a)torproject.org> +# Isis Lovecruft <isis(a)torproject.org> 0xA3ADB67A2CDB8B35 +# Matthew Finkel <sysrqb(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2013-2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +"""Classes for parsing and storing information about requests for bridges +which are sent to the email distributor. +""" from __future__ import print_function from __future__ import unicode_literals

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 15 May '14

15 May '14

commit 1184a4601794b609490717de0c2147478902b796 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 15 01:15:26 2014 +0000 Update translations for torbirdy --- es_AR/torbirdy.dtd | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/es_AR/torbirdy.dtd b/es_AR/torbirdy.dtd index f3b4eef..0a7dd74 100644 --- a/es_AR/torbirdy.dtd +++ b/es_AR/torbirdy.dtd @@ -14,50 +14,54 @@ <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> <!ENTITY torbirdy.prefs.extra2.button "Restablecer valores por defecto"> <!ENTITY torbirdy.prefs.extra2.key "d"> -<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> +<!ENTITY torbirdy.prefs.testproxy.button "Pruebe los ajustes proxy"> <!ENTITY torbirdy.prefs.testproxy.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Proxy"> -<!ENTITY torbirdy.prefs.privacy.label "Privacy"> +<!ENTITY torbirdy.prefs.privacy.label "Privacidad"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Security"> -<!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> +<!ENTITY torbirdy.prefs.security.label "Seguridad"> +<!ENTITY torbirdy.prefs.recommended.text "Use los ajustes proxy recomendados para TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> -<!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> +<!ENTITY torbirdy.prefs.anonservice.text "Elija un servicio de anonimatización"> <!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "Use custom proxy settings"> +<!ENTITY torbirdy.prefs.customsettings.text "Use las configuraciones proxy a medida + +"> <!ENTITY torbirdy.prefs.customsettings.key "c"> <!ENTITY torbirdy.prefs.socks_host.label "SOCKS Host: "> <!ENTITY torbirdy.prefs.socks_host.key "h"> -<!ENTITY torbirdy.prefs.socks_port.label "Port: "> +<!ENTITY torbirdy.prefs.socks_port.label "Puerto:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> <!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Enable push email support for IMAP accounts [default: disabled]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> +<!ENTITY torbirdy.prefs.startup_folder.label "Seleccione la última carpeta de correo al inicio [valores por defecto inhabilitados]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> -<!ENTITY torbirdy.prefs.timezone.label "Do not set Thunderbird's time zone to UTC [default: set to UTC]"> +<!ENTITY torbirdy.prefs.timezone.label "No fije el huso horario de Thunderbird en UTC [Valor por defecto: fijado en UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "No coloque las identidades de la clave del receptor en mensajes encriptados [valor por defecto: colocar]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> +<!ENTITY torbirdy.prefs.confirmemail.label "Confirme si Enigmail está habilitado antes de enviar un e-mail [valor por defecto: no confirme]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> -<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]"> +<!ENTITY torbirdy.prefs.emailwizard.label "Habilite el asistente automático de configuración de email Thunderbird [valor por defecto: inhabilitado] +"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]"> +<!ENTITY torbirdy.prefs.automatic.label "Chequee nuevos mensajes automáticamente para todas las cuentas [valor por defecto: inhabilitado]"> <!ENTITY torbirdy.prefs.automatic.key "f"> -<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]"> +<!ENTITY torbirdy.prefs.renegotiation.label "Permitir conexiones a servidores sin soporte SSL/TLS con renegociación segura [valor por defecto: no permitir]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> -<!ENTITY torbirdy.prefs.account_specific "Account-Specific"> +<!ENTITY torbirdy.prefs.account_specific "Específico/a de la cuenta"> <!ENTITY torbirdy.prefs.select_account.key "C"> -<!ENTITY torbirdy.prefs.select_account.label "Choose an account: "> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: "> +<!ENTITY torbirdy.prefs.select_account.label "Elija una cuenta"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Servidor(es) principal(es) para usar:"> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Use Tor Onion Router"> -<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium)"> +<!ENTITY torbirdy.panel.usejondo.label "Use JonDo (Premium) +"> <!ENTITY torbirdy.panel.usewhonix.label "Use Whonix"> -<!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences"> +<!ENTITY torbirdy.panel.preferences.label "Abra las preferencias de TorBirdy"> -<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> +<!ENTITY torbirdy.firstrun.title "Primera vuelta de TorBirdy">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 15 May '14

15 May '14

commit 7e828e8c345b2fb4160cb06dd1a5667472c15dea Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 15 00:45:36 2014 +0000 Update translations for torbirdy --- es_AR/torbirdy.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/es_AR/torbirdy.dtd b/es_AR/torbirdy.dtd index 1cc1767..f3b4eef 100644 --- a/es_AR/torbirdy.dtd +++ b/es_AR/torbirdy.dtd @@ -1,18 +1,18 @@ -<!ENTITY torbirdy.accountprefs.title "Account Configuration"> -<!ENTITY torbirdy.accountprefs.startup.label "Check for new messages at startup"> +<!ENTITY torbirdy.accountprefs.title "Configuración de la cuenta"> +<!ENTITY torbirdy.accountprefs.startup.label "Chequee nuevos mensajes al iniciar"> <!ENTITY torbirdy.accountprefs.startup.key "C"> -<!ENTITY torbirdy.accountprefs.minutes.label "Check for new messages every"> -<!ENTITY torbirdy.accountprefs.minutes.key "y"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutes"> +<!ENTITY torbirdy.accountprefs.minutes.label "Chequee los nuevos mensajes cada"> +<!ENTITY torbirdy.accountprefs.minutes.key "and"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "minutos"> <!ENTITY torbirdy.accountprefs.cancel.button "Cancelar"> -<!ENTITY torbirdy.accountprefs.save.button "Save"> +<!ENTITY torbirdy.accountprefs.save.button "Guardar"> <!ENTITY torbirdy.accountprefs.save.key "S"> -<!ENTITY torbirdy.prefs.title "TorBirdy Preferences"> -<!ENTITY torbirdy.prefs.save.button "Save"> +<!ENTITY torbirdy.prefs.title "Preferencias de TorBirdy"> +<!ENTITY torbirdy.prefs.save.button "Guardar"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Cancelar"> -<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults"> +<!ENTITY torbirdy.prefs.extra2.button "Restablecer valores por defecto"> <!ENTITY torbirdy.prefs.extra2.key "d"> <!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.testproxy.key "n">

1 0