Ensure that the entire string is consumed with parse_marker

Co-Authored-By: Malte Werschy <werschy.m@gmail.com>
pypa · Apr 12, 2023 · be5b736 · be5b736
1 parent 30d4a1c
commit be5b736
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,7 +4,7 @@ Changelog
 *unreleased*
 ~~~~~~~~~~~~
 
-No unreleased changes.
+* Enforce that the entire marker string is parsed (:issue:`687`)
 
 23.1 - 2023-04-12
 ~~~~~~~~~~~~~~~~~

diff --git a/src/packaging/_parser.py b/src/packaging/_parser.py
@@ -252,7 +252,13 @@ def _parse_version_many(tokenizer: Tokenizer) -> str:
 # Recursive descent parser for marker expression
 # --------------------------------------------------------------------------------------
 def parse_marker(source: str) -> MarkerList:
-    return _parse_marker(Tokenizer(source, rules=DEFAULT_RULES))
+    return _parse_full_marker(Tokenizer(source, rules=DEFAULT_RULES))
+
+
+def _parse_full_marker(tokenizer: Tokenizer) -> MarkerList:
+    retval = _parse_marker(tokenizer)
+    tokenizer.expect("END", expected="end of marker expression")
+    return retval
 
 
 def _parse_marker(tokenizer: Tokenizer) -> MarkerList:

diff --git a/tests/test_markers.py b/tests/test_markers.py
@@ -167,6 +167,7 @@ def test_parses_valid(self, marker_string):
             "(python_version)",
             "python_version >= 1.0 and (python_version)",
             '(python_version == "2.7" and os_name == "linux"',
+            '(python_version == "2.7") with random text',
         ],
     )
     def test_parses_invalid(self, marker_string):