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

[bridgedb/develop] Merge branch 'fix/10809-gimp-captcha_r1' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 35effa8311cc7fa0fec9b4395c125cdd4052eed5 Merge: aec0a06 f508c2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 15 03:35:57 2014 +0000 Merge branch 'fix/10809-gimp-captcha_r1' into develop .gitignore | 3 + bridgedb.conf | 17 +- captchas/Tvx74PMy.jpg | Bin 0 -> 61434 bytes doc/sphinx/source/bridgedb.Raptcha.rst | 8 - doc/sphinx/source/bridgedb.captcha.rst | 8 + doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/conf.py | 2 +- lib/bridgedb/Bridges.py | 33 +-- lib/bridgedb/Dist.py | 45 ++-- lib/bridgedb/HTTPServer.py | 447 ++++++++++++++++++++++++++------ lib/bridgedb/Main.py | 10 +- lib/bridgedb/Raptcha.py | 40 --- lib/bridgedb/captcha.py | 260 +++++++++++++++++++ lib/bridgedb/crypto.py | 127 ++++++++- lib/bridgedb/templates/captcha.html | 18 +- lib/bridgedb/test/test_captcha.py | 237 +++++++++++++++++ requirements.txt | 1 + 17 files changed, 1052 insertions(+), 206 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/11127-recaptcha-ssl_10809r1_r1' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 8d927c1bf3e1ad7fb8b09c1884f6667cf89596f9 Merge: 35effa8 84dd0f3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 15 07:43:05 2014 +0000 Merge branch 'fix/11127-recaptcha-ssl_10809r1_r1' into develop lib/bridgedb/HTTPServer.py | 7 +- lib/bridgedb/captcha.py | 3 +- lib/bridgedb/crypto.py | 98 ++++++++++++- lib/bridgedb/test/test_crypto.py | 104 +++++++++++++ lib/bridgedb/test/test_txrecaptcha.py | 261 +++++++++++++++++++++++++++++++++ lib/bridgedb/txrecaptcha.py | 215 +++++++++++++++++++++++++++ 6 files changed, 683 insertions(+), 5 deletions(-)

1 0

[bridgedb/develop] Update copyright info in lib/bridgedb/Raptcha.py and add utf-8 header.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 85116508430a83d6e5ee42ce80d0cde80358fe09 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 27 21:44:03 2014 +0000 Update copyright info in lib/bridgedb/Raptcha.py and add utf-8 header. --- lib/bridgedb/Raptcha.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Raptcha.py b/lib/bridgedb/Raptcha.py index 1af8dd6..9a35b08 100644 --- a/lib/bridgedb/Raptcha.py +++ b/lib/bridgedb/Raptcha.py @@ -1,6 +1,17 @@ -# Raptcha -# Copyright (c) 2010, The Tor Project, Inc. -# See LICENSE for licensing information +# -*- encoding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# Aaron Gibson 0x2C4B239DD876C9F6 <aagbsn(a)torproject.org> +# Nick Mathewson 0x21194EBB165733EA <nickm(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# (c) 2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ """ This module wraps the recaptcha api and proxies requests to protect privacy.

1 0

[bridgedb/develop] Rewrite module docstring for lib/bridgedb/captcha.py.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit e3595b84d983f40b6e2693839f27d39bb3c00157 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 28 01:03:38 2014 +0000 Rewrite module docstring for lib/bridgedb/captcha.py. --- lib/bridgedb/captcha.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 9936343..f70fa3f 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -13,8 +13,23 @@ # :license: see LICENSE for licensing information #_____________________________________________________________________________ -""" -This module wraps the recaptcha api and proxies requests to protect privacy. +"""This module implements various methods for obtaining or creating CAPTCHAs. + +**Module Overview:** + +.. + captcha + |_RaptchaKeyError + \_Raptcha - Class for obtaining reCaptcha images and challenge strings +.. + +There are two types of CAPTCHAs which BridgeDB knows how to serve: those +obtained by from a reCaptcha_ API server with +:class:`~bridgedb.captcha.Raptcha`, and those which have been generated with +gimp-captcha_ and then cached locally. + +.. _reCaptcha : https://code.google.com/p/recaptcha/ +.. _gimp-captcha: https://github.com/isislovecruft/gimp-captcha """ from recaptcha.client import captcha as recaptcha

1 0

[bridgedb/develop] Pep8 the order of imports in lib/bridgedb/captcha.py.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 9bbc55d24a132dc2534bd744085ec51113e9d47d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 28 01:07:32 2014 +0000 Pep8 the order of imports in lib/bridgedb/captcha.py. --- lib/bridgedb/captcha.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index f70fa3f..e6533d8 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -32,10 +32,12 @@ gimp-captcha_ and then cached locally. .. _gimp-captcha: https://github.com/isislovecruft/gimp-captcha """ -from recaptcha.client import captcha as recaptcha -from BeautifulSoup import BeautifulSoup import urllib2 +from BeautifulSoup import BeautifulSoup +from recaptcha.client import captcha as recaptcha + + class Raptcha(): """ A recaptcha captcha and method to request them """

1 0

[bridgedb/develop] Fix old-style class bridgedb.captcha.Raptcha.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit be44ad36b147e54e5b843568dd9fd050c547d98e Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 28 01:08:28 2014 +0000 Fix old-style class bridgedb.captcha.Raptcha. --- lib/bridgedb/captcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index e6533d8..0d3bf35 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -38,7 +38,7 @@ from BeautifulSoup import BeautifulSoup from recaptcha.client import captcha as recaptcha -class Raptcha(): +class Raptcha(object): """ A recaptcha captcha and method to request them """ def __init__(self, pubkey=None, privkey=None):

1 0

[bridgedb/develop] Rename lib/bridgedb/Raptcha.py → lib/bridgedb/captcha.py.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 4709c1536a18cfe629ea196cb9eccdc2ddf92d79 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 27 21:56:36 2014 +0000 Rename lib/bridgedb/Raptcha.py → lib/bridgedb/captcha.py. * CHANGE imports of ``recaptcha.client.captcha`` to ``from recaptcha.client import captcha as recaptcha``, to avoid name conflict. * Update Sphinx source configuration and build files to reflect module name change. --- doc/sphinx/source/bridgedb.Raptcha.rst | 4 +-- doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/conf.py | 2 +- lib/bridgedb/HTTPServer.py | 6 ++-- lib/bridgedb/Raptcha.py | 51 ------------------------------- lib/bridgedb/captcha.py | 52 ++++++++++++++++++++++++++++++++ 6 files changed, 59 insertions(+), 58 deletions(-) diff --git a/doc/sphinx/source/bridgedb.Raptcha.rst b/doc/sphinx/source/bridgedb.Raptcha.rst index 374286f..633fa61 100644 --- a/doc/sphinx/source/bridgedb.Raptcha.rst +++ b/doc/sphinx/source/bridgedb.Raptcha.rst @@ -1,7 +1,7 @@ -bridgedb.Raptcha +bridgedb.captcha ---------------- -.. automodule:: bridgedb.Raptcha +.. automodule:: bridgedb.captcha :members: :undoc-members: :private-members: diff --git a/doc/sphinx/source/bridgedb.rst b/doc/sphinx/source/bridgedb.rst index afb7a0c..38dc9a2 100644 --- a/doc/sphinx/source/bridgedb.rst +++ b/doc/sphinx/source/bridgedb.rst @@ -7,6 +7,7 @@ bridgedb bridgedb.Bridges bridgedb.Bucket + bridgedb.captcha bridgedb.crypto bridgedb.Dist bridgedb.EmailServer @@ -16,7 +17,6 @@ bridgedb bridgedb.Main bridgedb.parse bridgedb.persistent - bridgedb.Raptcha bridgedb.runner bridgedb.Stability bridgedb.Storage diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index eab7673..de44db4 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -27,6 +27,7 @@ sys.path.insert(0, os.path.abspath(os.path.join( import bridgedb +import bridgedb.captcha import bridgedb.Bridges import bridgedb.Bucket import bridgedb.crypto @@ -37,7 +38,6 @@ import bridgedb.HTTPServer import bridgedb.I18n import bridgedb.Main import bridgedb.persistent -import bridgedb.Raptcha import bridgedb.runner import bridgedb.Stability import bridgedb.Storage diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index b679ff5..175fd24 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -26,8 +26,8 @@ import bridgedb.Dist import bridgedb.I18n as I18n import bridgedb.Util as Util -from recaptcha.client import captcha -from bridgedb.Raptcha import Raptcha +from recaptcha.client import captcha as recaptcha +from bridgedb.captcha import Raptcha from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn @@ -191,7 +191,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): remote_ip = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), randint(1,255),randint(1,255)) - recaptcha_response = captcha.submit(challenge, response, + recaptcha_response = recaptcha.submit(challenge, response, self.recaptchaPrivKey, remote_ip) logging.debug("Captcha from client with masked IP %r. Parameters:\n%r" % (remote_ip, request.args)) diff --git a/lib/bridgedb/Raptcha.py b/lib/bridgedb/Raptcha.py deleted file mode 100644 index 9a35b08..0000000 --- a/lib/bridgedb/Raptcha.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- encoding: utf-8 -*- -#_____________________________________________________________________________ -# -# This file is part of BridgeDB, a Tor bridge distribution system. -# -# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# Aaron Gibson 0x2C4B239DD876C9F6 <aagbsn(a)torproject.org> -# Nick Mathewson 0x21194EBB165733EA <nickm(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2007-2014, The Tor Project, Inc. -# (c) 2007-2014, all entities within the AUTHORS file -# (c) 2014, Isis Lovecruft -# :license: see LICENSE for licensing information -#_____________________________________________________________________________ - -""" -This module wraps the recaptcha api and proxies requests to protect privacy. -""" -import recaptcha.client.captcha as captcha -from BeautifulSoup import BeautifulSoup -import urllib2 - -class Raptcha(): - """ A recaptcha captcha and method to request them """ - - def __init__(self, pubkey=None, privkey=None): - self.pubkey = pubkey - self.privkey = privkey - self.image = None - self.challenge = None - - def get(self): - """ gets a fresh captcha """ - - if (self.pubkey == '') or (self.privkey == ''): - raise RaptchaKeyError - urlbase = captcha.API_SERVER - form = "/noscript?k=%s" % self.pubkey - - # extract and store image from captcha - html = urllib2.urlopen(urlbase+form).read() - soup = BeautifulSoup(html) - imgurl = urlbase+"/"+ soup.find('img')['src'] - self.challenge = str(soup.find('input', {'name' : 'recaptcha_challenge_field'})['value']) - self.image = urllib2.urlopen(imgurl).read() - -class RaptchaKeyError(Exception): - """ Exception raised when recaptcha API keys are not supplied""" - def __init__(self): - msg = 'You must supply recaptcha API keys' - Exception.__init__(self, msg) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py new file mode 100644 index 0000000..9936343 --- /dev/null +++ b/lib/bridgedb/captcha.py @@ -0,0 +1,52 @@ +# -*- encoding: utf-8 -*- +#_____________________________________________________________________________ +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# Aaron Gibson 0x2C4B239DD876C9F6 <aagbsn(a)torproject.org> +# Nick Mathewson 0x21194EBB165733EA <nickm(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# (c) 2014, Isis Lovecruft +# :license: see LICENSE for licensing information +#_____________________________________________________________________________ + +""" +This module wraps the recaptcha api and proxies requests to protect privacy. +""" + +from recaptcha.client import captcha as recaptcha +from BeautifulSoup import BeautifulSoup +import urllib2 + +class Raptcha(): + """ A recaptcha captcha and method to request them """ + + def __init__(self, pubkey=None, privkey=None): + self.pubkey = pubkey + self.privkey = privkey + self.image = None + self.challenge = None + + def get(self): + """ gets a fresh captcha """ + + if (self.pubkey == '') or (self.privkey == ''): + raise RaptchaKeyError + urlbase = recaptcha.API_SERVER + form = "/noscript?k=%s" % self.pubkey + + # extract and store image from captcha + html = urllib2.urlopen(urlbase+form).read() + soup = BeautifulSoup(html) + imgurl = urlbase+"/"+ soup.find('img')['src'] + self.challenge = str(soup.find('input', {'name' : 'recaptcha_challenge_field'})['value']) + self.image = urllib2.urlopen(imgurl).read() + +class RaptchaKeyError(Exception): + """ Exception raised when recaptcha API keys are not supplied""" + def __init__(self): + msg = 'You must supply recaptcha API keys' + Exception.__init__(self, msg)

1 0

[bridgedb/develop] Split general and reCaptcha functionality into separate classes.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 75f5895e729c79fcf585f7b0fc18313f4d9ea53f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 1 03:01:35 2014 +0000 Split general and reCaptcha functionality into separate classes. * CHANGE captcha.CaptchaProtectedResource class to only implement general CAPTCHA functionality. * CHANGE render_* methods in captcha.CaptchaProtectedResource to call subclass overridable methods for actions which are implementation specific, i.e. only the reCaptcha class needs to create a fake IP address for a client (see the new ReCaptchaProtectedResource.getRemoteIP() method), so this functionality should be in a separate method rather than in captcha.CaptchaProtectedResource.render_POST(). See methods getCaptchaImage(), extractClientSolution(), and checkSolution(). * ADD new captcha.ReCaptchaProtectedResource class which is a subclass of captcha.CaptchaProtectedResource, and which implements reCaptcha-specific functionality. * CHANGE lib/bridgedb/templates/captcha.html to use HTTP parameters 'captcha_challenge_field' and 'captcha_response_field', rather than 'recaptcha_challenge_field' and 'recaptcha_response_field' respectively. --- lib/bridgedb/HTTPServer.py | 222 +++++++++++++++++++++++++++-------- lib/bridgedb/templates/captcha.html | 18 +-- 2 files changed, 184 insertions(+), 56 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 63e48c9..ae14f62 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -112,14 +112,12 @@ def replaceErrorPage(error, template_name=None): class CaptchaProtectedResource(twisted.web.resource.Resource): - def __init__(self, useRecaptcha=False, recaptchaPrivKey='', - recaptchaPubKey='', remoteip='', useForwardedHeader=False, - resource=None): + """A general resource protected by some form of CAPTCHA.""" + + def __init__(self, useForwardedHeader=False, resource=None): + twisted.web.resource.Resource.__init__(self) self.isLeaf = resource.isLeaf self.useForwardedHeader = useForwardedHeader - self.recaptchaPrivKey = recaptchaPrivKey - self.recaptchaPubKey = recaptchaPubKey - self.recaptchaRemoteIP = remoteip self.resource = resource def getClientIP(self, request): @@ -135,84 +133,212 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): ip = request.getClientIP() return ip + def getCaptchaImage(self): + """Get a CAPTCHA image. + + :returns: A 2-tuple of ``(image, challenge)``, where ``image`` is a + binary, JPEG-encoded image, and ``challenge`` is a unique + string. If unable to retrieve a CAPTCHA, returns + ``(None, None)``. + """ + return (None, None) + + def extractClientSolution(self, request): + """Extract the client's CAPTCHA solution from a POST request. + + This is used after receiving a POST request from a client (which + should contain their solution to the CAPTCHA), to extract the solution + and challenge strings. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object for 'bridges.html'. + :returns: A redirect for a request for a new CAPTCHA if there was a + problem. Otherwise, returns a 2-tuple of strings, the first + is the client's CAPTCHA solution from the text input area, + and the second is the challenge string. + """ + try: + challenge = request.args['captcha_challenge_field'][0] + response = request.args['captcha_response_field'][0] + except: + return redirectTo(request.URLPath(), request) + return (challenge, response) + + def checkSolution(self, request): + """Override this method to check a client's CAPTCHA solution. + + :rtype: bool + :returns: ``True`` if the client correctly solved the CAPTCHA; + ``False`` otherwise. + """ + return False + def render_GET(self, request): """Retrieve a ReCaptcha from the API server and serve it to the client. :type request: :api:`twisted.web.http.Request` - :param request: A ``Request`` object for 'bridges.html'. + :param request: A ``Request`` object for a page which should be + protected by a CAPTCHA. :rtype: str :returns: A rendered HTML page containing a ReCaptcha challenge image for the client to solve. """ - c = captcha.ReCaptcha(self.recaptchaPubKey, self.recaptchaPrivKey) - - try: - c.get() - except Exception as error: - logging.fatal("Connection to Recaptcha server failed: %s" % error) - - if c.image is None: - logging.warn("No CAPTCHA image received from ReCaptcha server!") + image, challenge = self.getCaptchaImage() try: # TODO: this does not work for versions of IE < 8.0 - imgstr = 'data:image/jpeg;base64,%s' % base64.b64encode(c.image) + imgstr = 'data:image/jpeg;base64,%s' % base64.b64encode(image) template = lookup.get_template('captcha.html') rendered = template.render(imgstr=imgstr, - challenge_field=c.challenge) + challenge_field=challenge) except Exception as err: rendered = replaceErrorPage(err, 'captcha.html') return rendered def render_POST(self, request): - """Process a client CAPTCHA by sending it to the ReCaptcha server. + """Process a client's CAPTCHA solution. - The client's IP address is not sent to the ReCaptcha server; instead, - a completely random IP is generated and sent instead. + If the client's CAPTCHA solution is valid (according to + :meth:`checkSolution`), process and serve their original + request. Otherwise, redirect them back to a new CAPTCHA page. :type request: :api:`twisted.web.http.Request` - :param request: A ``Request`` object containing the POST arguments + :param request: A ``Request`` object, including POST arguments which should include two key/value pairs: one key being - ``'recaptcha_challange_field'``, and the other, - ``'recaptcha_response_field'``. These POST arguments + ``'captcha_challenge_field'``, and the other, + ``'captcha_response_field'``. These POST arguments should be obtained from :meth:`render_GET`. + :rtype: str + :returns: A rendered HTML page containing a ReCaptcha challenge image + for the client to solve. """ - try: - challenge = request.args['recaptcha_challenge_field'][0] - response = request.args['recaptcha_response_field'][0] - except: - return redirectTo(request.URLPath(), request) - - if self.recaptchaRemoteIP: - remote_ip = self.recaptchaRemoteIP - else: - # generate a random IP for the captcha submission - remote_ip = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), - randint(1,255),randint(1,255)) - - recaptcha_response = recaptcha.submit(challenge, response, - self.recaptchaPrivKey, remote_ip) - logging.debug("Captcha from client with masked IP %r. Parameters:\n%r" - % (remote_ip, request.args)) - - if recaptcha_response.is_valid: - logging.info("Valid recaptcha from client with masked IP %r." - % remote_ip) + if self.checkSolution(request): try: rendered = self.resource.render(request) except Exception as err: rendered = replaceErrorPage(err) return rendered - else: - logging.info("Invalid recaptcha from client with masked IP %r: %r" - % (remote_ip, recaptcha_response.error_code)) logging.debug("Client failed a recaptcha; returning redirect to %s" % request.uri) return redirectTo(request.uri, request) +class ReCaptchaProtectedResource(CaptchaProtectedResource): + """A web resource which uses the reCaptcha_ service. + + .. _reCaptcha: http://www.google.com/recaptcha + """ + + def __init__(self, recaptchaPrivKey='', recaptchaPubKey='', remoteip='', + useForwardedHeader=False, resource=None): + CaptchaProtectedResource.__init__(self, useForwardedHeader, resource) + self.recaptchaPrivKey = recaptchaPrivKey + self.recaptchaPubKey = recaptchaPubKey + self.recaptchaRemoteIP = remoteip + + def getCaptchaImage(self): + """Get a CAPTCHA image from the remote reCaptcha server. + + :returns: A 2-tuple of ``(image, challenge)``, where:: + - ``image`` is a string holding a binary, JPEG-encoded image. + - ``challenge`` is a unique string associated with the request. + """ + c = captcha.ReCaptcha(self.recaptchaPubKey, self.recaptchaPrivKey) + + try: + c.get() + except Exception as error: + logging.fatal("Connection to Recaptcha server failed: %s" % error) + + if c.image is None: + logging.warn("No CAPTCHA image received from ReCaptcha server!") + + return (c.image, c.challenge) + + def getRemoteIP(self): + """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. + + :rtype: str + :returns: A fake IP address to report to the reCaptcha API server. + """ + if self.recaptchaRemoteIP: + remoteIP = self.recaptchaRemoteIP + else: + # generate a random IP for the captcha submission + remoteIP = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), + randint(1,255),randint(1,255)) + return remoteIP + + def checkSolution(self, request): + """Process a solved CAPTCHA by sending it to the ReCaptcha server. + + The client's IP address is not sent to the ReCaptcha server; instead, + a completely random IP is generated and sent instead. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object, including POST arguments which + should include two key/value pairs: one key being + ``'captcha_challenge_field'``, and the other, + ``'captcha_response_field'``. These POST arguments + should be obtained from :meth:`render_GET`. + :rtupe: bool + :returns: XXX + """ + challenge, response = self.extractClientSolution(request) + clientIP = self.getClientIP(request) + remoteIP = self.getRemoteIP() + solution = recaptcha.submit(challenge, response, + self.recaptchaPrivKey, remoteIP) + logging.debug("Captcha from %r. Parameters: %r" + % (Util.logSafely(clientIP), request.args)) + + if solution.is_valid: + logging.info("Valid CAPTCHA solution from %r." + % Util.logSafely(clientIP)) + return True + else: + logging.info("Invalid CAPTCHA solution from %r: %r" + % (Util.logSafely(clientIP), solution.error_code)) + return False + + def render_GET(self, request): + """Retrieve a ReCaptcha from the API server and serve it to the client. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object for 'bridges.html'. + :rtype: str + :returns: A rendered HTML page containing a ReCaptcha challenge image + for the client to solve. + """ + return CaptchaProtectedResource.render_GET(self, request) + + def render_POST(self, request): + """Process a client's CAPTCHA solution. + + If the client's CAPTCHA solution is valid (according to + :meth:`checkSolution`), process and serve their original + request. Otherwise, redirect them back to a new CAPTCHA page. + + :type request: :api:`twisted.web.http.Request` + :param request: A ``Request`` object, including POST arguments which + should include two key/value pairs: one key being + ``'captcha_challenge_field'``, and the other, + ``'captcha_response_field'``. These POST arguments + should be obtained from :meth:`render_GET`. + :rtype: str + :returns: A rendered HTML page containing a ReCaptcha challenge image + for the client to solve. + """ + return CaptchaProtectedResource.render_POST(self, request) + + + class WebResourceOptions(twisted.web.resource.Resource): """This resource is used by Twisted Web to give a web page with additional options that the user may use to specify the criteria diff --git a/lib/bridgedb/templates/captcha.html b/lib/bridgedb/templates/captcha.html index dcb8adb..a670072 100644 --- a/lib/bridgedb/templates/captcha.html +++ b/lib/bridgedb/templates/captcha.html @@ -1,14 +1,16 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*- <%inherit file="base.html"/> <div class="captcha"> <form action="" method="POST"> - <input type="hidden" name="recaptcha_challenge_field" - id="recaptcha_challenge_field" value="${challenge_field}"> - <img width="300" height="57" alt="${_('Upgrade your browser to Firefox')}" src="${imgstr}"> - <div class="recaptcha_input_area"> - <label for="recaptcha_response_field">${_("Type the two words")}</label></div> - <input name="recaptcha_response_field" id="recaptcha_response_field" - type="text" autocomplete="off"> + <input type="hidden" name="captcha_challenge_field" + id="captcha_challenge_field" value="${challenge_field}"> + <img width="300" height="57" + alt="${_('Your browser is not displaying images properly.')}" + src="${imgstr}"> + <div class="captcha_input_area"> + <label for="captcha_response_field">${_("Type the two words")}</label></div> + <input name="captcha_response_field" id="captcha_response_field" + type="text" autocomplete="off"> <input class="btn btn-success" type="submit" name="submit" value="I am human"> </form> </div>

1 0

[bridgedb/develop] Rename reCaptcha classes.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 1cadbf4de48d827e094d905065c197a4ca1184ab Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 28 02:47:33 2014 +0000 Rename reCaptcha classes. * RENAME captcha.Raptcha → captcha.ReCaptcha * RENAME captcha.RaptchaKeyError → captcha.ReCaptchaKeyError --- lib/bridgedb/HTTPServer.py | 4 ++-- lib/bridgedb/captcha.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 175fd24..2d5fd72 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -27,7 +27,7 @@ import bridgedb.I18n as I18n import bridgedb.Util as Util from recaptcha.client import captcha as recaptcha -from bridgedb.captcha import Raptcha +from bridgedb.captcha import ReCaptcha from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn @@ -144,7 +144,7 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): :returns: A rendered HTML page containing a ReCaptcha challenge image for the client to solve. """ - c = Raptcha(self.recaptchaPubKey, self.recaptchaPrivKey) + c = ReCaptcha(self.recaptchaPubKey, self.recaptchaPrivKey) try: c.get() diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 0d3bf35..430643c 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -19,8 +19,8 @@ .. captcha - |_RaptchaKeyError - \_Raptcha - Class for obtaining reCaptcha images and challenge strings + |_ReCaptchaKeyError + \_ReCaptcha - Class for obtaining reCaptcha images and challenge strings .. There are two types of CAPTCHAs which BridgeDB knows how to serve: those @@ -38,7 +38,7 @@ from BeautifulSoup import BeautifulSoup from recaptcha.client import captcha as recaptcha -class Raptcha(object): +class ReCaptcha(object): """ A recaptcha captcha and method to request them """ def __init__(self, pubkey=None, privkey=None): @@ -51,7 +51,7 @@ class Raptcha(object): """ gets a fresh captcha """ if (self.pubkey == '') or (self.privkey == ''): - raise RaptchaKeyError + raise ReCaptchaKeyError urlbase = recaptcha.API_SERVER form = "/noscript?k=%s" % self.pubkey @@ -62,7 +62,7 @@ class Raptcha(object): self.challenge = str(soup.find('input', {'name' : 'recaptcha_challenge_field'})['value']) self.image = urllib2.urlopen(imgurl).read() -class RaptchaKeyError(Exception): +class ReCaptchaKeyError(Exception): """ Exception raised when recaptcha API keys are not supplied""" def __init__(self): msg = 'You must supply recaptcha API keys'

1 0

[bridgedb/develop] Implement ICaptcha interface and generic Captcha implementation classes.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit cf8d0a3e1d3fb4b4cb3eeafb8d180e4abcc2101b Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 1 01:36:24 2014 +0000 Implement ICaptcha interface and generic Captcha implementation classes. --- lib/bridgedb/captcha.py | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 67b23d3..cd53cd7 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -36,6 +36,7 @@ import urllib2 from BeautifulSoup import BeautifulSoup from recaptcha.client import captcha as recaptcha +from zope.interface import Interface, Attribute, implements class ReCaptchaKeyError(Exception): @@ -45,14 +46,32 @@ class ReCaptchaKeyError(Exception): msg = 'You must supply recaptcha API keys' Exception.__init__(self, msg) -class ReCaptcha(object): - """ A recaptcha captcha and method to request them """ +class ICaptcha(Interface): + """Interface specification for CAPTCHAs.""" + image = Attribute("A CAPTCHA image.") + + def get(self): + """Retrieve a new CAPTCHA.""" + return None + +class Captcha(object): + """A generic CAPTCHA object.""" + implements(ICaptcha) + + def __init__(self): + self.image = None + + def get(self): + return self.image + +class ReCaptcha(Captcha): + """A reCaptcha CAPTCHA.""" def __init__(self, pubkey=None, privkey=None): self.pubkey = pubkey self.privkey = privkey self.image = None - self.challenge = None + super(ReCaptcha, self).__init__() def get(self): """ gets a fresh captcha """

1 0