summaryrefslogtreecommitdiffstats
path: root/module/plugins
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-22 14:31:45 +0200
committerGravatar Walter Purcaro <vuolter@gmail.com> 2014-10-22 14:31:45 +0200
commitfe5c86946dfc2c539b4e2a59128275c1fe506493 (patch)
tree6e7aa8ef07686527c25ea55488d7100fcf7ec43f /module/plugins
parent[FilerNet] Revert last revert XD (diff)
downloadpyload-fe5c86946dfc2c539b4e2a59128275c1fe506493.tar.xz
[CaptchaService] Fix KEY_PATTERN
Diffstat (limited to 'module/plugins')
-rw-r--r--module/plugins/internal/CaptchaService.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/module/plugins/internal/CaptchaService.py b/module/plugins/internal/CaptchaService.py
index 203dda82e..28374899d 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.12"
+ __version__ = "0.13"
__description__ = """Base captcha service plugin"""
__license__ = "GPLv3"
@@ -52,14 +52,14 @@ class CaptchaService:
class ReCaptcha(CaptchaService):
__name__ = "ReCaptcha"
- __version__ = "0.05"
+ __version__ = "0.06"
__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_PATTERN = r'recaptcha/api/challenge\?k=(?P<KEY>[\w-]+)'
KEY_AJAX_PATTERN = r'Recaptcha\.create\s*\(\s*["\'](?P<KEY>[\w-]+)'
@@ -113,15 +113,15 @@ class ReCaptcha(CaptchaService):
class AdsCaptcha(CaptchaService):
__name__ = "AdsCaptcha"
- __version__ = "0.03"
+ __version__ = "0.04"
__description__ = """AdsCaptcha captcha service plugin"""
__license__ = "GPLv3"
__authors__ = [("pyLoad Team", "admin@pyload.org")]
- ID_PATTERN = r'http://api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)'
- KEY_PATTERN = r'http://api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=(?P<KEY>[\w-]+)'
+ ID_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*CaptchaId=(?P<ID>\d+)'
+ KEY_PATTERN = r'api\.adscaptcha\.com/Get\.aspx\?[^"\']*PublicKey=(?P<KEY>[\w-]+)'
def detect_key(self, html=None):
@@ -175,14 +175,14 @@ class AdsCaptcha(CaptchaService):
class SolveMedia(CaptchaService):
__name__ = "SolveMedia"
- __version__ = "0.04"
+ __version__ = "0.05"
__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'api\.solvemedia\.com/papi/challenge\.(no)?script\?k=(?P<KEY>.+?)["\']'
def challenge(self, key=None):