Merge pull request #9156 from Ayesh/gitlab-repos
AuthHelper: Allow fall-through GitLab-specific HTTP headers for authpull/9161/head
commit
9e77514764
|
@ -205,7 +205,10 @@ class AuthHelper
|
|||
$headers[] = 'Authorization: token '.$auth['username'];
|
||||
$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') {
|
||||
$headers[] = 'Authorization: Bearer '.$auth['username'];
|
||||
$authenticationDisplayMessage = 'Using GitLab OAuth token authentication';
|
||||
|
|
|
@ -280,6 +280,14 @@ class AuthHelperTest extends TestCase
|
|||
'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())
|
||||
->method('get')
|
||||
->with('gitlab-domains')
|
||||
->willReturn(array());
|
||||
->willReturn(array($origin));
|
||||
|
||||
$this->io->expects($this->once())
|
||||
->method('writeError')
|
||||
|
|
Loading…
Reference in New Issue