backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

live proxy: enable ssl validation for live proxy, was initially disabled for testing, should be on by default!

Browse Source
This commit is contained in:
Ilya Kreymer 2015-02-20 13:22:21 -08:00
parent 1646c90cd0
commit 8d52be4c44
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pywb/rewrite/rewrite_live.py
View File

@ -15,8 +15,6 @@ from pywb.utils.timeutils import timestamp_now
from pywb.utils.statusandheaders import StatusAndHeaders from pywb.utils.statusandheaders import StatusAndHeaders
from pywb.utils.canonicalize import canonicalize from pywb.utils.canonicalize import canonicalize
from url_rewriter import UrlRewriter
from wburl import WbUrl
from rewrite_content import RewriteContent from rewrite_content import RewriteContent
@ -122,7 +120,8 @@ class LiveRewriter(object):
env=None, env=None,
req_headers=None, req_headers=None,
follow_redirects=False, follow_redirects=False,
ignore_proxies=False): ignore_proxies=False,
verify=True):
method = 'GET' method = 'GET'
data = None data = None
@ -154,7 +153,7 @@ class LiveRewriter(object):
allow_redirects=follow_redirects, allow_redirects=follow_redirects,
proxies=proxies, proxies=proxies,
stream=True, stream=True,
verify=False) verify=verify)
statusline = str(response.status_code) + ' ' + response.reason statusline = str(response.status_code) + ' ' + response.reason
@ -172,7 +171,8 @@ class LiveRewriter(object):
req_headers={}, req_headers={},
timestamp=None, timestamp=None,
follow_redirects=False, follow_redirects=False,
ignore_proxies=False): ignore_proxies=False,
verify=True):
ts_err = url.split('///') ts_err = url.split('///')
@ -199,7 +199,8 @@ class LiveRewriter(object):
(status_headers, stream) = self.fetch_http(url, urlkey, env, (status_headers, stream) = self.fetch_http(url, urlkey, env,
req_headers, req_headers,
follow_redirects, follow_redirects,
ignore_proxies) ignore_proxies,
verify)
else: else:
(status_headers, stream) = self.fetch_local_file(url) (status_headers, stream) = self.fetch_local_file(url)

5
pywb/webapp/live_rewrite_handler.py
View File

@ -45,6 +45,8 @@ class RewriteHandler(SearchPageWbUrlHandler):
self.live_cookie = config.get('live-cookie', self.LIVE_COOKIE) self.live_cookie = config.get('live-cookie', self.LIVE_COOKIE)
self.verify = config.get('verify_ssl', True)
self.ydl = None self.ydl = None
self._cache = None self._cache = None
@ -108,7 +110,8 @@ class RewriteHandler(SearchPageWbUrlHandler):
head_insert_func=head_insert_func, head_insert_func=head_insert_func,
req_headers=req_headers, req_headers=req_headers,
env=wbrequest.env, env=wbrequest.env,
ignore_proxies=ignore_proxies) ignore_proxies=ignore_proxies,
verify=self.verify)
wbresponse = self._make_response(wbrequest, *result) wbresponse = self._make_response(wbrequest, *result)