Merge pull request #432 from singingwolfboy/fix-x-forwarded-host-test

Fix X-Forwarded-Host test
maxcountryman · May 30, 2019 · b07c159 · b07c159
2 parents d22f80d + 93e3c1a
commit b07c159
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 flask>=0.12.3
-werkzeug>=0.14.0
+werkzeug<0.15.0; python_version < '3.4'
+werkzeug>=0.15.0; python_version >= '3.4'
diff --git a/test_login.py b/test_login.py
@@ -13,6 +13,10 @@
 
 
 from werkzeug import __version__ as werkzeug_version
+try:
+    from werkzeug.middleware.proxy_fix import ProxyFix
+except ImportError:
+    from werkzeug.contrib.fixers import ProxyFix
 from flask import (
     Flask,
     Blueprint,
@@ -1682,9 +1686,12 @@ def login():
             self.assertEqual(result.location,
                              'http://good.com/login?next=%2Fsecret')
 
+    @unittest.skipIf(Version(werkzeug_version) < Version('0.15', partial=True),
+                     "ProxyFix moved to werkzeug.middleware.proxy_fix in 0.15")
     def test_unauthorized_uses_host_from_x_forwarded_for_header(self):
         self.login_manager.login_view = 'login'
         self.app.config['FORCE_HOST_FOR_REDIRECTS'] = None
+        self.app.wsgi_app = ProxyFix(self.app.wsgi_app, x_host=1)
 
         @self.app.route('/login')
         def login():