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

scheme: add support for X-Forwarded-Proto header to specify the scheme to better address #314, #374 (#395)

Browse Source
This commit is contained in:
Ilya Kreymer 2018-10-23 09:13:23 -07:00 committed by GitHub
parent b39274cf12
commit 08b0ac87f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pywb/apps/rewriterapp.py
View File

@ -103,6 +103,7 @@ class RewriterApp(object):
else: else:
self.csp_header = None self.csp_header = None
# deprecated: Use X-Forwarded-Proto header instead!
self.force_scheme = config.get('force_scheme') self.force_scheme = config.get('force_scheme')
def add_csp_header(self, wb_url, status_headers): def add_csp_header(self, wb_url, status_headers):
@ -223,8 +224,10 @@ class RewriterApp(object):
wb_url = wb_url.replace('#', '%23') wb_url = wb_url.replace('#', '%23')
wb_url = WbUrl(wb_url) wb_url = WbUrl(wb_url)
if self.force_scheme: proto = environ.get('HTTP_X_FORWARDED_PROTO', self.force_scheme)
environ['wsgi.url_scheme'] = self.force_scheme
if proto:
environ['wsgi.url_scheme'] = proto
is_timegate = self._check_accept_dt(wb_url, environ) is_timegate = self._check_accept_dt(wb_url, environ)

29
tests/test_force_https.py
View File

@ -5,8 +5,21 @@ from .base_config_test import BaseConfigTest, fmod
class TestForceHttps(BaseConfigTest): class TestForceHttps(BaseConfigTest):
@classmethod @classmethod
def setup_class(cls): def setup_class(cls):
super(TestForceHttps, cls).setup_class('config_test.yaml', super(TestForceHttps, cls).setup_class('config_test.yaml')
custom_config={'force_scheme': 'https'})
def test_force_https_replay_1(self, fmod):
resp = self.get('/pywb/20140128051539{0}/http://example.com/', fmod,
headers={'X-Forwarded-Proto': 'https'})
assert '"https://localhost:80/pywb/20140128051539{0}/http://www.iana.org/domains/example"'.format(fmod) in resp.text, resp.text
# ============================================================================
class TestForceHttpsConfig(BaseConfigTest):
@classmethod
def setup_class(cls):
super(TestForceHttpsConfig, cls).setup_class('config_test.yaml',
custom_config={'force_scheme': 'https'})
def test_force_https_replay_1(self, fmod): def test_force_https_replay_1(self, fmod):
resp = self.get('/pywb/20140128051539{0}/http://example.com/', fmod) resp = self.get('/pywb/20140128051539{0}/http://example.com/', fmod)
@ -18,11 +31,11 @@ class TestForceHttps(BaseConfigTest):
class TestForceHttpsRedirect(BaseConfigTest): class TestForceHttpsRedirect(BaseConfigTest):
@classmethod @classmethod
def setup_class(cls): def setup_class(cls):
super(TestForceHttpsRedirect, cls).setup_class('config_test_redirect_classic.yaml', super(TestForceHttpsRedirect, cls).setup_class('config_test_redirect_classic.yaml')
custom_config={'force_scheme': 'https'})
def test_force_https_redirect_replay_1(self, fmod): def test_force_https_redirect_replay_1(self, fmod):
resp = self.get('/pywb/20140128051539{0}/http://example.com/', fmod) resp = self.get('/pywb/20140128051539{0}/http://example.com/', fmod,
headers={'X-Forwarded-Proto': 'https'})
assert resp.headers['Location'] == 'https://localhost:80/pywb/20140127171251{0}/http://example.com'.format(fmod) assert resp.headers['Location'] == 'https://localhost:80/pywb/20140127171251{0}/http://example.com'.format(fmod)
resp = resp.follow() resp = resp.follow()
@ -37,11 +50,11 @@ class TestForceHttpsRedirect(BaseConfigTest):
class TestForceHttpsRoot(BaseConfigTest): class TestForceHttpsRoot(BaseConfigTest):
@classmethod @classmethod
def setup_class(cls): def setup_class(cls):
super(TestForceHttpsRoot, cls).setup_class('config_test_root_coll.yaml', super(TestForceHttpsRoot, cls).setup_class('config_test_root_coll.yaml')
custom_config={'force_scheme': 'https'})
def test_force_https_root_replay_1(self, fmod): def test_force_https_root_replay_1(self, fmod):
resp = self.get('/20140128051539{0}/http://www.iana.org/domains/example', fmod) resp = self.get('/20140128051539{0}/http://www.iana.org/domains/example', fmod,
headers={'X-Forwarded-Proto': 'https'})
assert resp.headers['Location'] == 'https://localhost:80/20140128051539{0}/https://www.iana.org/domains/reserved'.format(fmod) assert resp.headers['Location'] == 'https://localhost:80/20140128051539{0}/https://www.iana.org/domains/reserved'.format(fmod)