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

Improve workflow for missing arcanist certificates.

Browse source
This commit is contained in:
epriestley 2011-04-10 13:08:47 -07:00
parent c0629f5ff1
commit a7ac8a04e0
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
View file

@ -163,11 +163,8 @@ class PhabricatorConduitAPIController
$session_key = idx($metadata, 'sessionKey'); $session_key = idx($metadata, 'sessionKey');
if (!$session_key) { if (!$session_key) {
return array( return array(
'ERR-NO-CERTIFICATE', 'ERR-INVALID-SESSION',
'This server requires authentication but your client is not '. 'Session key is not present.'
'configured with an authentication certificate. Please refer to '.
'<http://www.phabricator.com/docs/phabricator/article/'.
'Installing_Arcanist_Certificates.html> for more info.',
); );
} }

13
src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php
View file

@ -62,10 +62,15 @@ class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod {
"allowed time range. Either your system clock is out of whack or ". "allowed time range. Either your system clock is out of whack or ".
"you're executing a replay attack.", "you're executing a replay attack.",
"ERR-NO-CERTIFICATE" => "ERR-NO-CERTIFICATE" =>
"This server requires authentication but your client is not ". 'This server requires authentication but your client is not '.
"configured with an authentication certificate. Please refer to page ". 'configured with an authentication certificate. For instructions on '.
"http://www.phabricator.com/docs/phabricator/article/". "installing Arcanist certificates, see the documentation:\n\n".
"Installing_Arcanist_Certificates.html for more info." ' http://www.phabricator.com/docs/phabricator/article/'.
'Installing_Arcanist_Certificates.html'.
"\n\n".
"Retrieve your certificate for this server by logging into the web ".
"interface and going here:\n\n".
' '.PhabricatorEnv::getProductionURI('/settings/page/arcanist/'),
); );
} }

5
src/docs/arcanist_certificates.diviner
View file

@ -19,7 +19,10 @@ like this:
To retrieve the certificate for a Phabricator host: To retrieve the certificate for a Phabricator host:
- Login to Phabricator. - Login to Phabricator. **Make sure you log into the installation you are
trying to install a certificate for!** If you are installing a certificate
for ##phabricator.example.com##, you need to log into
##phabricator.example.com##, **not** ##secure.phabricator.com##.
- Go to Settings (upper right, near Search) > Arcanist Certificate. - Go to Settings (upper right, near Search) > Arcanist Certificate.
Copy the host info including the certificate into the "hosts" section. Copy the host info including the certificate into the "hosts" section.