Fix only/exclude to avoid matching names as sub-strings of full packa…

…ge names, fixes #10001
composer · Jul 22, 2021 · 24f5e54 · 24f5e54
1 parent 29a52ff
commit 24f5e54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/Composer/Repository/FilterRepository.php b/src/Composer/Repository/FilterRepository.php
@@ -33,17 +33,17 @@ public function __construct(RepositoryInterface $repo, array $options)
             if (!is_array($options['only'])) {
                 throw new \InvalidArgumentException('"only" key for repository '.$repo->getRepoName().' should be an array');
             }
-            $this->only = '{^'.implode('|', array_map(function ($val) {
+            $this->only = '{^(?:'.implode('|', array_map(function ($val) {
                 return BasePackage::packageNameToRegexp($val, '%s');
-            }, $options['only'])) .'$}iD';
+            }, $options['only'])) .')$}iD';
         }
         if (isset($options['exclude'])) {
             if (!is_array($options['exclude'])) {
                 throw new \InvalidArgumentException('"exclude" key for repository '.$repo->getRepoName().' should be an array');
             }
-            $this->exclude = '{^'.implode('|', array_map(function ($val) {
+            $this->exclude = '{^(?:'.implode('|', array_map(function ($val) {
                 return BasePackage::packageNameToRegexp($val, '%s');
-            }, $options['exclude'])) .'$}iD';
+            }, $options['exclude'])) .')$}iD';
         }
         if ($this->exclude && $this->only) {
             throw new \InvalidArgumentException('Only one of "only" and "exclude" can be specified for repository '.$repo->getRepoName());

diff --git a/tests/Composer/Test/Repository/FilterRepositoryTest.php b/tests/Composer/Test/Repository/FilterRepositoryTest.php
@@ -50,6 +50,9 @@ public static function repoMatchingTests()
             array(array('foo/aaa', 'foo/bbb'), array('only' => array('foo/*'))),
             array(array('foo/aaa', 'baz/yyy'), array('only' => array('foo/aaa', 'baz/yyy'))),
             array(array('bar/xxx'), array('exclude' => array('foo/*', 'baz/yyy'))),
+            // make sure sub-patterns are not matched without wildcard
+            array(array('foo/aaa', 'foo/bbb', 'bar/xxx', 'baz/yyy'), array('exclude' => array('foo/aa', 'az/yyy'))),
+            array(array(), array('only' => array('foo/aa', 'az/yyy'))),
         );
     }