revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 00:32:41 +01:00
Code Issues Releases Wiki Activity

Support http basic auth and related configuration

Browse source 
This adds the http basic auth username and password if found in the
configuration to the ConduitClient.

Reviewed by: epriestley
This commit is contained in:
Brennan Taylor 2012-12-17 17:58:53 -08:00 committed by epriestley
parent b9fa71f7e1
commit b5b1fd62dc
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/configuration/ArcanistSettings.php
View file

@ -82,6 +82,18 @@ final class ArcanistSettings {
'help' => 'List of event listener classes to install at startup.',
'example' => '["ExampleEventListener"]',
),
'http.basicauth.user' => array(
'type' => 'string',
'help' =>
"Username to use for basic auth over http transports",
'example' => '"bob"',
),
'http.basicauth.pass' => array(
'type' => 'string',
'help' =>
"Password to use for basic auth over http transports",
'example' => '"bobhasasecret"',
),
);
}

23
src/workflow/ArcanistBaseWorkflow.php
View file

@ -171,9 +171,32 @@ abstract class ArcanistBaseWorkflow {
$this->conduit->setTimeout($this->conduitTimeout);
}
$user = $this->getConfigFromWhateverSourceAvailiable('http.basicauth.user');
$pass = $this->getConfigFromWhateverSourceAvailiable('http.basicauth.pass');
if ($user !== null && $pass !== null) {
$this->conduit->setBasicAuthCredentials($user, $pass);
}
return $this;
}
final public function getConfigFromWhateverSourceAvailiable($key) {
if ($this->requiresWorkingCopy()) {
$working_copy = $this->getWorkingCopy();
return $working_copy->getConfigFromAnySource($key);
} else {
$global_config = self::readGlobalArcConfig();
$pval = idx($global_config, $key);
if ($pval === null) {
$system_config = self::readSystemArcConfig();
$pval = idx($system_config, $key);
}
return $pval;
}
}
/**
* Set credentials which will be used to authenticate against Conduit. These

2
src/workflow/ArcanistInstallCertificateWorkflow.php
View file

@ -58,7 +58,7 @@ EOTEXT
$config = self::readUserConfigurationFile();
echo "Trying to connect to server...\n";
$conduit = new ConduitClient($uri);
$conduit = $this->establishConduit()->getConduit();
try {
$conduit->callMethodSynchronous('conduit.ping', array());
} catch (Exception $ex) {