Use start/end anchors in matchStrings() regex

This adds a new test case demonstrating the issue where "com/**" would incorrectly match "com2/foo". The change also necessitated revising an existing test case.
dflydev · Jan 20, 2023 · 28056f3 · 28056f3
1 parent cbae583
commit 28056f3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/dflydev/util/antPathMatcher/AntPathMatcher.php b/src/dflydev/util/antPathMatcher/AntPathMatcher.php
@@ -221,7 +221,7 @@ protected function matchStrings($pattern, $str)
     {
         $re = preg_replace_callback('([\?\*\.\+])', array($this, 'matchStringsCallback'), $pattern);
 
-        return preg_match('/'.$re.'/', $str);
+        return preg_match('/^'.$re.'$/', $str);
     }
 
 }
diff --git a/tests/dflydev/tests/util/antPathMatcher/AntPathMatcherTest.php b/tests/dflydev/tests/util/antPathMatcher/AntPathMatcherTest.php
@@ -52,7 +52,7 @@ public function provideMatches()
     {
         return array(
             array(
-                'com/t?st',
+                'com/t?st.jsp',
                 array('com/test.jsp', 'com/tast.jsp', 'com/txst.jsp'),
                 array('com/toast.jsp', 'com/README.md')
             ),
@@ -95,7 +95,12 @@ public function provideMatches()
                 'com/foo/',
                 array('com/foo/bar.jsp','com/foo/bar/baz.jsp',),
                 array('com.txt', 'com/foo.txt'),
-            )
+            ),
+            array(
+                'com/**',
+                array('com/foo'),
+                array('com2/foo'),
+            ),
         );
     }