From 1c86a781e306904d760c919767fae3983d7e6fb5 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 17 Dec 2019 11:03:43 -0500 Subject: [PATCH] Add logging --- setup.py | 2 +- vanwanet_scrape/scraper.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index a32ca50..f40109f 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name="vanwanet_scrape", - version="1.0", + version="1.1", description="VanwaTech DDoS protection bypass", author="simon987", author_email="me@simon987.net", diff --git a/vanwanet_scrape/scraper.py b/vanwanet_scrape/scraper.py index 6c506ff..267f01a 100644 --- a/vanwanet_scrape/scraper.py +++ b/vanwanet_scrape/scraper.py @@ -15,10 +15,11 @@ SUB_PATTRN = re.compile(r'document\.cookie="(.+)";location.+$') class Scraper: - def __init__(self, domains: list, headers=None, proxies=None): + def __init__(self, domains: list, headers=None, proxies=None, logger=None): self._session = requests.session() self._domains = domains self._session.cookies = CookieJar() + self.logger = logger if headers: self._session.headers = headers @@ -32,10 +33,13 @@ class Scraper: r = self._get(url, **kwargs) if Scraper._is_challenge_page(r): - cookie = Scraper._execute_challenge(Scraper._transform_js(Scraper._get_js(r))) + cookie_str = Scraper._execute_challenge(Scraper._transform_js(Scraper._get_js(r))) + + if self.logger: + self.logger.debug("Executed challenge, got %s" % (cookie_from_string(cookie_str, ""),)) for domain in self._domains: - self._session.cookies.set_cookie(cookie_from_string(cookie, domain)) + self._session.cookies.set_cookie(cookie_from_string(cookie_str, domain)) return self.get(url, **kwargs) return r