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

ensure that the timemap path information is not in wb_url_str when serving a timemap (#423)

Browse Source 
updated memento tests to ensure the timemap tests include REQUEST_URI
This commit is contained in:
John Berlin 2018-12-05 18:06:40 -05:00 committed by Ilya Kreymer
parent f78bac9474
commit 2b8bf76c9a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pywb/apps/frontendapp.py
View File

@ -370,7 +370,8 @@ class FrontEndApp(object):
if timemap_output: if timemap_output:
metadata['output'] = timemap_output metadata['output'] = timemap_output
# ensure that the timemap path information is not included
wb_url_str = wb_url_str.replace('timemap/{0}/'.format(timemap_output), '')
try: try:
response = self.rewriterapp.render_content(wb_url_str, metadata, environ) response = self.rewriterapp.render_content(wb_url_str, metadata, environ)
except UpstreamException as ue: except UpstreamException as ue:

13
tests/test_memento.py
View File

@ -11,6 +11,9 @@ class TestMemento(MementoMixin, BaseConfigTest):
def setup_class(cls): def setup_class(cls):
super(TestMemento, cls).setup_class('config_test.yaml') super(TestMemento, cls).setup_class('config_test.yaml')
def _timemap_get(self, url, **kwargs):
return self.testapp.get(url, extra_environ={'REQUEST_URI': url}, **kwargs)
def _assert_memento(self, resp, url, ts, fmod, dt=''): def _assert_memento(self, resp, url, ts, fmod, dt=''):
dt = dt or timestamp_to_http_date(ts) dt = dt or timestamp_to_http_date(ts)
@ -121,7 +124,7 @@ class TestMemento(MementoMixin, BaseConfigTest):
Test application/link-format timemap Test application/link-format timemap
""" """
resp = self.testapp.get('/pywb/timemap/link/http://example.com?example=1') resp = self._timemap_get('/pywb/timemap/link/http://example.com?example=1')
assert resp.status_int == 200 assert resp.status_int == 200
assert resp.content_type == LINK_FORMAT assert resp.content_type == LINK_FORMAT
@ -141,7 +144,7 @@ class TestMemento(MementoMixin, BaseConfigTest):
Test test/x-cdxj timemap Test test/x-cdxj timemap
""" """
resp = self.testapp.get('/pywb/timemap/cdxj/http://example.com?example=1') resp = self._timemap_get('/pywb/timemap/cdxj/http://example.com?example=1')
assert resp.status_int == 200 assert resp.status_int == 200
assert resp.content_type == 'text/x-cdxj' assert resp.content_type == 'text/x-cdxj'
@ -158,7 +161,7 @@ com,example)/?example=1 20140103030341 {"url": "http://example.com?example=1", "
Test application/link-format timemap total count Test application/link-format timemap total count
""" """
resp = self.testapp.get('/pywb/timemap/link/http://example.com') resp = self._timemap_get('/pywb/timemap/link/http://example.com')
assert resp.status_int == 200 assert resp.status_int == 200
assert resp.content_type == LINK_FORMAT assert resp.content_type == LINK_FORMAT
@ -167,11 +170,11 @@ com,example)/?example=1 20140103030341 {"url": "http://example.com?example=1", "
assert len(lines) == 7 assert len(lines) == 7
def test_timemap_error_not_found(self): def test_timemap_error_not_found(self):
resp = self.testapp.get('/pywb/timemap/link/http://example.com/x-not-found', status=404) resp = self._timemap_get('/pywb/timemap/link/http://example.com/x-not-found', status=404)
assert resp.body == b'' assert resp.body == b''
def test_timemap_error_invalid_format(self): def test_timemap_error_invalid_format(self):
resp = self.testapp.get('/pywb/timemap/foo/http://example.com', status=400) resp = self._timemap_get('/pywb/timemap/foo/http://example.com', status=400)
assert resp.json == {'message': 'output=foo not supported'} assert resp.json == {'message': 'output=foo not supported'}
def test_error_bad_accept_datetime(self): def test_error_bad_accept_datetime(self):