Browse Source

[mod] stackoverflow & yandex: detect CAPTCHA response

Alexandre Flament 4 years ago
parent
commit
fa909c7c02
2 changed files with 12 additions and 2 deletions
  1. 6 1
      searx/engines/stackoverflow.py
  2. 6 1
      searx/engines/yandex.py

+ 6 - 1
searx/engines/stackoverflow.py

@@ -10,9 +10,10 @@
  @parse       url, title, content
  @parse       url, title, content
 """
 """
 
 
-from urllib.parse import urlencode, urljoin
+from urllib.parse import urlencode, urljoin, urlparse
 from lxml import html
 from lxml import html
 from searx.utils import extract_text
 from searx.utils import extract_text
+from searx.exceptions import SearxEngineCaptchaException
 
 
 # engine dependent config
 # engine dependent config
 categories = ['it']
 categories = ['it']
@@ -37,6 +38,10 @@ def request(query, params):
 
 
 # get response from search-request
 # get response from search-request
 def response(resp):
 def response(resp):
+    resp_url = urlparse(resp.url)
+    if resp_url.path.startswith('/nocaptcha'):
+        raise SearxEngineCaptchaException()
+
     results = []
     results = []
 
 
     dom = html.fromstring(resp.text)
     dom = html.fromstring(resp.text)

+ 6 - 1
searx/engines/yandex.py

@@ -9,9 +9,10 @@
  @parse       url, title, content
  @parse       url, title, content
 """
 """
 
 
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urlparse
 from lxml import html
 from lxml import html
 from searx import logger
 from searx import logger
+from searx.exceptions import SearxEngineCaptchaException
 
 
 logger = logger.getChild('yandex engine')
 logger = logger.getChild('yandex engine')
 
 
@@ -47,6 +48,10 @@ def request(query, params):
 
 
 # get response from search-request
 # get response from search-request
 def response(resp):
 def response(resp):
+    resp_url = urlparse(resp.url)
+    if resp_url.path.startswith('/showcaptcha'):
+        raise SearxEngineCaptchaException()
+
     dom = html.fromstring(resp.text)
     dom = html.fromstring(resp.text)
     results = []
     results = []