From 55d252b9c3d26bb9557dcb64097bb6f77b35d932 Mon Sep 17 00:00:00 2001 From: Stephan Vock Date: Wed, 11 Mar 2020 13:30:48 +0100 Subject: [PATCH 1/6] GitLab: properly handle token which has Guest only access --- src/Composer/Repository/Vcs/GitLabDriver.php | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php index 306bf7124..1de093a2c 100644 --- a/src/Composer/Repository/Vcs/GitLabDriver.php +++ b/src/Composer/Repository/Vcs/GitLabDriver.php @@ -427,6 +427,30 @@ class GitLabDriver extends VcsDriver if ($fetchingRepoData) { $json = JsonFile::parseJson($res, $url); + // Accessing the API with a token with Guest (10) access will return + // more data than unauthenticated access but no default_branch data + // accessing files via the API will then also fail + if (!isset($json['default_branch']) && isset($json['permissions'])) { + $this->isPrivate = $json['visibility'] !== 'public'; + + $moreThanGuestAccess = false; + // Check both access levels (e.g. project, group) + // - value will be null if no access is set + // - value will be array with key access_level if set + foreach ($json['permissions'] as $permission) { + if ($permission && $permission['access_level'] > 10) { + $moreThanGuestAccess = true; + } + } + + if (!$moreThanGuestAccess) { + $this->io->writeError('GitLab token with Guest only access detected'); + $this->setupGitDriver($this->generateSshUrl()); + + return $res; + } + } + // force auth as the unauthenticated version of the API is broken if (!isset($json['default_branch'])) { if (!empty($json['id'])) { From 402c64c2711b83ed92f5dba47fa63370fee934de Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 11 Mar 2020 15:17:12 +0100 Subject: [PATCH 2/6] Update src/Composer/Repository/Vcs/GitLabDriver.php Co-Authored-By: Jordi Boggiano --- src/Composer/Repository/Vcs/GitLabDriver.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php index 1de093a2c..2878f3f74 100644 --- a/src/Composer/Repository/Vcs/GitLabDriver.php +++ b/src/Composer/Repository/Vcs/GitLabDriver.php @@ -445,9 +445,8 @@ class GitLabDriver extends VcsDriver if (!$moreThanGuestAccess) { $this->io->writeError('GitLab token with Guest only access detected'); - $this->setupGitDriver($this->generateSshUrl()); - return $res; + return $this->attemptCloneFallback(); } } From d559bf5387e49b108150bf4683485885cae0f89d Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 11 Mar 2020 15:33:14 +0100 Subject: [PATCH 3/6] Allow configuring a path repo to an empty path as long as using wildcards and the wildcard root exists, fixes #8679 --- src/Composer/Repository/PathRepository.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Composer/Repository/PathRepository.php b/src/Composer/Repository/PathRepository.php index 4db774579..5b6a770b2 100644 --- a/src/Composer/Repository/PathRepository.php +++ b/src/Composer/Repository/PathRepository.php @@ -128,6 +128,17 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn $urlMatches = $this->getUrlMatches(); if (empty($urlMatches)) { + if (preg_match('{[*{}]}', $this->url)) { + $url = $this->url; + while (preg_match('{[*{}]}', $url)) { + $url = dirname($url); + } + // the parent directory before any wildcard exists, so we assume it is correctly configured but simply empty + if (is_dir($url)) { + return; + } + } + throw new \RuntimeException('The `url` supplied for the path (' . $this->url . ') repository does not exist'); } From 1ebeb143ae9c08f11dae3f1602646ee1f7ae5ccb Mon Sep 17 00:00:00 2001 From: Mathias Berchtold Date: Wed, 11 Mar 2020 23:00:04 -0500 Subject: [PATCH 4/6] Fix PHP 8 warnings The PR fixes this PHP 8 warning: PHP Deprecated: Required parameter $ambiguousClasses follows optional parameter $blacklist in phar://.../composer.phar/src/Composer/Autoload/AutoloadGenerator.php on line 339 --- src/Composer/Autoload/AutoloadGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index e7cd482b8..cf90535bf 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -336,7 +336,7 @@ EOF; return 0; } - private function addClassMapCode($filesystem, $basePath, $vendorPath, $dir, $blacklist = null, $namespaceFilter = null, $autoloadType = null, array $classMap, array &$ambiguousClasses) + private function addClassMapCode($filesystem, $basePath, $vendorPath, $dir, $blacklist, $namespaceFilter, $autoloadType, array $classMap, array &$ambiguousClasses) { foreach ($this->generateClassMap($dir, $blacklist, $namespaceFilter, $autoloadType) as $class => $path) { $pathCode = $this->getPathCode($filesystem, $basePath, $vendorPath, $path).",\n"; From b41e768e1f60d8d5fead46a7f14a92306b12647b Mon Sep 17 00:00:00 2001 From: Aaron Johnson Date: Thu, 12 Mar 2020 23:17:14 -0400 Subject: [PATCH 5/6] Put backticks around command for readability. Helps to promote the command to discern it from the sentence. :) --- src/Composer/Installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 2269d7958..5fcc6efa2 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -328,7 +328,7 @@ class Installer 1 === $fundingCount ? '' : 's', 1 === $fundingCount ? 'is' : 'are' ), - 'Use the composer fund command to find out more!', + 'Use the `composer fund` command to find out more!', )); } From 33479f00aba6782cb77431520173066d257248d7 Mon Sep 17 00:00:00 2001 From: Aaron Johnson Date: Thu, 12 Mar 2020 23:20:10 -0400 Subject: [PATCH 6/6] Add backticks to test. --- .../Test/Fixtures/installer/install-funding-notice.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Composer/Test/Fixtures/installer/install-funding-notice.test b/tests/Composer/Test/Fixtures/installer/install-funding-notice.test index 638a31d97..a73badc77 100644 --- a/tests/Composer/Test/Fixtures/installer/install-funding-notice.test +++ b/tests/Composer/Test/Fixtures/installer/install-funding-notice.test @@ -47,7 +47,7 @@ Package operations: 3 installs, 0 updates, 0 removals Writing lock file Generating autoload files 2 packages you are using are looking for funding. -Use the composer fund command to find out more! +Use the `composer fund` command to find out more! --EXPECT-- Installing b/b (1.0.0) Installing d/d (1.0.0)