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

[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

[user-manual/master] Added a Known Issues page.
by mttp＠torproject.org 15 May '14

15 May '14

commit a6b8face10e602f91cd0a2cf4d2f8e11b25ecf52 Author: Matt Pagan <mttp(a)torproject.org> Date: Wed May 14 18:22:48 2014 -0500 Added a Known Issues page. Changed page order. --- en-US/bridges.page | 2 +- en-US/circumvention.page | 2 +- en-US/known-issues.page | 71 ++++++++++++++++++++++++++++++++++++++++++++++ en-US/uninstalling.page | 2 +- 4 files changed, 74 insertions(+), 3 deletions(-) diff --git a/en-US/bridges.page b/en-US/bridges.page index 8fad888..29ecf54 100644 --- a/en-US/bridges.page +++ b/en-US/bridges.page @@ -5,7 +5,7 @@ <info> <desc>What bridges are and how to use them.</desc> - <title type='sort'>04 Bridges</title> + <title type='sort'>05 Bridges</title> <link type="guide" xref="index" /> </info> diff --git a/en-US/circumvention.page b/en-US/circumvention.page index 5c3c72b..cd8de8d 100644 --- a/en-US/circumvention.page +++ b/en-US/circumvention.page @@ -4,7 +4,7 @@ id="circumvention"> <info> - <title type='sort'>03 Circumvention</title> + <title type='sort'>04 Circumvention</title> <desc>What to do if the Tor network is blocked.</desc> <link type="guide" xref="index" /> </info> diff --git a/en-US/known-issues.page b/en-US/known-issues.page new file mode 100644 index 0000000..07b49cc --- /dev/null +++ b/en-US/known-issues.page @@ -0,0 +1,71 @@ + +<page xmlns="http://projectmallard.org/1.0/" + type="topic" + id="known-issues"> + +<info> + <desc>A list of known issues.</desc> + <title type='sort'>03 Known Issues</title> + <link type="guide" xref="index"/> +</info> + +<title>Known Issues</title> + +<list> + <item> + The following firewall software have been known to interfere with Tor + and may need to be temporarily disabled: + <list> + <item> + Webroot SecureAnywhere + </item> + <item> + Kaspersky Internet Security 2012 + </item> + <item> + Sophos Antivirus for Mac + </item> + <item> + Microsoft Security Essentials + </item> + </list> + </item> + <item> + + Videos that require Adobe Flash are unavailable. Flash is disabled for + security reasons. Most YouTube videos can be played with HTML5 by visiting + the video's "Embed" → "Share" link. + + </item> + <item> + + Tor can not use a bridge if a proxy is set. + + </item> + <item> + + The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to + ensure that each software build is exactly reproducible. + + </item> + <item> + + To run Tor Browser on Ubuntu, users need to execute a shell script. Open + "Files" (Unity's explorer), open Preferences → Behavior Tab → + Set "Run executable text files when they are opened" to "Ask every time", + then OK. Tor Browser can also be started from the command line by running + + <code> + ./start-tor-browser + </code> + + from inside the Tor Browser directory. + + </item> +</list> + +If you have an issue with Tor Browser that isn't on this list, feel free to +email help(a)rt.torproject.org. + +</page> + diff --git a/en-US/uninstalling.page b/en-US/uninstalling.page index eb625eb..14e875d 100644 --- a/en-US/uninstalling.page +++ b/en-US/uninstalling.page @@ -5,7 +5,7 @@ <info> <desc>How to remove Tor Browser from your system.</desc> - <title type='sort'>05 Uninstalling</title> + <title type='sort'>06 Uninstalling</title> <link type="guide" xref="index"/> </info>

1 0

[bridgedb/develop] Rename config var RECAPTCHA_PRIV_KEY → RECAPTCHA_SEC_KEY.
by isis＠torproject.org 15 May '14

15 May '14

commit aa9671e42690671b1d7b1d19372d833c8d81c1be Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:01:25 2014 +0000 Rename config var RECAPTCHA_PRIV_KEY → RECAPTCHA_SEC_KEY. --- README | 2 +- bridgedb.conf | 7 +++++-- lib/bridgedb/HTTPServer.py | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README b/README index c5adf54..e41fb4b 100644 --- a/README +++ b/README @@ -166,7 +166,7 @@ bridgedb.conf: RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY - RECAPTCHA_PRIV_KEY + RECAPTCHA_SEC_KEY A [recaptcha.net](https://www.google.com/recaptcha) account is required. diff --git a/bridgedb.conf b/bridgedb.conf index 0b27adc..eaf82ed 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,11 +15,14 @@ # for details. # :copyright: (c) 2007-2013 The Tor Project, Inc. # (c) 2007-2013, all sentient entities within the AUTHORS file -# :version: 0.0.7 +# :version: 0.0.8 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.8 - 2014-05-14 +# * CHANGE RECAPTCHA_PRIV_KEY to RECAPTCHA_SEC_KEY. +# # Changes in version 0.0.7 - 2014-03-31 # * ADD new settings for tracing function calls and thread info within logged # messages: LOG_THREADS, LOG_TRACE, and LOG_TIME_FORMAT. @@ -242,7 +245,7 @@ RECAPTCHA_ENABLED = False # Recaptcha API keys RECAPTCHA_PUB_KEY = '' -RECAPTCHA_PRIV_KEY = '' +RECAPTCHA_SEC_KEY = '' # The remoteip we send to reCAPTCHA during verification RECAPTCHA_REMOTEIP = '' diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 7c4689a..328d7a3 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -837,7 +837,7 @@ def addWebServer(cfg, dist, sched): HTTPS_USE_IP_FROM_FORWARDED_HEADER RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY - RECAPTCHA_PRIV_KEY + RECAPTCHA_SEC_KEY RECAPTCHA_REMOTEIP GIMP_CAPTCHA_ENABLED GIMP_CAPTCHA_DIR @@ -864,7 +864,7 @@ def addWebServer(cfg, dist, sched): if cfg.RECAPTCHA_ENABLED: protected = ReCaptchaProtectedResource( - recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, + recaptchaPrivKey=cfg.RECAPTCHA_SEC_KEY, recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY, remoteip=cfg.RECAPTCHA_REMOTEIP, useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER,

1 0

[bridgedb/develop] Tweak docstrings for two ReCaptchaProtectedResource methods.
by isis＠torproject.org 15 May '14

15 May '14

commit 91ec2eb2cc79f2f932fa2557bb0fe455bf9af24c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:10:36 2014 +0000 Tweak docstrings for two ReCaptchaProtectedResource methods. * CHANGE getRemoteIP() and checkSolution() docstring to make the Sphinx output be formatted more nicely. --- lib/bridgedb/HTTPServer.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 491e527..3b77c39 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -458,8 +458,8 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): """Mask the client's real IP address with a faked one. The fake client IP address is sent to the reCaptcha server, and it is - either the public IP address of bridges.torproject.org (if - ``RECAPTCHA_REMOTE_IP`` is configured), or a random IP. + either the public IP address of bridges.torproject.org (if the config + option ``RECAPTCHA_REMOTE_IP`` is configured), or a random IP. :rtype: str :returns: A fake IP address to report to the reCaptcha API server. @@ -485,10 +485,13 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): ``'captcha_response_field'``. These POST arguments should be obtained from :meth:`render_GET`. :rtupe: :api:`twisted.internet.defer.Deferred` - :returns: the returned deferred will callback with a tuple of - (``bool``, :api:`twisted.web.server.Request`). If the CAPTCHA - solution was valid, a tuple will contain ``(True, request)``; - otherwise, it will contain ``(False, request)``. + :returns: A deferred wich will callback with a tuple in the following + form: + (:type:`bool`, :api:`twisted.web.server.Request`) + If the CAPTCHA solution was valid, a tuple will contain:: + (True, Request) + Otherwise, it will contain:: + (False, Request) """ challenge, response = self.extractClientSolution(request) clientIP = self.getClientIP(request)

1 0

[bridgedb/develop] Clean up HTTPServer.addWebServer() docstring.
by isis＠torproject.org 15 May '14

15 May '14

commit 5a5e2f4feaedda3b4be1275f663e95eceda054c1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:17:31 2014 +0000 Clean up HTTPServer.addWebServer() docstring. --- lib/bridgedb/HTTPServer.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 3b77c39..7598755 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -829,14 +829,18 @@ class WebRoot(resource.Resource): def addWebServer(cfg, dist, sched): - """Set up a web server. + """Set up a web server for HTTP(S)-based bridge distribution. - :param cfg: A configuration object from :mod:`bridgedb.Main`. Currently, - we use these options:: - HTTPS_N_BRIDGES_PER_ANSWER + :type cfg: :class:`bridgedb.persistent.Conf` + :param cfg: A configuration object from + :mod:`bridgedb.Main`. Currently, we use these options:: HTTP_UNENCRYPTED_PORT HTTP_UNENCRYPTED_BIND_IP HTTP_USE_IP_FROM_FORWARDED_HEADER + HTTPS_N_BRIDGES_PER_ANSWER + HTTPS_INCLUDE_FINGERPRINTS + HTTPS_KEY_FILE + HTTPS_CERT_FILE HTTPS_PORT HTTPS_BIND_IP HTTPS_USE_IP_FROM_FORWARDED_HEADER @@ -846,10 +850,17 @@ def addWebServer(cfg, dist, sched): RECAPTCHA_REMOTEIP GIMP_CAPTCHA_ENABLED GIMP_CAPTCHA_DIR + GIMP_CAPTCHA_HMAC_KEYFILE + GIMP_CAPTCHA_RSA_KEYFILE :type dist: :class:`bridgedb.Dist.IPBasedDistributor` :param dist: A bridge distributor. - :type sched: :class:`bridgedb.Time.IntervalSchedule` - :param sched: DOCDOC + :type sched: :class:`bridgedb.schedule.ScheduledInterval` + :param sched: The scheduled interval at which bridge selection, which + are ultimately displayed on the :class:`WebResourceBridges` page, will + be shifted. + :raises SystemExit: if the servers cannot be started. + :rtype: :api:`twisted.web.server.Site` + :returns: A webserver. """ httpdist = resource.Resource() httpdist.putChild('', WebRoot())

1 0

[bridgedb/develop] Fix docstring for HTTPServer.GimpCaptchaProtectedResource.checkSolution().
by isis＠torproject.org 15 May '14

15 May '14

commit bd4603edfa0255c063de7c228df699a9fffb3d2c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:06:02 2014 +0000 Fix docstring for HTTPServer.GimpCaptchaProtectedResource.checkSolution(). It looks like the docstring was aoriginally copied from HTTPServer.ReCaptchaProtectedResource.checkSolution(), as it says, "The client's IP address is not sent to the ReCaptcha server..." and never rewritten. --- lib/bridgedb/HTTPServer.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 779e270..491e527 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -302,11 +302,7 @@ class GimpCaptchaProtectedResource(CaptchaProtectedResource): self.captchaDir = captchaDir def checkSolution(self, request): - """Process a solved CAPTCHA by sending rehashing the solution together with - the client's IP address, and checking that the result matches the challenge. - - The client's IP address is not sent to the ReCaptcha server; instead, - a completely random IP is generated and sent instead. + """Process a solved CAPTCHA via :meth:`bridgedb.captcha.GimpCaptcha.check`. :type request: :api:`twisted.web.http.Request` :param request: A ``Request`` object, including POST arguments which

1 0

[bridgedb/develop] Add docstring to HTTPServer.CaptchaProtectedResource.getClientIP().
by isis＠torproject.org 15 May '14

15 May '14

commit 48d1281e5c641641c099ac5bcd47a60f4527fc9b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:05:02 2014 +0000 Add docstring to HTTPServer.CaptchaProtectedResource.getClientIP(). --- lib/bridgedb/HTTPServer.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 328d7a3..779e270 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -144,6 +144,12 @@ class CaptchaProtectedResource(resource.Resource): self.resource = protectedResource def getClientIP(self, request): + """Get the client's IP address from the :header:`X-Forwarded-For` + header, or from the :api:`request <twisted.web.server.Request>`. + + :rtype: None or str + :returns: The client's IP address, if it was obtainable. + """ ip = None if self.useForwardedHeader: h = request.getHeader("X-Forwarded-For")

1 0

[bridgedb/develop] Simplify GimpCaptchaKeyError and ReCaptchaKeyError into CaptchaKeyError.
by isis＠torproject.org 15 May '14

15 May '14

commit f5be372df769be8934ac6666e1433e3b92718eab Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:41:00 2014 +0000 Simplify GimpCaptchaKeyError and ReCaptchaKeyError into CaptchaKeyError. * REMOVE exception class captcha.GimpCaptchaKeyError. * REMOVE exception class captcha.ReCaptchaKeyError. * ADD exception class captcha.CaptchaKeyError. --- lib/bridgedb/captcha.py | 17 +++++++---------- lib/bridgedb/test/test_captcha.py | 16 ++++++++-------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 0018988..15f1083 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -68,15 +68,12 @@ from bridgedb import crypto from bridgedb.txrecaptcha import API_SSL_SERVER -class ReCaptchaKeyError(Exception): - """Exception raised when recaptcha API keys are not supplied.""" +class CaptchaKeyError(Exception): + """Raised if a CAPTCHA system's keys are invalid or missing.""" class GimpCaptchaError(Exception): """General exception raised when a Gimp CAPTCHA cannot be retrieved.""" -class GimpCaptchaKeyError(ValueError): - """Raised when there is a problem with one of the Gimp CAPTCHA keys.""" - class ICaptcha(Interface): """Interface specification for CAPTCHAs.""" @@ -135,12 +132,12 @@ class ReCaptcha(Captcha): stored at ``ReCaptcha.image`` and the challenge string at ``ReCaptcha.challenge``. - :raises ReCaptchaKeyError: If either the :ivar:`pubkey` or - :ivar:`privkey` are missing. + :raises CaptchaKeyError: If either the :ivar:`publicKey` or + :ivar:`secretKey` are missing. :raises HTTPError: If the server returned any HTTP error status code. """ if not self.pubkey or not self.privkey: - raise ReCaptchaKeyError('You must supply recaptcha API keys') + raise CaptchaKeyError('You must supply recaptcha API keys') urlbase = API_SSL_SERVER form = "/noscript?k=%s" % self.pubkey @@ -173,7 +170,7 @@ class GimpCaptcha(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 GimpCaptchaKeyError: if any of **secretKey**, **publicKey**, + :raises CaptchaKeyError: if any of **secretKey**, **publicKey**, or **hmacKey** is invalid, or missing. """ super(GimpCaptcha, self).__init__() @@ -182,7 +179,7 @@ class GimpCaptcha(Captcha): raise GimpCaptchaError("Gimp captcha cache isn't a directory: %r" % cacheDir) if not (publicKey and secretKey and hmacKey): - raise GimpCaptchaKeyError( + raise CaptchaKeyError( "Invalid key supplied to GimpCaptcha: SK=%r PK=%r HMAC=%r" % (secretKey, publicKey, hmacKey)) diff --git a/lib/bridgedb/test/test_captcha.py b/lib/bridgedb/test/test_captcha.py index 7a6f2c4..a383545 100644 --- a/lib/bridgedb/test/test_captcha.py +++ b/lib/bridgedb/test/test_captcha.py @@ -88,7 +88,7 @@ class ReCaptchaTests(unittest.TestCase): def test_get_noKeys(self): """ReCaptcha.get() without API keys should fail.""" c = captcha.ReCaptcha() - self.assertRaises(captcha.ReCaptchaKeyError, c.get) + self.assertRaises(captcha.CaptchaKeyError, c.get) class GimpCaptchaTests(unittest.TestCase): @@ -106,23 +106,23 @@ class GimpCaptchaTests(unittest.TestCase): def test_init_noSecretKey(self): """Calling GimpCaptcha.__init__() without a secret key parameter should raise - a GimpCaptchaKeyError. + a CaptchaKeyError. """ - self.assertRaises(captcha.GimpCaptchaKeyError, captcha.GimpCaptcha, + self.assertRaises(captcha.CaptchaKeyError, captcha.GimpCaptcha, None, self.publik, self.hmacKey, self.cacheDir) def test_init_noPublicKey(self): - """__init__() without publicKey should raise a GimpCaptchaKeyError.""" - self.assertRaises(captcha.GimpCaptchaKeyError, captcha.GimpCaptcha, + """__init__() without publicKey should raise a CaptchaKeyError.""" + self.assertRaises(captcha.CaptchaKeyError, captcha.GimpCaptcha, self.sekrit, None, self.hmacKey, self.cacheDir) def test_init_noHMACKey(self): - """__init__() without hmacKey should raise a GimpCaptchaKeyError.""" - self.assertRaises(captcha.GimpCaptchaKeyError, captcha.GimpCaptcha, + """__init__() without hmacKey should raise a CaptchaKeyError.""" + self.assertRaises(captcha.CaptchaKeyError, captcha.GimpCaptcha, self.sekrit, self.publik, None, self.cacheDir) def test_init_noCacheDir(self): - """__init__() without cacheDir should raise a GimpCaptchaKeyError.""" + """__init__() without cacheDir should raise a CaptchaKeyError.""" self.assertRaises(captcha.GimpCaptchaError, captcha.GimpCaptcha, self.sekrit, self.publik, self.hmacKey, None)

1 0

[bridgedb/develop] Add class inheritance overview to bridgedb.captcha module docstring.
by isis＠torproject.org 15 May '14

15 May '14

commit 65be217961a833951497931dc0b77074da38fc13 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:33:10 2014 +0000 Add class inheritance overview to bridgedb.captcha module docstring. --- lib/bridgedb/captcha.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 8f56552..0018988 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -17,10 +17,30 @@ **Module Overview:** -.. +:: + captcha - |_ReCaptchaKeyError - \_ReCaptcha - Class for obtaining reCaptcha images and challenge strings + |- CaptchaExpired - Raised if a solution is given for a stale CAPTCHA. + |- CaptchaKeyError - Raised if a CAPTCHA system's keys are invalid/missing. + |- GimpCaptchaError - Raised when a Gimp CAPTCHA can't be retrieved. + | + \_ ICaptcha - Zope Interface specification for a generic CAPTCHA. + | + Captcha - Generic base class implementation for obtaining a CAPTCHA. + | |- image - The CAPTCHA image. + | |- challenge - A unique string associated with this CAPTCHA image. + | |- publicKey - The public key for this CAPTCHA system. + | |- secretKey - The secret key for this CAPTCHA system. + | \_ get() - Get a new pair of CAPTCHA image and challenge strings. + | + |- ReCaptcha - Obtain reCaptcha images and challenge strings. + | \_ get() - Request an image and challenge from a reCaptcha API server. + | + \_ 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. + \_ get() - Get a CAPTCHA image from the cache and create a challenge. + .. There are two types of CAPTCHAs which BridgeDB knows how to serve: those

1 0

[bridgedb/develop] Make publicKey and secretKey attributes of the ICaptcha interface.
by isis＠torproject.org 15 May '14

15 May '14

commit a8f35253e47bc47f0f3ca763f29a51224da47d55 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 20:45:09 2014 +0000 Make publicKey and secretKey attributes of the ICaptcha interface. Both the reCaptcha and GimpCaptcha subclasses of the generic base implementation, bridgedb.captcha.Captcha, of the ICaptcha interface have publicKey and secretKey attributes. In fact, it would be hard to generate a secret CAPTCHA challenge_string which was retrievable later if there weren't any keypairs involved. Ergo, the keypair should be part of the interface specification. --- lib/bridgedb/captcha.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 8a76198..f5674c4 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -82,6 +82,11 @@ class ICaptcha(Interface): "A string containing the contents of a CAPTCHA image file.") challenge = Attribute( "A unique string associated with the dispursal of this CAPTCHA.") + publicKey = Attribute( + "A public key used for encrypting CAPTCHA challenge strings.") + secretKey = Attribute( + "A private key used for decrypting challenge strings during CAPTCHA" + "solution verification.") def get(): """Retrieve a new CAPTCHA image.""" @@ -92,15 +97,21 @@ class Captcha(object): :ivar str image: The CAPTCHA image. :ivar str challenge: A challenge string which should permit checking of - the client's CAPTCHA solution in some manner. This should be passed - along to the client with the CAPTCHA image. + the client's CAPTCHA solution in some manner. In stateless protocols + such as HTTP, this should be passed along to the client with the + CAPTCHA image. + :ivar publicKey: A public key used for encrypting CAPTCHA challenge strings. + :ivar secretKey: A private key used for decrypting challenge strings during + CAPTCHA solution verification. """ implements(ICaptcha) - def __init__(self): + def __init__(self, publicKey=None, secretKey=None): """Obtain a new CAPTCHA for a client.""" self.image = None self.challenge = None + self.publicKey = publicKey + self.secretKey = secretKey def get(self): return self.image

1 0