public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #9156 from Ayesh/gitlab-repos 

AuthHelper: Allow fall-through GitLab-specific HTTP headers for auth
pull/9161/head
Jordi Boggiano 2020-08-27 10:06:28 +02:00 committed by GitHub
parent 42920e01d4 931a1ff1f8
commit 9e77514764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Util/AuthHelper.php
View File

@ -205,7 +205,10 @@ class AuthHelper
$headers[] = 'Authorization: token '.$auth['username']; $headers[] = 'Authorization: token '.$auth['username'];
$authenticationDisplayMessage = 'Using GitHub token authentication'; $authenticationDisplayMessage = 'Using GitHub token authentication';
} }
} elseif (in_array($origin, $this->config->get('gitlab-domains'), true)) { } elseif (
in_array($origin, $this->config->get('gitlab-domains'), true)
&& in_array($auth['password'], array('oauth2', 'private-token', 'gitlab-ci-token'), true)
) {
if ($auth['password'] === 'oauth2') { if ($auth['password'] === 'oauth2') {
$headers[] = 'Authorization: Bearer '.$auth['username']; $headers[] = 'Authorization: Bearer '.$auth['username'];
$authenticationDisplayMessage = 'Using GitLab OAuth token authentication'; $authenticationDisplayMessage = 'Using GitLab OAuth token authentication';

10
tests/Composer/Test/Util/AuthHelperTest.php
View File

@ -280,6 +280,14 @@ class AuthHelperTest extends TestCase
'password' => 'my_password' 'password' => 'my_password'
) )
), ),
array(
'https://gitlab.com',
'gitlab.com',
array(
'username' => 'my_username',
'password' => 'my_password'
)
),
); );
} }
@ -302,7 +310,7 @@ class AuthHelperTest extends TestCase
$this->config->expects($this->once()) $this->config->expects($this->once())
->method('get') ->method('get')
->with('gitlab-domains') ->with('gitlab-domains')
->willReturn(array()); ->willReturn(array($origin));
$this->io->expects($this->once()) $this->io->expects($this->once())
->method('writeError') ->method('writeError')