summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-11 22:59:24 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-11 22:59:24 +0200
commit0adc51cf4c58aa3e0f1073c28b9a8781a298fe89 (patch)
treec649435baa6fb6f481417ad37eabda9fd27b74bf /module
parent[accounts] Code cosmetics (diff)
downloadpyload-0adc51cf4c58aa3e0f1073c28b9a8781a298fe89.tar.xz
[CaptchaService] Fix KEY pattern
Diffstat (limited to 'module')
-rw-r--r--module/plugins/internal/CaptchaService.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index db4ed41a4..b2b549617 100644
--- a/module/plugins/internal/CaptchaService.py
+++ b/module/plugins/internal/CaptchaService.py
@@ -7,7 +7,7 @@ from random import random
class CaptchaService:
__name__ = "CaptchaService"
- __version__ = "0.10"
+ __version__ = "0.11"
__description__ = """Base captcha service plugin"""
__license__ = "GPLv3"
@@ -52,15 +52,15 @@ class CaptchaService:
class ReCaptcha(CaptchaService):
__name__ = "ReCaptcha"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """ReCaptcha captcha service plugin"""
__license__ = "GPLv3"
__authors__ = [("pyLoad Team", "admin@pyload.org")]
- KEY_PATTERN = r'https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P<KEY>\w+)'
- KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\'](?P<KEY>\w+)'
+ KEY_PATTERN = r'https?://(?:www\.)?google\.com/recaptcha/api/challenge\?k=(?P<KEY>[\w-]+)'
+ KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\'](?P<KEY>[\w-]+)'
def detect_key(self, html=None):
@@ -175,14 +175,14 @@ class AdsCaptcha(CaptchaService):
class SolveMedia(CaptchaService):
__name__ = "SolveMedia"
- __version__ = "0.02"
+ __version__ = "0.03"
__description__ = """SolveMedia captcha service plugin"""
__license__ = "GPLv3"
__authors__ = [("pyLoad Team", "admin@pyload.org")]
- KEY_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)"'
+ KEY_PATTERN = r'http://api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)["\']'
def challenge(self, key=None):