Merge pull request #2470 from pgjones/2.2.x

Bugfix ensure that the entire part is matched

Author: davidism

CHANGES.rst

@@ -7,6 +7,8 @@ Unreleased
 
 -   Fix router so that ``/path/`` will match a rule ``/path`` if strict
     slashes mode is disabled for the rule. :issue:`2467`
+-   Fix router so that partial part matches are not allowed
+    i.e. ``/2df`` does not match ``/<int>``. :pr:`2470`
 -   Restore ``ValidationError`` to be importable from
     ``werkzeug.routing``. :issue:`2465`
 

src/werkzeug/routing/rules.py

@@ -625,8 +625,8 @@ def _parse_rule(self, rule: str) -> t.Iterable[RulePart]:
                     -len(argument_weights),
                     argument_weights,
                 )
-                if final:
-                    content += r"$\Z"
+                if not static:
+                    content += r"\Z"
                 yield RulePart(
                     content=content, final=final, static=static, weight=weight
                 )

tests/test_routing.py

@@ -1400,3 +1400,18 @@ def test_newline_match():
 
     with pytest.raises(NotFound):
         a.match("/hello\n")
+
+
+def test_weighting():
+    m = r.Map(
+        [
+            r.Rule("/<int:value>", endpoint="int"),
+            r.Rule("/<uuid:value>", endpoint="uuid"),
+        ]
+    )
+    a = m.bind("localhost")
+
+    assert a.match("/2b5b0911-fdcf-4dd2-921b-28ace88db8a0") == (
+        "uuid",
+        {"value": uuid.UUID("2b5b0911-fdcf-4dd2-921b-28ace88db8a0")},
+    )