Merge pull request #1 from hjensas/wallaby-c8-rdo

ProxyFix support IPv6 Addressing

0001-ProxyFix-supports-IPv6.patch

@@ -0,0 +1,59 @@
+diff -aur a/src/werkzeug/middleware/proxy_fix.py b/src/werkzeug/middleware/proxy_fix.py
+--- a/src/werkzeug/middleware/proxy_fix.py	2022-01-21 15:09:21.067849100 +0100
++++ b/src/werkzeug/middleware/proxy_fix.py	2022-01-21 15:05:11.903698283 +0100
+@@ -145,18 +145,19 @@
+
+         x_host = self._get_real_value(self.x_host, environ_get("HTTP_X_FORWARDED_HOST"))
+         if x_host:
+-            environ["HTTP_HOST"] = x_host
+-            parts = x_host.split(":", 1)
+-            environ["SERVER_NAME"] = parts[0]
+-            if len(parts) == 2:
+-                environ["SERVER_PORT"] = parts[1]
++            environ["HTTP_HOST"] = environ["SERVER_NAME"] = x_host
++            # "]" to check for IPv6 address without port
++            if ":" in x_host and not x_host.endswith("]"):
++                environ["SERVER_NAME"], environ["SERVER_PORT"] = x_host.rsplit(":", 1)
++
+
+         x_port = self._get_real_value(self.x_port, environ_get("HTTP_X_FORWARDED_PORT"))
+         if x_port:
+             host = environ.get("HTTP_HOST")
+             if host:
+-                parts = host.split(":", 1)
+-                host = parts[0] if len(parts) == 2 else host
++                # "]" to check for IPv6 address without port
++                if ":" in host and not host.endswith("]"):
++                    host = host.rsplit(":", 1)[0]
+                 environ["HTTP_HOST"] = "%s:%s" % (host, x_port)
+             environ["SERVER_PORT"] = x_port
+
+diff -aur a/tests/middleware/test_proxy_fix.py b/tests/middleware/test_proxy_fix.py
+--- a/tests/middleware/test_proxy_fix.py	2022-01-21 15:09:21.069849109 +0100
++++ b/tests/middleware/test_proxy_fix.py	2022-01-21 15:06:48.802147105 +0100
+@@ -138,6 +138,24 @@
+             "http://spam/eggs/",
+             id="prefix < for",
+         ),
++        pytest.param(
++            {"x_host": 1},
++            {"HTTP_HOST": "spam", "HTTP_X_FORWARDED_HOST": "[2001:db8::a]"},
++            "http://[2001:db8::a]/",
++            id="ipv6 host",
++        ),
++        pytest.param(
++            {"x_port": 1},
++            {"HTTP_HOST": "[2001:db8::a]", "HTTP_X_FORWARDED_PORT": "8080"},
++            "http://[2001:db8::a]:8080/",
++            id="ipv6 port, host without port",
++        ),
++        pytest.param(
++            {"x_port": 1},
++            {"HTTP_HOST": "[2001:db8::a]:9000", "HTTP_X_FORWARDED_PORT": "8080"},
++            "http://[2001:db8::a]:8080/",
++            id="ipv6 - port, host with port",
++        ),
+     ),
+ )
+ def test_proxy_fix(kwargs, base, url_root):
+

python-werkzeug.spec

@@ -5,13 +5,17 @@
 
 Name:           python-%{modname}
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Comprehensive WSGI web application library
 
 License:        BSD
 URL:            https://werkzeug.palletsprojects.com
 Source0:        %{pypi_source}
 
+# Handle IPv6 Addreess in X-Forwarded-For Proxy Fix
+# Upsream: https://github.com/pallets/werkzeug/pull/2263
+Patch0:         0001-ProxyFix-supports-IPv6.patch
+
 BuildArch:      noarch
 
 %global _description %{expand:
@@ -95,6 +99,9 @@ PYTHONPATH=./src/ pytest-3
 %doc docs/_build/html examples
 
 %changelog
+* Fri Jan 21 2022 Harald Jensas <hjensas@redhat.com> - 1.0.1-4
+- X-Forwarded-For Proxy Fix for IPv6 addressing. rhbz#2018223
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild