Merge pull request #419 from matrix-org/markjh/reuse_captcha_client

Reuse the captcha client rather than creating a new one for each request
This commit is contained in:
Mark Haines 2015-12-03 17:00:59 +00:00
commit b29d2fd7f8

View File

@ -42,6 +42,7 @@ class RegistrationHandler(BaseHandler):
self.distributor = hs.get_distributor() self.distributor = hs.get_distributor()
self.distributor.declare("registered_user") self.distributor.declare("registered_user")
self.captch_client = CaptchaServerHttpClient(hs)
@defer.inlineCallbacks @defer.inlineCallbacks
def check_username(self, localpart): def check_username(self, localpart):
@ -306,10 +307,7 @@ class RegistrationHandler(BaseHandler):
""" """
Used only by c/s api v1 Used only by c/s api v1
""" """
# TODO: get this from the homeserver rather than creating a new one for data = yield self.captcha_client.post_urlencoded_get_raw(
# each request
client = CaptchaServerHttpClient(self.hs)
data = yield client.post_urlencoded_get_raw(
"http://www.google.com:80/recaptcha/api/verify", "http://www.google.com:80/recaptcha/api/verify",
args={ args={
'privatekey': private_key, 'privatekey': private_key,