Fixed codehaus-plexus#191

Author: fishermans

src/main/java/org/codehaus/plexus/util/SelectorUtils.java

@@ -251,23 +251,38 @@ public static boolean matchPath( String pattern, String str, boolean isCaseSensi
 
     public static boolean matchPath( String pattern, String str, String separator, boolean isCaseSensitive )
     {
-        if ( isRegexPrefixedPattern( pattern ) )
+        /* 2022-03-30: Fixed: Caller parameter in a public method should be handled immutable. */
+        String localPattern = pattern;
+        if ( isRegexPrefixedPattern( localPattern ) )
         {
-            pattern =
-                pattern.substring( REGEX_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
+            localPattern =
+                localPattern.substring( REGEX_HANDLER_PREFIX.length(), localPattern.length() - PATTERN_HANDLER_SUFFIX.length() );
 
-            return str.matches( pattern );
+            return str.matches( localPattern );
         }
         else
         {
-            if ( isAntPrefixedPattern( pattern ) )
+            if ( isAntPrefixedPattern( localPattern ) )
             {
-                pattern = pattern.substring( ANT_HANDLER_PREFIX.length(),
-                                             pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
+                localPattern = localPattern.substring( ANT_HANDLER_PREFIX.length(),
+                                             localPattern.length() - PATTERN_HANDLER_SUFFIX.length() );
             }
+            final String osRelatedPath = toOSRelatedPath( str, separator );
+            final String osRelatedPattern = toOSRelatedPath( localPattern, separator );
+            return matchAntPathPattern( osRelatedPattern, osRelatedPath, separator, isCaseSensitive );
+        }
+    }
 
-            return matchAntPathPattern( pattern, str, separator, isCaseSensitive );
+    private static String toOSRelatedPath( String pattern, String separator )
+    {
+        if ( "/".equals( separator ) )
+        {
+            return pattern.replace( "\\", separator );
+        }
+        if ( "\\".equals( separator ) ) {
+            return pattern.replace( "/", separator );
         }
+        return pattern;
     }
 
     static boolean isRegexPrefixedPattern( String pattern )

src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java

@@ -92,4 +92,55 @@ public void testMatchPath_WindowsFileSeparator()
         // Pattern and target don't start with file separator
         assertTrue( SelectorUtils.matchPath( "*" + separator + "a.txt", "b" + separator + "a.txt", separator, false ) );
     }
+
+    @Test
+    public void testPatternMatchSingleWildCardLinux()
+    {
+        assertFalse(SelectorUtils.matchPath(
+            "/com/test/*",
+            "/com/test/test/hallo"));
+    }
+
+
+    @Test
+    public void testPatternMatchDoubleWildCardCaseInLinux()
+    {
+        assertTrue(SelectorUtils.matchPath(
+            "/com/test/**",
+            "/com/test/test/hallo"));
+    }
+
+
+    @Test
+    public void testPatternMatchDoubleWildCardLinux()
+    {
+        assertTrue(SelectorUtils.matchPath(
+            "/com/test/**",
+            "/com/test/test/hallo"));
+    }
+
+
+    @Test
+    public void testPatternMatchSingleWildCardWindows()
+    {
+        assertFalse(SelectorUtils.matchPath(
+            "D:\\com\\test\\*",
+            "D:\\com\\test\\test\\hallo"));
+
+        assertFalse(SelectorUtils.matchPath(
+            "D:/com/test/*",
+            "D:/com/test/test/hallo"));
+    }
+
+    @Test
+    public void testPatternMatchDoubleWildCardWindows()
+    {
+        assertTrue(SelectorUtils.matchPath(
+            "D:\\com\\test\\**",
+            "D:\\com\\test\\test\\hallo"));
+
+        assertTrue(SelectorUtils.matchPath(
+            "D:\\com\\test\\**",
+            "D:/com/test/test/hallo"));
+    }
 }