diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-13 10:21:32 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-04-13 10:21:32 +0200 |
| commit | eca20b701c411046e7ededb0462b310124ce3c18 (patch) | |
| tree | c5eb36261cfc935f001b816f28f15d1f5afbf7e0 /pyload/plugin/captcha/ReCaptcha.py | |
| parent | Merge branch 'stable' into 0.4.10 (diff) | |
| download | pyload-eca20b701c411046e7ededb0462b310124ce3c18.tar.xz | |
Cleanup + fixup + new lib
Diffstat (limited to 'pyload/plugin/captcha/ReCaptcha.py')
| -rw-r--r-- | pyload/plugin/captcha/ReCaptcha.py | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/pyload/plugin/captcha/ReCaptcha.py b/pyload/plugin/captcha/ReCaptcha.py index 6dcb09f55..4920262b2 100644 --- a/pyload/plugin/captcha/ReCaptcha.py +++ b/pyload/plugin/captcha/ReCaptcha.py @@ -13,7 +13,7 @@ from pyload.plugin.Captcha import Captcha class ReCaptcha(Captcha): __name__ = "ReCaptcha" __type__ = "captcha" - __version__ = "0.14" + __version__ = "0.15" __description__ = """ReCaptcha captcha service plugin""" __license__ = "GPLv3" @@ -161,21 +161,12 @@ class ReCaptcha(Captcha): token2 = re.search(r'"finput","(.*?)",', html) self.logDebug("Token #2: %s" % token2.group(1)) - token3 = re.search(r'."asconf".\s,".*?".\s,"(.*?)".', html) + token3 = re.search(r'"rresp","(.*?)",', html) self.logDebug("Token #3: %s" % token3.group(1)) - html = self.plugin.req.load("https://www.google.com/recaptcha/api2/reload", - post={'k' : key, - 'c' : token2.group(1), - 'reason': "fi", - 'fbg' : token3.group(1)}) - - token4 = re.search(r'"rresp","(.*?)",', html) - self.logDebug("Token #4: %s" % token4.group(1)) - millis_captcha_loading = int(round(time.time() * 1000)) captcha_response = self.plugin.decryptCaptcha("https://www.google.com/recaptcha/api2/payload", - get={'c': token4.group(1), 'k': key}, + get={'c':token3.group(1), 'k':key}, cookies=True, forceUser=True) response = b64encode('{"response":"%s"}' % captcha_response) @@ -187,15 +178,15 @@ class ReCaptcha(Captcha): html = self.plugin.req.load("https://www.google.com/recaptcha/api2/userverify", post={'k' : key, - 'c' : token4.group(1), + 'c' : token3.group(1), 'response': response, 't' : timeToSolve, 'ct' : timeToSolveMore, 'bg' : botguardstring}) - token5 = re.search(r'"uvresp","(.*?)",', html) - self.logDebug("Token #5: %s" % token5.group(1)) + token4 = re.search(r'"uvresp","(.*?)",', html) + self.logDebug("Token #4: %s" % token4.group(1)) - result = token5.group(1) + result = token4.group(1) return result, None |