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

[bridgedb/develop] Fix captcha.Captcha.get() implementation.
by isis＠torproject.org 14 May '14

14 May '14

commit b7b65a6afcb8e85271ed05350fdba5542ac9cf99 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 21:13:12 2014 +0000 Fix captcha.Captcha.get() implementation. It's not supposed to return anything. It's only supposed to set the Captcha.image and Captcha.challenge attributes. --- lib/bridgedb/captcha.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index f5674c4..ca2575c 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -114,7 +114,13 @@ class Captcha(object): self.secretKey = secretKey def get(self): - return self.image + """Retrieve a new CAPTCHA image and its associated challenge string. + + The image and challenge will be stored as :ivar:`image` and + :ivar:`challenge, respectively. + """ + self.image = None + self.challenge = None class ReCaptcha(Captcha):

1 0

[bridgedb/develop] Tell twisted.web.server.Site not to display tracebacks.
by isis＠torproject.org 14 May '14

14 May '14

commit 5ccdda5c5ba6b4dd3462ef4038a8d4e809d630cd Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 21:35:55 2014 +0000 Tell twisted.web.server.Site not to display tracebacks. --- lib/bridgedb/HTTPServer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index ead6d60..b436df2 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -906,6 +906,7 @@ def addWebServer(cfg, dist, sched): httpdist.putChild('bridges', bridges) site = server.Site(httpdist) + site.displayTracebacks = False if cfg.HTTP_UNENCRYPTED_PORT: ip = cfg.HTTP_UNENCRYPTED_BIND_IP or ""

1 0

[bridgedb/develop] Simplify Captcha and CaptchaProtectedResource keypair attributes.
by isis＠torproject.org 14 May '14

14 May '14

commit f0b9885eabb832e6d0ba688c7723266e9f6b0117 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 21:24:21 2014 +0000 Simplify Captcha and CaptchaProtectedResource keypair attributes. All *Captcha and *CaptchaProtectedResource classes and subclasses (as well as their interface specifications) now have `publicKey` and `secretKey` attributes. For the GimpCaptcha class, this involved switching the ordering of the parameters for the initialisation method from: GimpCaptcha(secretKey, publicKey, ...) to: GimpCaptcha(publicKey, secretKey, ...) Make sure that the intialisations of all of these classes take the public key *first*. YOU HAVE BEEN WARNED. --- lib/bridgedb/HTTPServer.py | 103 ++++++++++++++-------------- lib/bridgedb/captcha.py | 125 ++++++++++++++++++++++++---------- lib/bridgedb/test/test_HTTPServer.py | 8 +-- lib/bridgedb/test/test_captcha.py | 54 +++++++-------- 4 files changed, 172 insertions(+), 118 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 7598755..ead6d60 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -20,6 +20,8 @@ import textwrap import time import os +from functools import partial + from ipaddr import IPv4Address from ipaddr import IPv6Address @@ -138,8 +140,11 @@ class CaptchaProtectedResource(resource.Resource): isLeaf = True - def __init__(self, useForwardedHeader=False, protectedResource=None): + def __init__(self, publicKey=None, secretKey=None, + useForwardedHeader=False, protectedResource=None): resource.Resource.__init__(self) + self.publicKey = publicKey + self.secretKey = secretKey self.useForwardedHeader = useForwardedHeader self.resource = protectedResource @@ -270,9 +275,7 @@ class GimpCaptchaProtectedResource(CaptchaProtectedResource): .. _gimp-captcha: https://github.com/isislovecruft/gimp-captcha """ - def __init__(self, secretKey=None, publicKey=None, hmacKey=None, - captchaDir='', useForwardedHeader=False, - protectedResource=None): + def __init__(self, hmacKey=None, captchaDir='', **kwargs): """Protect a resource via this one, using a local CAPTCHA cache. :param str secretkey: A PKCS#1 OAEP-padded, private RSA key, used for @@ -294,10 +297,7 @@ class GimpCaptchaProtectedResource(CaptchaProtectedResource): :param protectedResource: The resource to serve if the client successfully passes the CAPTCHA challenge. """ - CaptchaProtectedResource.__init__(self, useForwardedHeader, - protectedResource) - self.secretKey = secretKey - self.publicKey = publicKey + CaptchaProtectedResource.__init__(self, **kwargs) self.hmacKey = hmacKey self.captchaDir = captchaDir @@ -340,7 +340,7 @@ class GimpCaptchaProtectedResource(CaptchaProtectedResource): # Create a new HMAC key, specific to requests from this client: clientIP = self.getClientIP(request) clientHMACKey = crypto.getHMAC(self.hmacKey, clientIP) - capt = captcha.GimpCaptcha(self.secretKey, self.publicKey, + capt = captcha.GimpCaptcha(self.publicKey, self.secretKey, clientHMACKey, self.captchaDir) try: capt.get() @@ -391,13 +391,9 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): .. _reCaptcha: http://www.google.com/recaptcha """ - def __init__(self, recaptchaPrivKey='', recaptchaPubKey='', remoteip='', - useForwardedHeader=False, protectedResource=None): - CaptchaProtectedResource.__init__(self, useForwardedHeader, - protectedResource) - self.recaptchaPrivKey = recaptchaPrivKey - self.recaptchaPubKey = recaptchaPubKey - self.recaptchaRemoteIP = remoteip + def __init__(self, remoteIP=None, **kwargs): + CaptchaProtectedResource.__init__(self, **kwargs) + self.remoteIP = remoteIP def _renderDeferred(self, checkedRequest): """Render this resource asynchronously. @@ -442,7 +438,7 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): - ``image`` is a string holding a binary, JPEG-encoded image. - ``challenge`` is a unique string associated with the request. """ - capt = captcha.ReCaptcha(self.recaptchaPubKey, self.recaptchaPrivKey) + capt = captcha.ReCaptcha(self.publicKey, self.secretKey) try: capt.get() @@ -464,8 +460,8 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): :rtype: str :returns: A fake IP address to report to the reCaptcha API server. """ - if self.recaptchaRemoteIP: - remoteIP = self.recaptchaRemoteIP + if self.remoteIP: + remoteIP = self.remoteIP else: # generate a random IP for the captcha submission remoteIP = IPv4Address(random.randint(0, 2**32-1)).compressed @@ -520,7 +516,7 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): % (clientIP, solution.error_code)) return (False, request) - d = txrecaptcha.submit(challenge, response, self.recaptchaPrivKey, + d = txrecaptcha.submit(challenge, response, self.secretKey, remoteIP).addCallback(checkResponse, request) return d @@ -862,6 +858,13 @@ def addWebServer(cfg, dist, sched): :rtype: :api:`twisted.web.server.Site` :returns: A webserver. """ + captcha = None + fwdHeaders = cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER + numBridges = cfg.HTTPS_N_BRIDGES_PER_ANSWER + fprInclude = cfg.HTTPS_INCLUDE_FINGERPRINTS + + logging.info("Starting web servers...") + httpdist = resource.Resource() httpdist.putChild('', WebRoot()) httpdist.putChild('robots.txt', @@ -873,58 +876,56 @@ def addWebServer(cfg, dist, sched): httpdist.putChild('options', WebResourceOptions()) httpdist.putChild('howto', WebResourceHowto()) - bridgesResource = WebResourceBridges( - dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, - cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, - includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS) - if cfg.RECAPTCHA_ENABLED: - protected = ReCaptchaProtectedResource( - recaptchaPrivKey=cfg.RECAPTCHA_SEC_KEY, - recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY, - remoteip=cfg.RECAPTCHA_REMOTEIP, - useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, - protectedResource=bridgesResource) - httpdist.putChild('bridges', protected) - + publicKey = cfg.RECAPTCHA_PUB_KEY + secretKey = cfg.RECAPTCHA_SEC_KEY + captcha = partial(ReCaptchaProtectedResource, + remoteIP=cfg.RECAPTCHA_REMOTEIP) elif cfg.GIMP_CAPTCHA_ENABLED: - # Get the HMAC secret key for CAPTCHA challenges and create a new key - # from it for use on the server: + # Get the master HMAC secret key for CAPTCHA challenges, and then + # create a new HMAC key from it for use on the server. captchaKey = crypto.getKey(cfg.GIMP_CAPTCHA_HMAC_KEYFILE) hmacKey = crypto.getHMAC(captchaKey, "Captcha-Key") - # Load or create our encryption keys: secretKey, publicKey = crypto.getRSAKey(cfg.GIMP_CAPTCHA_RSA_KEYFILE) - - protected = GimpCaptchaProtectedResource( - secretKey=secretKey, - publicKey=publicKey, - hmacKey=hmacKey, - captchaDir=cfg.GIMP_CAPTCHA_DIR, - useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, - protectedResource=bridgesResource) + captcha = partial(GimpCaptchaProtectedResource, + hmacKey=hmacKey, + captchaDir=cfg.GIMP_CAPTCHA_DIR) + + bridges = WebResourceBridges(dist, sched, numBridges, + fwdHeaders, includeFingerprints=fprInclude) + if captcha: + # Protect the 'bridges' page with a CAPTCHA, if configured to do so: + protected = captcha(publicKey=publicKey, + secretKey=secretKey, + useForwardedHeader=fwdHeaders, + protectedResource=bridges) httpdist.putChild('bridges', protected) + logging.info("Protecting resources with %s." % captcha.func.__name__) else: - httpdist.putChild('bridges', bridgesResource) + httpdist.putChild('bridges', bridges) site = server.Site(httpdist) if cfg.HTTP_UNENCRYPTED_PORT: ip = cfg.HTTP_UNENCRYPTED_BIND_IP or "" + port = cfg.HTTP_UNENCRYPTED_PORT or 80 try: - reactor.listenTCP(cfg.HTTP_UNENCRYPTED_PORT, site, interface=ip) + reactor.listenTCP(port, site, interface=ip) except CannotListenError as error: raise SystemExit(error) + logging.info("Started HTTP server on %s:%d" % (str(ip), int(port))) if cfg.HTTPS_PORT: - from twisted.internet.ssl import DefaultOpenSSLContextFactory - #from OpenSSL.SSL import SSLv3_METHOD ip = cfg.HTTPS_BIND_IP or "" - factory = DefaultOpenSSLContextFactory(cfg.HTTPS_KEY_FILE, - cfg.HTTPS_CERT_FILE) + port = cfg.HTTPS_PORT or 443 try: - reactor.listenSSL(cfg.HTTPS_PORT, site, factory, interface=ip) + from twisted.internet.ssl import DefaultOpenSSLContextFactory + factory = DefaultOpenSSLContextFactory(cfg.HTTPS_KEY_FILE, + cfg.HTTPS_CERT_FILE) + reactor.listenSSL(port, site, factory, interface=ip) except CannotListenError as error: raise SystemExit(error) + logging.info("Started HTTPS server on %s:%d" % (str(ip), int(port))) return site diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index ca2575c..e10bc81 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -124,22 +124,28 @@ class Captcha(object): class ReCaptcha(Captcha): - """A reCaptcha CAPTCHA. + """A CAPTCHA obtained from a remote reCaptcha_ API server. :ivar str image: The CAPTCHA image. :ivar str challenge: The ``'recaptcha_challenge_response'`` HTTP form - field to pass to the client along with the CAPTCHA image. + field to pass to the client, along with the CAPTCHA image. See + :doc:`BridgeDB's captcha.html <templates/captcha.html>` Mako_ template + for an example usage. + :ivar str publicKey: The public reCaptcha API key. + :ivar str secretKey: The private reCaptcha API key. + + .. _reCaptcha: https://code.google.com/p/recaptcha/ + .. _Mako: http://docs.makotemplates.org/en/latest/syntax.html#page """ - def __init__(self, pubkey=None, privkey=None): + def __init__(self, publicKey=None, secretKey=None): """Create a new ReCaptcha CAPTCHA. - :param str pubkey: The public reCaptcha API key. - :param str privkey: The private reCaptcha API key. + :param str publicKey: The public reCaptcha API key. + :param str secretKey: The private reCaptcha API key. """ - super(ReCaptcha, self).__init__() - self.pubkey = pubkey - self.privkey = privkey + super(ReCaptcha, self).__init__(publicKey=publicKey, + secretKey=secretKey) def get(self): """Retrieve a CAPTCHA from the reCaptcha API server. @@ -154,11 +160,11 @@ class ReCaptcha(Captcha): :ivar:`secretKey` are missing. :raises HTTPError: If the server returned any HTTP error status code. """ - if not self.pubkey or not self.privkey: + if not self.publicKey or not self.secretKey: raise CaptchaKeyError('You must supply recaptcha API keys') urlbase = API_SSL_SERVER - form = "/noscript?k=%s" % self.pubkey + form = "/noscript?k=%s" % self.publicKey # Extract and store image from recaptcha html = urllib2.urlopen(urlbase + form).read() @@ -172,27 +178,45 @@ class ReCaptcha(Captcha): class GimpCaptcha(Captcha): - """A cached CAPTCHA image which was created with Gimp.""" + """A locally cached CAPTCHA image which was created with gimp-captcha_. + + :ivar str secretKey: A PKCS#1 OAEP-padded, private RSA key, used for + verifying the client's solution to the CAPTCHA. + :ivar str publickey: A PKCS#1 OAEP-padded, public RSA key. This is used to + hide the correct CAPTCHA solution within the + ``captcha_challenge_field`` HTML form field. That form field is given + to the a client along with the :ivar:`image` during the initial + CAPTCHA request, and the client *should* give it back to us later + during the CAPTCHA solution verification step. + :ivar bytes hmacKey: A client-specific HMAC secret key. + :ivar str cacheDir: The local directory which pre-generated CAPTCHA images + have been stored in. This can be set via the ``GIMP_CAPTCHA_DIR`` + setting in the config file. + :type sched: :class:`bridgedb.schedule.ScheduledInterval` + :ivar sched: An time interval. After this much time has passed, the + CAPTCHA is considered stale, and all solutions are considered invalid + regardless of their correctness. + + .. _gimp-captcha: https://github.com/isislovecruft/gimp-captcha + """ - def __init__(self, secretKey=None, publicKey=None, hmacKey=None, + def __init__(self, publicKey=None, secretKey=None, hmacKey=None, cacheDir=None): """Create a ``GimpCaptcha`` which retrieves images from **cacheDir**. - :param str secretkey: A PKCS#1 OAEP-padded, private RSA key, used for - verifying the client's solution to the CAPTCHA. :param str publickey: A PKCS#1 OAEP-padded, public RSA key, used for creating the ``captcha_challenge_field`` string to give to a client. + :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 client-specific HMAC secret key. :param str cacheDir: The local directory which pre-generated CAPTCHA images have been stored in. This can be set via the ``GIMP_CAPTCHA_DIR`` setting in the config file. - :raises GimpCaptchaError: if **cacheDir** is not a directory. - :raises CaptchaKeyError: if any of **secretKey**, **publicKey**, - or **hmacKey** is invalid, or missing. + :raises GimpCaptchaError: if :ivar:`cacheDir` is not a directory. + :raises CaptchaKeyError: if any of :ivar:`secretKey`, + :ivar:`publicKey`, or :ivar:`hmacKey` are invalid or missing. """ - super(GimpCaptcha, self).__init__() - if not cacheDir or not os.path.isdir(cacheDir): raise GimpCaptchaError("Gimp captcha cache isn't a directory: %r" % cacheDir) @@ -201,10 +225,10 @@ class GimpCaptcha(Captcha): "Invalid key supplied to GimpCaptcha: SK=%r PK=%r HMAC=%r" % (secretKey, publicKey, hmacKey)) - self.secretKey = secretKey - self.publicKey = publicKey - self.cacheDir = cacheDir + super(GimpCaptcha, self).__init__(publicKey=publicKey, + secretKey=secretKey) self.hmacKey = hmacKey + self.cacheDir = cacheDir self.answer = None @classmethod @@ -215,7 +239,7 @@ class GimpCaptcha(Captcha): ``'captcha_challenge_field'`` HTTP form field. :param str solution: The client's proposed solution to the CAPTCHA that they were presented with. - :param str secretkey: A PKCS#1 OAEP-padded, private RSA key, used for + :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. :rtype: bool @@ -248,22 +272,51 @@ class GimpCaptcha(Captcha): return False def createChallenge(self, answer): - """Encrypt the CAPTCHA **answer** and HMAC the encrypted data. - - Take a string containing the answer to a CAPTCHA and encrypts it to - :attr:`publicKey`. The resulting encrypted blob is then HMACed with a - client-specific :attr:`hmacKey`. These two strings are then joined - together in the form: - - HMAC ";" ENCRYPTED_ANSWER - - where the HMAC MUST be the first 20 bytes. Lastly base64-encoded (in a - URL safe manner). + """Encrypt-then-HMAC 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 + following form:: + + CHALLENGE := B64( HMAC | ENC_BLOB ) + ENC_BLOB := RSA_ENC( ANSWER_BLOB ) + ANSWER_BLOB := ( TIMESTAMP | ANSWER ) + + where + * ``B64`` is a URL-safe base64-encode function, + * ``RSA_ENC`` is the PKCS#1 RSA-OAEP encryption function, + * and the remaining feilds are specified as follows: + + +-------------+--------------------------------------------+----------+ + | Field | Description | Length | + +=============+============================================+==========+ + | HMAC | An HMAC of the ``ENC_BLOB``, created with | 20 bytes | + | | the client-specific :ivar:`hmacKey`, by | | + | | applying :func:`~crypto.getHMAC` to the | | + | | ``ENC_BLOB``. | | + +-------------+--------------------------------------------+----------+ + | ENC_BLOB | An encrypted ``ANSWER``, created with | varies | + | | a PKCS#1 OAEP-padded RSA :ivar:`publicKey`.| | + +-------------+--------------------------------------------+----------+ + | 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``. + + 2. 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 + ``HMAC`` and ``ENC_BLOB``, then base64-encoding the result. :param str answer: The answer to a CAPTCHA. :rtype: str - :returns: An HMAC of, as well as a string containing the URL-safe, - base64-encoded encrypted **answer**. + :returns: A challenge string. """ encrypted = self.publicKey.encrypt(answer) hmac = crypto.getHMAC(self.hmacKey, encrypted) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 570fe9c..8bc1da7 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -274,9 +274,9 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): # (None, None) is the (distributor, scheduleInterval): self.protectedResource = HTTPServer.WebResourceBridges(None, None) self.captchaResource = HTTPServer.ReCaptchaProtectedResource( - recaptchaPrivKey='42', - recaptchaPubKey='23', - remoteip='111.111.111.111', + publicKey='23', + secretKey='42', + remoteIP='111.111.111.111', useForwardedHeader=True, protectedResource=self.protectedResource) @@ -365,7 +365,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): def test_getRemoteIP_useRandomIP(self): """Check that removing our remoteip setting produces a random IP.""" - self.captchaResource.recaptchaRemoteIP = None + self.captchaResource.remoteIP = None ip = self.captchaResource.getRemoteIP() realishIP = ipaddr.IPv4Address(ip).compressed self.assertTrue(realishIP) diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index a383545..536f29e 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -50,8 +50,8 @@ class ReCaptchaTests(unittest.TestCase): def test_init(self): """Check the ReCaptcha class stored the private and public keys.""" - self.assertEquals(self.c.privkey, 'sekrit') - self.assertEquals(self.c.pubkey, 'publik') + self.assertEquals(self.c.secretKey, 'sekrit') + self.assertEquals(self.c.publicKey, 'publik') def test_get(self): """Test get() method.""" @@ -109,32 +109,32 @@ class GimpCaptchaTests(unittest.TestCase): a CaptchaKeyError. """ self.assertRaises(captcha.CaptchaKeyError, captcha.GimpCaptcha, - None, self.publik, self.hmacKey, self.cacheDir) + self.publik, None, self.hmacKey, self.cacheDir) def test_init_noPublicKey(self): """__init__() without publicKey should raise a CaptchaKeyError.""" self.assertRaises(captcha.CaptchaKeyError, captcha.GimpCaptcha, - self.sekrit, None, self.hmacKey, self.cacheDir) + None, self.sekrit, self.hmacKey, self.cacheDir) def test_init_noHMACKey(self): """__init__() without hmacKey should raise a CaptchaKeyError.""" self.assertRaises(captcha.CaptchaKeyError, captcha.GimpCaptcha, - self.sekrit, self.publik, None, self.cacheDir) + self.publik, self.sekrit, None, self.cacheDir) def test_init_noCacheDir(self): """__init__() without cacheDir should raise a CaptchaKeyError.""" self.assertRaises(captcha.GimpCaptchaError, captcha.GimpCaptcha, - self.sekrit, self.publik, self.hmacKey, None) + self.publik, self.sekrit, self.hmacKey, None) def test_init_badCacheDir(self): """GimpCaptcha with bad cacheDir should raise GimpCaptchaError.""" self.assertRaises(captcha.GimpCaptchaError, captcha.GimpCaptcha, - self.sekrit, self.publik, self.hmacKey, + self.publik, self.sekrit, self.hmacKey, self.cacheDir.rstrip('chas')) def test_init(self): """Test that __init__ correctly initialised all the values.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) self.assertIsNone(c.answer) self.assertIsNone(c.image) @@ -142,14 +142,14 @@ class GimpCaptchaTests(unittest.TestCase): def test_createChallenge(self): """createChallenge() should return the encrypted CAPTCHA answer.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) challenge = c.createChallenge('w00t') self.assertIsInstance(challenge, basestring) def test_createChallenge_base64(self): """createChallenge() return value should be urlsafe base64-encoded.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) challenge = c.createChallenge('w00t') decoded = urlsafe_b64decode(challenge) @@ -157,7 +157,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_createChallenge_hmacValid(self): """The HMAC in createChallenge() return value should be valid.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) challenge = c.createChallenge('ShouldHaveAValidHMAC') decoded = urlsafe_b64decode(challenge) @@ -168,7 +168,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_createChallenge_decryptedAnswerMatches(self): """The HMAC in createChallenge() return value should be valid.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) answer = 'ThisAnswerShouldDecryptToThis' challenge = c.createChallenge(answer) @@ -182,7 +182,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_get(self): """GimpCaptcha.get() should return image and challenge strings.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() self.assertIsInstance(image, basestring) @@ -191,7 +191,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_get_emptyCacheDir(self): """An empty cacheDir should raise GimpCaptchaError.""" os.makedirs(self.badCacheDir) - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.badCacheDir) self.assertRaises(captcha.GimpCaptchaError, c.get) shutil.rmtree(self.badCacheDir) @@ -205,7 +205,7 @@ class GimpCaptchaTests(unittest.TestCase): fh.flush() os.chmod(badFile, 0266) - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.badCacheDir) # This should hit the second `except:` clause in get(): self.assertRaises(captcha.GimpCaptchaError, c.get) @@ -213,7 +213,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check(self): """A correct answer and valid challenge should return True.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() self.assertEquals( @@ -222,7 +222,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_blankAnswer(self): """A blank answer and valid challenge should return False.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() self.assertEquals( @@ -231,7 +231,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_nonBase64(self): """Valid answer and challenge with invalid base64 returns False.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() challengeBadB64 = challenge.rstrip('==') + "\x42\x42\x42" @@ -244,7 +244,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_caseInsensitive_lowercase(self): """A correct answer in lowercase characters should return True.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() solution = c.answer.lower() @@ -254,7 +254,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_caseInsensitive_uppercase(self): """A correct answer in uppercase characters should return True.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() solution = c.answer.upper() @@ -264,7 +264,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_encoding_utf8(self): """A correct answer in utf-8 lowercase should return True.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() solution = c.answer.encode('utf8') @@ -274,7 +274,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_encoding_ascii(self): """A correct answer in utf-8 lowercase should return True.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() solution = c.answer.encode('ascii') @@ -284,7 +284,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_encoding_unicode(self): """A correct answer in utf-8 lowercase should return True.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() solution = unicode(c.answer) @@ -294,7 +294,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_missingHMACbytes(self): """A challenge that is missing part of the HMAC should return False.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() challengeBadHMAC = challenge[:10] + challenge[20:] @@ -304,7 +304,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_missingAnswerbytes(self): """Partial encrypted answers in challenges should return False.""" - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() challengeBadOrig = challenge[:20] + challenge[30:] @@ -315,7 +315,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_badHMACkey(self): """A challenge with a bad HMAC key should return False.""" hmacKeyBad = crypto.getKey('test_gimpCaptcha_badHMACkey') - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() self.assertEquals( @@ -325,7 +325,7 @@ class GimpCaptchaTests(unittest.TestCase): def test_check_badRSAkey(self): """A challenge with a bad RSA secret key should return False.""" secretKeyBad, publicKeyBad = crypto.getRSAKey('test_gimpCaptcha_badRSAkey') - c = captcha.GimpCaptcha(self.sekrit, self.publik, self.hmacKey, + c = captcha.GimpCaptcha(self.publik, self.sekrit, self.hmacKey, self.cacheDir) image, challenge = c.get() self.assertEquals(

1 0

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

14 May '14

commit dc837e200df54399deb4020f3eff0e2cd6677b97 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 14 20:45:03 2014 +0000 Update translations for bridgedb --- es_AR/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index 231abac..91ffc5b 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-05-14 20:14+0000\n" +"PO-Revision-Date: 2014-05-14 20:21+0000\n" "Last-Translator: cametiope <aldohcasa(a)hotmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -41,11 +41,11 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "" +msgstr "Otra manera de encontrar direcciones de puentes publicas es enviar un correo electrónico (desde %s o %s dirección) a %s con la linea 'get bridges' en el cuerpo del correo. " #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "¡Mis puentes no funcionan! Necesito ayuda!" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -53,7 +53,7 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "" +msgstr "Si tu Tor no funciona, deberas enviar un correo electrónico %s. Intenta incluir la mayor información que puedas acerca de tu situación, incluyendo la lista de los puentes que usas, la version y nombre de archivo del bundle que usas, el mensaje de error que Tor mostro, etc." #: lib/bridgedb/templates/bridges.html:10 msgid ""

1 0

[pups/master] fixed an error introduced in 906a2ed4b4cb56adf4c785413d00dc0fa6279a58
by colin＠torproject.org 14 May '14

14 May '14

commit a83c6e321da5c58b66716cb1b9060a88b1b09ee2 Author: Sherief Alaa <sheriefalaa.w(a)gmail.com> Date: Wed May 14 15:22:58 2014 +0200 fixed an error introduced in 906a2ed4b4cb56adf4c785413d00dc0fa6279a58 --- pups/settings.py.sample | 6 +++--- webchat/templates/tokens.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pups/settings.py.sample b/pups/settings.py.sample index 8f35996..97d4ab6 100644 --- a/pups/settings.py.sample +++ b/pups/settings.py.sample @@ -2,8 +2,8 @@ import os PROJECT_PATH = os.path.dirname(os.path.realpath(__file__)) -DEBUG = True -#DEBUG = False +#DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG ADMINS = ( @@ -113,7 +113,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( # pups custom configuration CONFIG = { - 'url': 'support.example.com' # URL that will be displayed in /token + 'url': 'support.example.com', # URL that will be displayed in /token 'server': '', # xmpp server 'bosh': '', # http://example.com/http-bind 'receiver': '', # @example.lit diff --git a/webchat/templates/tokens.html b/webchat/templates/tokens.html index 8cc7976..ed95254 100644 --- a/webchat/templates/tokens.html +++ b/webchat/templates/tokens.html @@ -40,7 +40,7 @@ {% for token in tokens %} <tr> <td><input name="selected_list" type="checkbox" value="{{token.token}}"></td> - <td>http://{{server}}/chat/{{token.token}}</td>  + <td>http://{{url}}/chat/{{token.token}}</td>  <td>{{token.expires_at|date:"Y-m-d G:i"}}</td> <td>{{token.comment}}</td> </tr>

1 0

r26779: {website} Removed 3 FAQs that have nothing to do with the current Tor (website/trunk/docs/en)
by Matt Pagan 14 May '14

14 May '14

Author: mttp Date: 2014-05-14 20:24:00 +0000 (Wed, 14 May 2014) New Revision: 26779 Modified: website/trunk/docs/en/faq.wml Log: Removed 3 FAQs that have nothing to do with the current Tor Browser. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-05-13 02:07:22 UTC (rev 26778) +++ website/trunk/docs/en/faq.wml 2014-05-14 20:24:00 UTC (rev 26779) @@ -83,11 +83,6 @@ </a></li> <li><a href="#SophosOnMac">I'm using the Sophos anti-virus software on my Mac, and Tor Browser won't start.</a></li> - <li><a href="#TBBSocksPort">I want to - run another application through the Tor launched by Tor Browser - Bundle.</a></li> - <li><a href="#TBBPolipo">I need an HTTP proxy. Where did Polipo - go?</a></li> <li><a href="#TBBOtherExtensions">Can I install other Firefox extensions? Which extensions should I avoid using?</a></li> <li><a href="#TBBJavaScriptEnabled">Why is NoScript configured to @@ -95,10 +90,6 @@ unsafe?</a></li> <li><a href="#TBBOtherBrowser">I want to use Chrome/IE/Opera/etc with Tor.</a></li> - <li><a href="#TorbuttonOtherBrowser">Will Torbutton be available - for other browsers?</a></li> - <li><a href="#TBBCloseBrowser">I want to leave Tor Browser Bundle - running but close the browser.</a></li> <li><a href="#GoogleCAPTCHA">Google makes me solve a CAPTCHA or tells me I have spyware installed.</a></li> <li><a href="#ForeignLanguages">Why does Google show up in foreign @@ -107,6 +98,8 @@ been compromised.</a></li> <li><a href="#NeedToUseAProxy">My internet connection requires an HTTP or SOCKS Proxy</a></li> + <li><a href="#TBBSocksPort">I want to + run another application through Tor.</a></li> <li><a href="#CantSetProxy">What should I do if I can't set a proxy with my application?</a></li> </ul> @@ -1191,55 +1184,6 @@ <hr> -<a id="TBBSocksPort"></a> -<h3><a class="anchor" href="#TBBSocksPort"> -I want to run another application through the Tor launched by Tor -Browser Bundle.</a></h3> - -<p> -Typically Tor listens for Socks connections on port 9050. TBB listens -on port 9150. -The goal is to avoid conflicting with a "system" Tor install, -so you can run a system Tor and TBB at the same time. We're <a -href="https://trac.torproject.org/projects/tor/ticket/3948">working on -a feature</a> where Tor will try the usual ports first and then back -off to a random choice if they're already in use. -</p> - -<hr> - -<a id="TBBPolipo"></a> -<h3><a class="anchor" href="#TBBPolipo">I need an HTTP proxy. Where did -Polipo go?</a></h3> - -<p> -In the past, Tor bundles included an HTTP proxy like Privoxy or Polipo, -solely to work around a bug in Firefox that was finally fixed in Firefox -6. Now you don't need a separate HTTP proxy to use Tor, and in fact -leaving it out makes you safer because Torbutton has better control over -Firefox's interaction with websites. -</p> - -<p> -If you are trying to use some external application with Tor, step zero -should be to <a href="<page download/download>#warning">reread the set -of warnings</a> for ways you can screw up. Step one should be to try -to use a Socks proxy rather than an http proxy — Tor runs a Socks -proxy on port 9050 on Windows, or <a href="#TBBSocksPort">see above</a> -for OSX and Linux. -</p> - -<p> -If that fails, feel free to install <a -href="http://www.privoxy.org/">privoxy</a>. -However, please realize that this approach is not recommended for novice -users. Privoxy has an <a -href="http://www.privoxy.org/faq/misc.html#TOR">example -configuration</a> of Tor and Privoxy. -</p> - -<hr> - <a id="TBBOtherExtensions"></a> <h3><a class="anchor" href="#TBBOtherExtensions">Can I install other Firefox extensions?</a></h3> @@ -1331,34 +1275,6 @@ <hr> -<a id="TorbuttonOtherBrowser"></a> -<h3><a class="anchor" href="#TorbuttonOtherBrowser"> -Will Torbutton be available for other browsers?</a></h3> - -<p> - We don't support IE, Opera or Safari and never plan to. There are - too many ways that your privacy can go wrong with those browsers, and - because of their closed design it is really hard for us to do anything - to change these privacy problems. -</p> -<p> -We are working with the Chrome people to modify Chrome's internals so that we can eventually support it. But for now, Firefox is the only safe choice. -</p> - -<hr> - -<a id="TBBCloseBrowser"></a> -<h3><a class="anchor" href="#TBBCloseBrowser">I want to leave Tor -Browser -Bundle running but close the browser.</a></h3> - -<p> -We're working on a way to make this possible on all platforms. Please -be patient. -</p> - -<hr> - <a id="GoogleCAPTCHA"></a> <h3><a class="anchor" href="#GoogleCAPTCHA">Google makes me solve a CAPTCHA or tells me I have spyware installed.</a></h3> @@ -1505,6 +1421,36 @@ <hr> + +<a id="TBBSocksPort"></a> +<h3><a class="anchor" href="#TBBSocksPort"> +I want to run another application through Tor.</a></h3> + +<p> +If you are trying to use some external application with Tor, step zero +should be to <a href="<page download/download>#warning">reread the set +of warnings</a> for ways you can screw up. Step one should be to try +to use a SOCKS proxy rather than an HTTP proxy. +Typically Tor listens for SOCKS connections on port 9050. Tor Browser listens +on port 9150. +</p> + +<p> +If your application doesn't support SOCKS proxies, feel free to install <a +href="http://www.privoxy.org/">privoxy</a>. +However, please realize that this approach is not recommended for novice +users. Privoxy has an <a +href="http://www.privoxy.org/faq/misc.html#TOR">example +configuration</a> of Tor and Privoxy. +</p> + +<p> +If you're unable to use the application's native proxy settings, all hope is +not lost. See <a href="#CantSetProxy">below</a>. +</p> + +<hr> + <a id="CantSetProxy"></a> <h3><a class="anchor" href="#CantSetProxy">What should I do if I can't set a proxy with my application?</a></h3>

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 14 May '14

14 May '14

commit a71e6ed0fdcb290032ea72cdbffa9194edec48c4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 14 20:15:33 2014 +0000 Update translations for tor-launcher-properties_completed --- es_AR/torlauncher.properties | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/es_AR/torlauncher.properties b/es_AR/torlauncher.properties index 1d7d184..2b293e8 100644 --- a/es_AR/torlauncher.properties +++ b/es_AR/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanzador de Tor @@ -7,7 +7,9 @@ torlauncher.tor_exited=Salida inesperada de Tor torlauncher.please_restart_app=Por favor, reinicie esta aplicación torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor -torlauncher.tor_bootstrap_failed=Tor fallo al intentar conectarse a la red Tor\n\n%S +torlauncher.tor_control_failed=Falló toma de control de Tor +torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red Tor +torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor @@ -22,6 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, asegurese que Tor esta ejecutandose torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu Host y un puerto para que Tor utilize un Proxy para acceder a internet. torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy. torlauncher.error_bridges_missing=Debes especificar uno o más puentes. +torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos. +torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración. + +torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar torlauncher.quit=Quitar @@ -29,3 +35,24 @@ torlauncher.quit_win=Salir torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S + +torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio +torlauncher.bootstrapStatus.requesting_status=Regresando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_keys=Cargando certificados de dominio +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión +torlauncher.bootstrapStatus.loading_descriptors=Cargando información de retransmisión +torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor +torlauncher.bootstrapStatus.handshake_or=Estableciendo una ruta Tor +torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! + +torlauncher.bootstrapWarning.done=finalizado +torlauncher.bootstrapWarning.connectrefused=conexión rechazada +torlauncher.bootstrapWarning.misc=misceláneo +torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes +torlauncher.bootstrapWarning.identity=error de indentificación +torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión +torlauncher.bootstrapWarning.noroute=sin ruta al servidor +torlauncher.bootstrapWarning.ioerror=error de lectura/escritura +torlauncher.bootstrapWarning.pt_missing=Perdida de la conectividad\n

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 14 May '14

14 May '14

commit e4be47fbca8c6a836a71dd0855e1e91df37ede9a Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 14 20:15:31 2014 +0000 Update translations for tor-launcher-properties --- es_AR/torlauncher.properties | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/es_AR/torlauncher.properties b/es_AR/torlauncher.properties index 93665cf..2b293e8 100644 --- a/es_AR/torlauncher.properties +++ b/es_AR/torlauncher.properties @@ -7,9 +7,9 @@ torlauncher.tor_exited=Salida inesperada de Tor torlauncher.please_restart_app=Por favor, reinicie esta aplicación torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor -torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Falló toma de control de Tor torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red Tor -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Por favor, asegurese que Tor esta ejecutandose torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu Host y un puerto para que Tor utilize un Proxy para acceder a internet. torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy. torlauncher.error_bridges_missing=Debes especificar uno o más puentes. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos. +torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración. torlauncher.recommended_bridge=(recomendado) @@ -36,23 +36,23 @@ torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio +torlauncher.bootstrapStatus.requesting_status=Regresando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_keys=Cargando certificados de dominio +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión +torlauncher.bootstrapStatus.loading_descriptors=Cargando información de retransmisión torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit +torlauncher.bootstrapStatus.handshake_or=Estableciendo una ruta Tor torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! torlauncher.bootstrapWarning.done=finalizado -torlauncher.bootstrapWarning.connectrefused=connection refused +torlauncher.bootstrapWarning.connectrefused=conexión rechazada torlauncher.bootstrapWarning.misc=misceláneo torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes -torlauncher.bootstrapWarning.identity=identity mismatch +torlauncher.bootstrapWarning.identity=error de indentificación torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.noroute=sin ruta al servidor +torlauncher.bootstrapWarning.ioerror=error de lectura/escritura +torlauncher.bootstrapWarning.pt_missing=Perdida de la conectividad\n

1 0

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

14 May '14

commit 53d7faefd4d96af7f12e6b2c5414cf845208da12 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 14 20:15:03 2014 +0000 Update translations for bridgedb --- es_AR/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index bda45f6..231abac 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -4,14 +4,15 @@ # # Translators: # Translators: +# cametiope <aldohcasa(a)hotmail.com>, 2014 # José Fabián <ar.jfabian+transifex(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2014-03-13 11:50+0000\n" -"Last-Translator: José Fabián <ar.jfabian+transifex(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-14 20:14+0000\n" +"Last-Translator: cametiope <aldohcasa(a)hotmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,11 +29,11 @@ msgstr "¿Qué son los puentes de red?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Puentes de retransmisión %s son retransmisiones de Tor que te ayudan a evitar la censura." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "¡Necesito una manera alternativa de obtener puentes!" #: lib/bridgedb/templates/base.html:40 #, python-format

1 0

[tor/release-0.2.4] match the changelog entries from 0.2.5.x when possible
by arma＠torproject.org 14 May '14

14 May '14

commit a7d700aa04f2869bc0271f3ed9677d36093810be Author: Roger Dingledine <arma(a)torproject.org> Date: Wed May 14 16:04:16 2014 -0400 match the changelog entries from 0.2.5.x when possible --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dddae2..96cb28c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,7 +46,7 @@ Changes in version 0.2.4.22 - 2014-05-1? bugfix on 0.2.1.1-alpha. o Minor bugfixes (controller, backport from 0.2.5.4-alpha): - - Avoid sending an garbage value to the controller when a circuit is + - Avoid sending a garbage value to the controller when a circuit is cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha. o Minor bugfixes (exit relay, backport from 0.2.5.4-alpha): @@ -85,8 +85,8 @@ Changes in version 0.2.4.22 - 2014-05-1? o Documentation (backport from 0.2.5.4-alpha): - Correctly document that we search for a system torrc file before - looking in ~/.torrc. Fixes documentation side of 9213; bugfix - on 0.2.3.18-rc. + looking in ~/.torrc. Fixes documentation side of 9213; bugfix on + 0.2.3.18-rc. Changes in version 0.2.4.21 - 2014-02-28

1 0