diff --git a/pywb/rewrite/rewrite_live.py b/pywb/rewrite/rewrite_live.py index 653e74ac..473aee89 100644 --- a/pywb/rewrite/rewrite_live.py +++ b/pywb/rewrite/rewrite_live.py @@ -15,8 +15,6 @@ from pywb.utils.timeutils import timestamp_now from pywb.utils.statusandheaders import StatusAndHeaders from pywb.utils.canonicalize import canonicalize -from url_rewriter import UrlRewriter -from wburl import WbUrl from rewrite_content import RewriteContent @@ -122,7 +120,8 @@ class LiveRewriter(object): env=None, req_headers=None, follow_redirects=False, - ignore_proxies=False): + ignore_proxies=False, + verify=True): method = 'GET' data = None @@ -154,7 +153,7 @@ class LiveRewriter(object): allow_redirects=follow_redirects, proxies=proxies, stream=True, - verify=False) + verify=verify) statusline = str(response.status_code) + ' ' + response.reason @@ -172,7 +171,8 @@ class LiveRewriter(object): req_headers={}, timestamp=None, follow_redirects=False, - ignore_proxies=False): + ignore_proxies=False, + verify=True): ts_err = url.split('///') @@ -199,7 +199,8 @@ class LiveRewriter(object): (status_headers, stream) = self.fetch_http(url, urlkey, env, req_headers, follow_redirects, - ignore_proxies) + ignore_proxies, + verify) else: (status_headers, stream) = self.fetch_local_file(url) diff --git a/pywb/webapp/live_rewrite_handler.py b/pywb/webapp/live_rewrite_handler.py index 928637f6..f5e6f30e 100644 --- a/pywb/webapp/live_rewrite_handler.py +++ b/pywb/webapp/live_rewrite_handler.py @@ -45,6 +45,8 @@ class RewriteHandler(SearchPageWbUrlHandler): self.live_cookie = config.get('live-cookie', self.LIVE_COOKIE) + self.verify = config.get('verify_ssl', True) + self.ydl = None self._cache = None @@ -108,7 +110,8 @@ class RewriteHandler(SearchPageWbUrlHandler): head_insert_func=head_insert_func, req_headers=req_headers, env=wbrequest.env, - ignore_proxies=ignore_proxies) + ignore_proxies=ignore_proxies, + verify=self.verify) wbresponse = self._make_response(wbrequest, *result)