Update werkzeug

indico · May 16, 2019 · cd4ecf1 · cd4ecf1
1 parent 402bac1
commit cd4ecf1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/indico/cli/devserver.py b/indico/cli/devserver.py
@@ -10,9 +10,9 @@
 import os
 
 from flask.cli import DispatchingApp
-from werkzeug.contrib.fixers import ProxyFix
 from werkzeug.debug import DebuggedApplication
 from werkzeug.exceptions import NotFound
+from werkzeug.middleware.proxy_fix import ProxyFix
 from werkzeug.serving import WSGIRequestHandler, run_simple
 from werkzeug.urls import url_parse
 from werkzeug.wsgi import DispatcherMiddleware
@@ -100,7 +100,7 @@ def _load_app():
     app = DebuggedIndico(app, evalex_whitelist)
     app = _make_indico_dispatcher(app, url_data.path)
     if proxy:
-        app = ProxyFix(app)
+        app = ProxyFix(app, x_for=1, x_proto=1, x_host=1)
     QuietWSGIRequestHandler.INDICO_URL_PREFIX = url_data.path.rstrip('/')
     return app
 

diff --git a/indico/web/flask/app.py b/indico/web/flask/app.py
@@ -17,9 +17,9 @@
 from markupsafe import Markup
 from pywebpack import WebpackBundleProject
 from sqlalchemy.orm import configure_mappers
-from werkzeug.contrib.fixers import ProxyFix
 from werkzeug.exceptions import BadRequest
 from werkzeug.local import LocalProxy
+from werkzeug.middleware.proxy_fix import ProxyFix
 from werkzeug.urls import url_parse
 from wtforms.widgets import html_params
 
@@ -87,7 +87,7 @@ def configure_app(app, set_path=False):
             app.config['APPLICATION_ROOT'] = base.path
     configure_xsendfile(app, config.STATIC_FILE_METHOD)
     if config.USE_PROXY:
-        app.wsgi_app = ProxyFix(app.wsgi_app)
+        app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1)
     configure_webpack(app)
 
 

diff --git a/requirements.txt b/requirements.txt
@@ -21,7 +21,7 @@ termcolor==1.1.0
 wsgiref==0.1.2
 zope.interface==3.8.0
 requests==2.21.0
-Werkzeug==0.14.1
+Werkzeug==0.15.4
 Flask==0.12.4
 bcrypt==3.1.6
 Pillow==6.0.0