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

[bridgedb/develop] Change the requested pagename in CaptchaProtectedResourceTests unittests.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 25eb893487855f7449610c60895b7bd79f6458e3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 17:44:36 2014 +0000 Change the requested pagename in CaptchaProtectedResourceTests unittests. --- lib/bridgedb/test/test_HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index e0c81f8..119d2fc 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -50,7 +50,7 @@ class CaptchaProtectedResourceTests(unittest.TestCase): def setUp(self): self.dist = None self.sched = None - self.pagename = b'somepage.html' + self.pagename = b'bridges.html' self.root = Resource() self.protectedResource = HTTPServer.WebResourceBridges(self.dist, self.sched)

1 0

[bridgedb/develop] Add class wrapper for requesthelper.DummyRequest to support redirects.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit ad774181faa5cd367e4173ce14a4449a3164abeb Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 17:57:09 2014 +0000 Add class wrapper for requesthelper.DummyRequest to support redirects. --- lib/bridgedb/test/test_HTTPServer.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index e2856c7..73297de 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -445,3 +445,23 @@ class DummyIPBasedDistributor(object): :meth:`WebResourceBridges.getBridgesForIP`. """ return [DummyBridge() for _ in xrange(N)] + + +class DummyRequest(requesthelper.DummyRequest): + """Wrapper for :api:`twisted.test.requesthelper.DummyRequest` to add + redirect support. + """ + + def __init__(self, *args, **kwargs): + requesthelper.DummyRequest.__init__(self, *args, **kwargs) + self.redirect = self._redirect(self) + + def URLPath(self): + """Fake the missing Request.URLPath too.""" + return self.uri + + def _redirect(self, request): + """Stub method to add a redirect() method to DummyResponse.""" + newRequest = type(request) + newRequest.uri = request.uri + return newRequest

1 0

[bridgedb/develop] Add a mocked DummyIPBasedDistributor class to test_HTTPServer.py.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 6fcf0121296067f7e47721af315ca5b85021e8b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 17:56:26 2014 +0000 Add a mocked DummyIPBasedDistributor class to test_HTTPServer.py. A distributor is a required parameter to the `HTTPServer.WebResourceBridges` class. This one merely creates N random `DummyBridges`, where N is the number of bridges we're told to return to the client. --- lib/bridgedb/test/test_HTTPServer.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 05e041c..e2856c7 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -418,3 +418,30 @@ class DummyBridge(object): bridgeLine = " ".join([item for item in line]) #print "Created config line: %r" % bridgeLine return bridgeLine + + +class DummyIPBasedDistributor(object): + """A mocked :class:`bridgedb.Dist.IPBasedDistributor` which is used to test + :class:`bridgedb.HTTPServer.WebResourceBridges. + """ + + def _dumbAreaMapper(ip): return ip + + def __init__(self, areaMapper=None, nClusters=None, key=None, + ipCategories=None, answerParameters=None): + """None of the parameters are really used, they are just there to retain + an identical method signature. + """ + self.areaMapper = self._dumbAreaMapper + self.nClusters = 3 + self.nBridgesToGive = 3 + self.key = self.__class__.__name__ + self.ipCategories = ipCategories + self.answerParameters = answerParameters + + def getBridgesForIP(self, ip=None, epoch=None, N=1, + countyCode=None, bridgeFilterRules=None): + """Needed because it's called in + :meth:`WebResourceBridges.getBridgesForIP`. + """ + return [DummyBridge() for _ in xrange(N)]

1 0

[bridgedb/develop] Fix X-Forwarded-For unittests in CaptchaProtectedResourceTests.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit bbfa41304d0b4a7ec30bceadfc6bc5b3b923a7d7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 18:00:49 2014 +0000 Fix X-Forwarded-For unittests in CaptchaProtectedResourceTests. Apparently, we can't do: request.setHeader('X-Forwarded-For', '1.1.1.1') because then BridgeDB never finds the header. Instead, we must do: request.headers.update({'X-Forwarded-For': '1.1.1.1'}) --- lib/bridgedb/test/test_HTTPServer.py | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index cd55b46..507b1f0 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -86,19 +86,39 @@ class CaptchaProtectedResourceTests(unittest.TestCase): finally: HTTPServer.lookup = oldLookup + def createRequestWithIPs(self): + """Set the IP address returned from ``request.getClientIP()`` to + '3.3.3.3', and the IP address reported in the 'X-Forwarded-For' header + to '2.2.2.2'. + """ + request = DummyRequest([self.pagename]) + # Since we do not set ``request.getClientIP`` here like we do in some + # of the other unittests, an exception would be raised here if + # ``getBridgesForRequest()`` is unable to get the IP address from this + # 'X-Forwarded-For' header (because ``ip`` would get set to ``None``). + request.headers.update({'x-forwarded-for': '2.2.2.2'}) + # See :api:`twisted.test.requesthelper.DummyRequest.getClientIP` + request.client = requesthelper.IPv4Address('TCP', '3.3.3.3', 443) + request.method = b'GET' + return request + def test_getClientIP_XForwardedFor(self): """CaptchaProtectedResource.getClientIP() should return the IP address from the 'X-Forwarded-For' header when ``useForwardedHeader=True``. """ - requestIP = b'6.6.6.6' - request = requesthelper.DummyRequest([self.pagename]) - request.setHeader(b'X-Forwarded-For', requestIP) - request.method = b'GET' + self.captchaResource.useForwardedHeader = True + request = self.createRequestWithIPs() + clientIP = self.captchaResource.getClientIP(request) + self.assertEqual(clientIP, '2.2.2.2') - #child = root.getChild(pagename, request) - page = self.captchaResource.render_GET(request) + def test_getClientIP_fromRequest(self): + """CaptchaProtectedResource.getClientIP() should return the IP address + from the request instance when ``useForwardedHeader=False``. + """ + self.captchaResource.useForwardedHeader = False + request = self.createRequestWithIPs() clientIP = self.captchaResource.getClientIP(request) - #self.assertEquals(requestIP, clientIP) + self.assertEqual(clientIP, '3.3.3.3') def test_render_POST(self): """render_POST() with a wrong 'captcha_response_field' should return

1 0

[bridgedb/develop] Always expect a Deferred from ReCaptcha.checkSolution().
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 738101ac291235cc1415f4db5c9c023b6521e34f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 18:03:15 2014 +0000 Always expect a Deferred from ReCaptcha.checkSolution(). Currently, we `checkSolution()` will return a RecaptchaResponse if the HTTP POST argument fields are blank. Otherwise, it returns a deferred. This is bad. It means we have to do all kinds of checks to see if we can add callbacks on the returned object. It should always return a deferred which callbacks with a RecaptchaResponse, and so we should test for that and fail if that is not what is happening. --- lib/bridgedb/test/test_HTTPServer.py | 6 +++--- lib/bridgedb/test/test_txrecaptcha.py | 21 +++++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 507b1f0..9b5a6e4 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -309,9 +309,9 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): self.request.addArg('captcha_challenge_field', '') self.request.addArg('captcha_response_field', '') - self.assertIsInstance( - self.captchaResource.checkSolution(self.request), - HTTPServer.txrecaptcha.RecaptchaResponse) + self.assertIs(False, + self.successResultOf( + self.captchaResource.checkSolution(self.request))) def test_getRemoteIP_useRandomIP(self): """Check that removing our remoteip setting produces a random IP.""" diff --git a/lib/bridgedb/test/test_txrecaptcha.py b/lib/bridgedb/test/test_txrecaptcha.py index c7dcbb1..81484dc 100644 --- a/lib/bridgedb/test/test_txrecaptcha.py +++ b/lib/bridgedb/test/test_txrecaptcha.py @@ -181,12 +181,21 @@ class SubmitTests(unittest.TestCase): self.ip = "1.2.3.4" def test_submit_emptyResponseField(self): - """An empty 'recaptcha_response_field' should immediately return a - RecaptchaResponse whose error_code is 'incorrect-captcha-sol'.""" - response = txrecaptcha.submit(self.challenge, '', self.key, self.ip) - self.assertIsInstance(response, txrecaptcha.RecaptchaResponse) - self.assertIs(response.is_valid, False) - self.assertEqual(response.error_code, 'incorrect-captcha-sol') + """An empty 'recaptcha_response_field' should return a deferred which + callbacks with a RecaptchaResponse whose error_code is + 'incorrect-captcha-sol'. + """ + def checkResponse(response): + """Check that the response is a + :class:`txcaptcha.RecaptchaResponse`. + """ + self.assertIsInstance(response, txrecaptcha.RecaptchaResponse) + self.assertIs(response.is_valid, False) + self.assertEqual(response.error_code, 'incorrect-captcha-sol') + + d = txrecaptcha.submit(self.challenge, '', self.key, self.ip) + d.addCallback(checkResponse) + return d def test_submit_returnsDeferred(self): """:func:`txrecaptcha.submit` should return a deferred."""

1 0

[bridgedb/develop] Add unittests for HTTPServer.WebResourceBridges.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit a4dd886c34ce6f1c30d752d68f42dd8eefd260fc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 18:08:26 2014 +0000 Add unittests for HTTPServer.WebResourceBridges. --- lib/bridgedb/test/test_HTTPServer.py | 136 ++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 9b5a6e4..9f241d9 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -28,6 +28,7 @@ from twisted.web.resource import Resource from twisted.web.test import requesthelper from bridgedb import HTTPServer +from bridgedb.Time import IntervalSchedule # For additional logger output for debugging, comment out the following: @@ -459,3 +460,138 @@ class DummyRequest(requesthelper.DummyRequest): newRequest = type(request) newRequest.uri = request.uri return newRequest + + +class WebResourceBridgesTests(unittest.TestCase): + """Tests for :class:`HTTPServer.WebResourceBridges`.""" + + def setUp(self): + """Set up our resources to fake a minimal HTTP(S) server.""" + self.pagename = b'bridges.html' + self.root = Resource() + + self.dist = DummyIPBasedDistributor() + self.sched = IntervalSchedule('hour', 1) + self.nBridgesPerRequest = 2 + self.bridgesResource = HTTPServer.WebResourceBridges( + self.dist, self.sched, N=2, + #useForwardedHeader=True, + includeFingerprints=True) + + self.root.putChild(self.pagename, self.bridgesResource) + + def parseBridgesFromHTMLPage(self, page): + """Utility to pull the bridge lines out of an HTML response page. + + :param str page: A rendered HTML page, as a string. + :raises: Any error which might occur. + :rtype: list + :returns: A list of the bridge lines contained on the **page**. + """ + # The bridge lines are contained in a <pre> tag: + soup = BeautifulSoup(page).find('pre') + soup = str(soup).replace('<pre>', '').strip() + soup = str(soup).replace('</pre>', '').strip() + bridges = [b.strip() for b in soup.splitlines()] + return bridges + + def test_render_GET_vanilla(self): + """Test rendering a request for normal, vanilla bridges.""" + request = DummyRequest([self.pagename]) + request.method = b'GET' + request.getClientIP = lambda: '1.1.1.1' + + page = self.bridgesResource.render(request) + + # The response should explain how to use the bridge lines: + self.assertSubstring("To use the above lines", page) + + for b in self.parseBridgesFromHTMLPage(page): + # Check that each bridge line had the expected number of fields: + fields = b.split(' ') + self.assertEqual(len(fields), 2) + + # Check that the IP and port seem okay: + ip, port = fields[0].rsplit(':') + self.assertIsInstance(ipaddr.IPv4Address(ip), ipaddr.IPv4Address) + self.assertIsInstance(int(port), int) + self.assertGreater(int(port), 0) + self.assertLessEqual(int(port), 65535) + + def test_render_GET_XForwardedFor(self): + """The client's IP address should be obtainable from the + 'X-Forwarded-For' header in the request. + """ + self.bridgesResource.useForwardedHeader = True + request = DummyRequest([self.pagename]) + request.method = b'GET' + # Since we do not set ``request.getClientIP`` here like we do in some + # of the other unittests, an exception would be raised here if + # ``getBridgesForRequest()`` is unable to get the IP address from this + # 'X-Forwarded-For' header (because ``ip`` would get set to ``None``). + request.headers.update({'x-forwarded-for': '2.2.2.2'}) + + page = self.bridgesResource.render(request) + self.bridgesResource.useForwardedHeader = False # Reset it + self.assertSubstring("To use the above lines", page) + + def test_render_GET_RTLlang(self): + """Test rendering a request for obfs3 bridges in Arabic.""" + request = DummyRequest(["bridges?transport=obfs3"]) + request.method = b'GET' + request.getClientIP = lambda: '3.3.3.3' + request.headers.update({'accept-language': 'ar'}) + # We actually have to set the request args manually when using a + # DummyRequest: + request.args.update({'transport': 'obfs3'}) + + page = self.bridgesResource.render(request) + self.assertSubstring("direction: rtl", page) + self.assertSubstring("لاستخدام الأسطر أعلاه", page) + + for bridgeLine in self.parseBridgesFromHTMLPage(page): + # Check that each bridge line had the expected number of fields: + bridgeLine = bridgeLine.split(' ') + self.assertEqual(len(bridgeLine), 3) + + print(""" + FIXME: The first field should be the transport method: + DummyBridge.getConfigLine() receives transport='o', not 'obfs3'. + What the hell? + """) + #self.assertEqual(bridgeLine[0], 'obfs3') + + # Check that the IP and port seem okay: + ip, port = bridgeLine[1].rsplit(':') + self.assertIsInstance(ipaddr.IPv4Address(ip), ipaddr.IPv4Address) + self.assertIsInstance(int(port), int) + self.assertGreater(int(port), 0) + self.assertLessEqual(int(port), 65535) + + def test_renderAnswer_textplain(self): + """If the request format specifies 'plain', we should return content + with mimetype 'text/plain'. + """ + request = DummyRequest([self.pagename]) + request.args.update({'format': 'plain'}) + request.getClientIP = lambda: '4.4.4.4' + request.method = b'GET' + + page = self.bridgesResource.render(request) + + print(""" + FIXME: The result page should have a mimetype of 'text/plain', and yet + it's still HTML. + """) + #self.assertNotSubstring("html", page) + + for bridgeLine in self.parseBridgesFromHTMLPage(page): + bridgeLine = bridgeLine.split(' ') + self.assertEqual(len(bridgeLine), 2) + + # Check that the IP and port seem okay: + ip, port = bridgeLine[0].rsplit(':') + self.assertIsInstance(ipaddr.IPv4Address(ip), ipaddr.IPv4Address) + self.assertIsInstance(int(port), int) + self.assertGreater(int(port), 0) + self.assertLessEqual(int(port), 65535)

1 0

[bridgedb/develop] Use the class wrapper DummyRequest in unittests in test_HTTPServer.py.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 3d6a4ca6f0aaba53785ab935ddc036549e925a7e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 17:58:48 2014 +0000 Use the class wrapper DummyRequest in unittests in test_HTTPServer.py. --- lib/bridgedb/test/test_HTTPServer.py | 36 +++++----------------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/lib/bridgedb/test/test_HTTPServer.py b/lib/bridgedb/test/test_HTTPServer.py index 73297de..cd55b46 100644 --- a/lib/bridgedb/test/test_HTTPServer.py +++ b/lib/bridgedb/test/test_HTTPServer.py @@ -65,7 +65,7 @@ class CaptchaProtectedResourceTests(unittest.TestCase): """render_GET() should return a page without a CAPTCHA, which has the image alt text. """ - request = requesthelper.DummyRequest([self.pagename]) + request = DummyRequest([self.pagename]) request.method = b'GET' page = self.captchaResource.render_GET(request) self.assertSubstring( @@ -78,7 +78,7 @@ class CaptchaProtectedResourceTests(unittest.TestCase): oldLookup = HTTPServer.lookup try: HTTPServer.lookup = None - request = requesthelper.DummyRequest([self.pagename]) + request = DummyRequest([self.pagename]) request.method = b'GET' page = self.captchaResource.render_GET(request) errorPage = HTTPServer.replaceErrorPage(Exception('kablam')) @@ -104,18 +104,8 @@ class CaptchaProtectedResourceTests(unittest.TestCase): """render_POST() with a wrong 'captcha_response_field' should return a redirect to the CaptchaProtectedResource page. """ - pagename = 'captcha.html' - self.root.putChild(pagename, self.captchaResource) - - def redirect(request): - newRequest = type(request) - newRequest.uri = pagename - return newRequest - - request = requesthelper.DummyRequest(['captcha.html']) + request = DummyRequest([self.pagename]) request.method = b'POST' - request.redirect = redirect(request) - page = self.captchaResource.render_POST(request) self.assertEqual(BeautifulSoup(page).find('meta')['http-equiv'], 'refresh') @@ -149,15 +139,7 @@ class GimpCaptchaProtectedResourceTests(unittest.TestCase): self.root.putChild(self.pagename, self.captchaResource) # Set up the basic parts of our faked request: - self.request = requesthelper.DummyRequest([self.pagename]) - self.request.URLPath = lambda: request.uri # Fake the URLPath too - self.request.redirect = self.doRedirect(self.request) - - def doRedirect(self, request): - """Stub method to add a redirect() to DummyResponse.""" - newRequest = type(request) - newRequest.uri = self.pagename - return newRequest + self.request = DummyRequest([self.pagename]) def tearDown(self): """Delete the cached CAPTCHA directory if it still exists.""" @@ -283,15 +265,7 @@ class ReCaptchaProtectedResourceTests(unittest.TestCase): self.root.putChild(self.pagename, self.captchaResource) # Set up the basic parts of our faked request: - self.request = requesthelper.DummyRequest([self.pagename]) - self.request.URLPath = lambda: request.uri # Fake the URLPath too - self.request.redirect = self.doRedirect(self.request) - - def doRedirect(self, request): - """Stub method to add a redirect() to DummyResponse.""" - newRequest = type(request) - newRequest.uri = self.pagename - return newRequest + self.request = DummyRequest([self.pagename]) def tearDown(self): """Cleanup method for removing timed out connections on the reactor.

1 0

[bridgedb/develop] Add a steaming pile of XXXs and FIXMEs to problems in WebResourceBridges.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 17f9650dfdcd0a0a00bd245295fa957efe3e7dfc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 18:27:01 2014 +0000 Add a steaming pile of XXXs and FIXMEs to problems in WebResourceBridges. --- lib/bridgedb/HTTPServer.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 27dd61e..0de984b 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -426,7 +426,6 @@ class ReCaptchaProtectedResource(CaptchaProtectedResource): logging.debug("Captcha from %r. Parameters: %r" % (Util.logSafely(clientIP), request.args)) - def checkResponse(solution, clientIP): if solution.is_valid: logging.info("Valid CAPTCHA solution from %r." @@ -564,10 +563,14 @@ class WebResourceBridges(twisted.web.resource.Resource): :rtype: str :returns: A plaintext or HTML response to serve. """ + # XXX why are we getting the interval if our distributor might be + # using bridgedb.Time.NoSchedule? interval = self.schedule.getInterval(time.time()) bridges = ( ) ip = None countryCode = None + + # XXX this code is duplicated in CaptchaProtectedResource if self.useForwardedHeader: h = request.getHeader("X-Forwarded-For") if h: @@ -578,6 +581,8 @@ class WebResourceBridges(twisted.web.resource.Resource): else: ip = request.getClientIP() + # XXX This can also be a separate function + # XXX if the ip is None, this throws an exception if geoip: countryCode = geoip.country_code_by_addr(ip) if countryCode: @@ -587,6 +592,7 @@ class WebResourceBridges(twisted.web.resource.Resource): if rtl: logging.debug("Rendering RTL response.") + # XXX separate function again format = request.args.get("format", None) if format and len(format): format = format[0] # choose the first arg @@ -596,6 +602,9 @@ class WebResourceBridges(twisted.web.resource.Resource): ipv6 = request.args.get("ipv6", False) if ipv6: ipv6 = True # if anything after ?ipv6= + # XXX oh dear hell. why not check for the '?transport=' arg before + # regex'ing? And why not compile the regex once, somewhere outside + # this function and class? try: # validate method name transport = re.match('[_a-zA-Z][_a-zA-Z0-9]*', @@ -673,6 +682,9 @@ class WebResourceBridges(twisted.web.resource.Resource): else: request.setHeader("Content-Type", "text/html; charset=utf-8") try: + # XXX FIXME the returned page from + # ``WebResourceBridgesTests.test_render_GET_RTLlang`` + # is in Arabic and has `<html lang="en">`! Doh. template = lookup.get_template('bridges.html') rendered = template.render(answer=bridgeLines, rtl=rtl) except Exception as err:

1 0

[bridgedb/develop] Fix txrecaptcha.submit() to always return Deferreds.
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit b4f88aded4fd6cc60be0129e1b6d0bd708d392c7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 19 18:30:12 2014 +0000 Fix txrecaptcha.submit() to always return Deferreds. All returned Deferreds callback with RecaptchaResponse objects. This way, we do not need additional code to check if the result was a Deferred (because, in that case, we would need to add a callback function to extract the RecaptchaResponse object from it and check it), or if it directly returned a RecaptchaResponse. This function now *always* returns Deferred. --- lib/bridgedb/txrecaptcha.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index e1e3234..2185112 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -213,12 +213,12 @@ def submit(recaptcha_challenge_field, recaptcha_response_field, :returns: A :api:`~twisted.internet.defer.Deferred` which will callback with a ``recaptcha.RecaptchaResponse`` for the request. """ - if not (recaptcha_response_field and - recaptcha_challenge_field and - len(recaptcha_response_field) and - len(recaptcha_challenge_field)): - return RecaptchaResponse(is_valid=False, - error_code='incorrect-captcha-sol') + if not (recaptcha_response_field and len(recaptcha_response_field) and + recaptcha_challenge_field and len(recaptcha_challenge_field)): + d = defer.Deferred() + d.addBoth(_ebRequest) # We want `is_valid=False` + d.errback(failure.Failure(ValueError('incorrect-captcha-sol'))) + return d params = urllib.urlencode({ 'privatekey': _encodeIfNecessary(private_key),

1 0

[bridgedb/develop] Merge branch 'fix/11231-additional-bug-fixes' into develop
by isis＠torproject.org 26 Mar '14

26 Mar '14

commit 00eaf9160f65c16c725ed7f05ac0583b9da63dc0 Merge: 7fdde31 b4f88ad Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 21 22:30:10 2014 +0000 Merge branch 'fix/11231-additional-bug-fixes' into develop lib/bridgedb/HTTPServer.py | 14 +++++++++++++- lib/bridgedb/txrecaptcha.py | 12 ++++++------ 2 files changed, 19 insertions(+), 7 deletions(-)

1 0