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

Improve the error message for ERR-NO-CERTIFICATE

Browse source 
Summary:
list the hosts for which the .arcrc file have certificate and
which conduit-uri the user is trying to access.

Test Plan:
test the case where a cert is missing.

Reviewed By: epriestley
CC: epriestley
Differential Revision: 76
This commit is contained in:
jungejason 2011-03-16 15:17:07 -07:00
parent bdde006484
commit 51b371481b
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
scripts/arcanist.php
View file

@ -166,15 +166,34 @@ try {
$certificate = idx($host_config, 'cert'); $certificate = idx($host_config, 'cert');
$description = implode(' ', $argv); $description = implode(' ', $argv);
$connection = $conduit->callMethodSynchronous(
'conduit.connect', try {
array( $connection = $conduit->callMethodSynchronous(
'client' => 'arc', 'conduit.connect',
'clientVersion' => 2, array(
'clientDescription' => php_uname('n').':'.$description, 'client' => 'arc',
'user' => $user_name, 'clientVersion' => 2,
'certificate' => $certificate, 'clientDescription' => php_uname('n').':'.$description,
)); 'user' => $user_name,
'certificate' => $certificate,
));
} catch (ConduitClientException $ex) {
if ($ex->getErrorCode() == 'ERR-NO-CERTIFICATE') {
$no_cert_msg = "You don't have certificate for ".$conduit_uri.".\n";
$hosts_with_cert = ifilter($hosts_config, 'cert');
if (!empty($hosts_with_cert)) {
$no_cert_msg .= 'You have certificate(s) for '.
implode(array_keys($hosts_with_cert), ', ').".\n";
}
$no_cert_msg .= 'Please refer to page http://www.phabricator.com'.
'/docs/phabricator/article/Installing_Arcanist_Certificates.html '.
'for more info.';
throw new ArcanistUsageException($no_cert_msg);
} else {
throw $ex;
}
}
$workflow->setUserName($user_name); $workflow->setUserName($user_name);
$user_phid = idx($connection, 'userPHID'); $user_phid = idx($connection, 'userPHID');