mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-14 15:53:28 +01:00
* misc fixes (rc 5): - banner: only auto init banner if not in top-frame (check for no-frame mode and replay url is set) - index: 'cdx+' fix for use as internal index: if cdx has a warc filename and offset, don't attempt default live web load - improved self-redirect: avoid www2 -> www redirect altogether, not just for second redirect - tests: update tests for improved self-redirect checking - bump version to pywb-2.4.0-rc5
166 lines
7.2 KiB
Python
166 lines
7.2 KiB
Python
from .base_config_test import BaseConfigTest, CollsDirMixin, fmod
|
|
|
|
from warcio.timeutils import timestamp_to_iso_date
|
|
from warcio.warcwriter import WARCWriter
|
|
from warcio.statusandheaders import StatusAndHeaders
|
|
from io import BytesIO
|
|
import os
|
|
|
|
from pywb.manager.manager import main as wb_manager
|
|
|
|
|
|
# ============================================================================
|
|
class TestRedirects(CollsDirMixin, BaseConfigTest):
|
|
@classmethod
|
|
def setup_class(cls):
|
|
super(TestRedirects, cls).setup_class('config_test.yaml')
|
|
|
|
def create_redirect_record(self, url, redirect_url, timestamp, status='301'):
|
|
warc_headers = {}
|
|
warc_headers['WARC-Date'] = timestamp_to_iso_date(timestamp)
|
|
|
|
#content = 'Redirect to ' + redirect_url
|
|
content = ''
|
|
payload = content.encode('utf-8')
|
|
headers_list = [('Content-Length', str(len(payload))),
|
|
('Location', redirect_url)
|
|
]
|
|
|
|
http_headers = StatusAndHeaders(status + ' Redirect', headers_list, protocol='HTTP/1.0')
|
|
|
|
rec = self.writer.create_warc_record(url, 'response',
|
|
payload=BytesIO(payload),
|
|
length=len(payload),
|
|
http_headers=http_headers,
|
|
warc_headers_dict=warc_headers)
|
|
|
|
self.writer.write_record(rec)
|
|
|
|
return rec
|
|
|
|
def create_response_record(self, url, timestamp, text):
|
|
payload = text.encode('utf-8')
|
|
|
|
warc_headers = {}
|
|
warc_headers['WARC-Date'] = timestamp_to_iso_date(timestamp)
|
|
|
|
headers_list = [('Content-Length', str(len(payload)))]
|
|
|
|
http_headers = StatusAndHeaders('200 OK', headers_list, protocol='HTTP/1.0')
|
|
|
|
rec = self.writer.create_warc_record(url, 'response',
|
|
payload=BytesIO(payload),
|
|
length=len(payload),
|
|
http_headers=http_headers,
|
|
warc_headers_dict=warc_headers)
|
|
|
|
self.writer.write_record(rec)
|
|
return rec
|
|
|
|
def create_revisit_record(self, url, timestamp, redirect_url, original_dt):
|
|
warc_headers = {}
|
|
warc_headers['WARC-Date'] = timestamp_to_iso_date(timestamp)
|
|
|
|
headers_list = [('Content-Length', '0'),
|
|
('Location', redirect_url)]
|
|
|
|
http_headers = StatusAndHeaders('302 Temp Redirect', headers_list, protocol='HTTP/1.0')
|
|
|
|
rec = self.writer.create_revisit_record(url,
|
|
digest='3I42H3S6NNFQ2MSVX7XZKYAYSCX5QBYJ',
|
|
refers_to_uri=url,
|
|
refers_to_date=original_dt,
|
|
warc_headers_dict=warc_headers,
|
|
http_headers=http_headers)
|
|
|
|
self.writer.write_record(rec)
|
|
|
|
def test_init_1(self):
|
|
filename = os.path.join(self.root_dir, 'redir.warc.gz')
|
|
with open(filename, 'wb') as fh:
|
|
self.writer = WARCWriter(fh, gzip=True)
|
|
|
|
redirect = self.create_redirect_record('http://example.com/', 'https://example.com/', '20180626101112')
|
|
redirect = self.create_redirect_record('https://example.com/', 'https://www.example.com/', '20180626101112')
|
|
response = self.create_response_record('https://www.example.com/', '20180626101112', 'Some Text')
|
|
|
|
revisit = self.create_revisit_record('https://example.com/path', '20190626101112', 'https://example.com/abc', response.rec_headers['WARC-Date'])
|
|
revisit = self.create_revisit_record('https://www.example.com/', '20190626101112', 'https://www.example.com/', response.rec_headers['WARC-Date'])
|
|
|
|
wb_manager(['init', 'redir'])
|
|
|
|
wb_manager(['add', 'redir', filename])
|
|
|
|
assert os.path.isfile(os.path.join(self.root_dir, self.COLLS_DIR, 'redir', 'indexes', 'index.cdxj'))
|
|
|
|
def test_self_redir_1(self, fmod):
|
|
res = self.get('/redir/20180626101112{0}/https://example.com/', fmod, status=200)
|
|
|
|
assert res.status_code == 200
|
|
|
|
assert res.text == 'Some Text'
|
|
|
|
def test_redir_init_slash(self):
|
|
filename = os.path.join(self.root_dir, 'redir-slash.warc.gz')
|
|
with open(filename, 'wb') as fh:
|
|
self.writer = WARCWriter(fh, gzip=True)
|
|
|
|
response = self.create_response_record('https://www.example.com/sub/path/', '20180626101112', 'Sub Path Data')
|
|
|
|
response = self.create_response_record('https://www.example.com/sub/path/?foo=bar', '20180626101112', 'Sub Path Data Q')
|
|
|
|
wb_manager(['add', 'redir', filename])
|
|
|
|
def test_redir_slash(self, fmod):
|
|
res = self.get('/redir/20180626101112{0}/https://example.com/sub/path', fmod, status=307)
|
|
|
|
assert res.headers['Location'].endswith('/redir/20180626101112{0}/https://example.com/sub/path/'.format(fmod))
|
|
res = res.follow()
|
|
|
|
assert res.status_code == 200
|
|
|
|
assert res.text == 'Sub Path Data'
|
|
|
|
def test_redir_slash_with_query(self, fmod):
|
|
res = self.get('/redir/20180626101112{0}/https://example.com/sub/path?foo=bar', fmod, status=307)
|
|
|
|
assert res.headers['Location'].endswith('/redir/20180626101112{0}/https://example.com/sub/path/?foo=bar'.format(fmod))
|
|
res = res.follow()
|
|
|
|
assert res.status_code == 200
|
|
|
|
assert res.text == 'Sub Path Data Q'
|
|
|
|
def test_revisit_redirect_302(self, fmod):
|
|
res = self.get('/redir/20170626101112{0}/https://example.com/path', fmod, status=302)
|
|
assert res.headers['Location'].endswith('/redir/20170626101112{0}/https://example.com/abc'.format(fmod))
|
|
assert res.text == ''
|
|
|
|
def test_revisit_redirect_skip_self_redir(self, fmod):
|
|
res = self.get('/redir/20190626101112{0}/http://www.example.com/', fmod, status=200)
|
|
assert res.text == 'Some Text'
|
|
|
|
def test_init_2(self):
|
|
filename = os.path.join(self.root_dir, 'redir2.warc.gz')
|
|
with open(filename, 'wb') as fh:
|
|
self.writer = WARCWriter(fh, gzip=True)
|
|
|
|
redirect = self.create_redirect_record('http://www.example.com/path', 'https://www.example.com/path/', '20191003115920')
|
|
redirect = self.create_redirect_record('https://www.example.com/path/', 'https://www2.example.com/path', '20191003115927', status='302')
|
|
response = self.create_response_record('https://www2.example.com/path', '20191024125646', 'Some Text')
|
|
revisit = self.create_revisit_record('https://www2.example.com/path', '20191024125648', 'https://www2.example.com/path', response.rec_headers['WARC-Date'])
|
|
|
|
wb_manager(['init', 'redir2'])
|
|
|
|
wb_manager(['add', 'redir2', filename])
|
|
|
|
assert os.path.isfile(os.path.join(self.root_dir, self.COLLS_DIR, 'redir2', 'indexes', 'index.cdxj'))
|
|
|
|
def test_revisit_redirect_skip_self_redir_2(self, fmod):
|
|
res = self.get('/redir2/20191024125648{0}/http://www2.example.com/path', fmod, status=200)
|
|
assert res.text == 'Some Text'
|
|
|
|
res = self.get('/redir2/20191024125648{0}/https://www.example.com/path', fmod, status=200)
|
|
assert res.text == 'Some Text'
|
|
|