Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13191916
D11287.id27120.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D11287.id27120.diff
View Options
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2122,6 +2122,7 @@
'PhabricatorPeopleUserPHIDType' => 'applications/people/phid/PhabricatorPeopleUserPHIDType.php',
'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php',
'PhabricatorPersonaAuthProvider' => 'applications/auth/provider/PhabricatorPersonaAuthProvider.php',
+ 'PhabricatorPhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorPhabricatorAuthProvider.php',
'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php',
'PhabricatorPhameBlogPHIDType' => 'applications/phame/phid/PhabricatorPhameBlogPHIDType.php',
'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
@@ -5321,6 +5322,7 @@
'PhabricatorPeopleUserPHIDType' => 'PhabricatorPHIDType',
'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController',
'PhabricatorPersonaAuthProvider' => 'PhabricatorAuthProvider',
+ 'PhabricatorPhabricatorAuthProvider' => 'PhabricatorOAuth2AuthProvider',
'PhabricatorPhameApplication' => 'PhabricatorApplication',
'PhabricatorPhameBlogPHIDType' => 'PhabricatorPHIDType',
'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
diff --git a/src/applications/auth/provider/PhabricatorPhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorPhabricatorAuthProvider.php
new file mode 100644
--- /dev/null
+++ b/src/applications/auth/provider/PhabricatorPhabricatorAuthProvider.php
@@ -0,0 +1,185 @@
+<?php
+
+final class PhabricatorPhabricatorAuthProvider
+ extends PhabricatorOAuth2AuthProvider {
+
+ const PROPERTY_PHABRICATOR_NAME = 'oauth2:phabricator:name';
+ const PROPERTY_PHABRICATOR_URI = 'oauth2:phabricator:uri';
+
+ public function getProviderName() {
+ return pht('Phabricator');
+ }
+
+ protected function getProviderConfigurationHelp() {
+ if ($this->isCreate()) {
+ $base_uri = '<phabricator-base-uri>';
+ } else {
+ $config = $this->getProviderConfig();
+ $base_uri = rtrim(
+ $config->getProperty(self::PROPERTY_PHABRICATOR_URI), '/');
+ }
+ $login_uri = PhabricatorEnv::getURI($this->getLoginURI());
+
+ return pht(
+ "To configure Phabricator OAuth, create a new application here:".
+ "\n\n".
+ "%s/oauthserver/client/create/".
+ "\n\n".
+ "When creating your application, use these settings:".
+ "\n\n".
+ " - **Redirect URI:** Set this to: `%s`".
+ "\n\n".
+ "After completing configuration, copy the **Client ID** and ".
+ "**Client Secret** to the fields above. (You may need to generate the ".
+ "client secret by clicking 'New Secret' first.)",
+ $base_uri,
+ $login_uri);
+ }
+
+ protected function newOAuthAdapter() {
+ $config = $this->getProviderConfig();
+ return id(new PhutilPhabricatorAuthAdapter())
+ ->setAdapterDomain($config->getProviderDomain())
+ ->setPhabricatorBaseURI(
+ $config->getProperty(self::PROPERTY_PHABRICATOR_URI));
+ }
+
+ protected function getLoginIcon() {
+ return 'Phabricator';
+ }
+
+ private function isCreate() {
+ return !$this->getProviderConfig()->getID();
+ }
+
+ public function readFormValuesFromProvider() {
+ $config = $this->getProviderConfig();
+ $uri = $config->getProperty(self::PROPERTY_PHABRICATOR_URI);
+
+ return parent::readFormValuesFromProvider() + array(
+ self::PROPERTY_PHABRICATOR_NAME => $this->getProviderDomain(),
+ self::PROPERTY_PHABRICATOR_URI => $uri,
+ );
+ }
+
+ public function readFormValuesFromRequest(AphrontRequest $request) {
+ $is_setup = $this->isCreate();
+ if ($is_setup) {
+ $name = $request->getStr(self::PROPERTY_PHABRICATOR_NAME);
+ } else {
+ $name = $this->getProviderDomain();
+ }
+
+ return parent::readFormValuesFromRequest($request) + array(
+ self::PROPERTY_PHABRICATOR_NAME => $name,
+ self::PROPERTY_PHABRICATOR_URI =>
+ $request->getStr(self::PROPERTY_PHABRICATOR_URI),
+ );
+ }
+
+ public function processEditForm(
+ AphrontRequest $request,
+ array $values) {
+
+ list($errors, $issues, $values) =
+ parent::processEditForm($request, $values);
+
+ $is_setup = $this->isCreate();
+
+ $key_name = self::PROPERTY_PHABRICATOR_NAME;
+ $key_uri = self::PROPERTY_PHABRICATOR_URI;
+
+ if (!strlen($values[$key_name])) {
+ $errors[] = pht('Phabricator instance name is required.');
+ $issues[$key_name] = pht('Required');
+ } else if (!preg_match('/^[a-z0-9.]+\z/', $values[$key_name])) {
+ $errors[] = pht(
+ 'Phabricator instance name must contain only lowercase letters, '.
+ 'digits, and period.');
+ $issues[$key_name] = pht('Invalid');
+ }
+
+ if (!strlen($values[$key_uri])) {
+ $errors[] = pht('Phabricator base URI is required.');
+ $issues[$key_uri] = pht('Required');
+ } else {
+ $uri = new PhutilURI($values[$key_uri]);
+ if (!$uri->getProtocol()) {
+ $errors[] = pht(
+ 'Phabricator base URI should include protocol (like "https://").');
+ $issues[$key_uri] = pht('Invalid');
+ }
+ }
+
+ if (!$errors && $is_setup) {
+ $config = $this->getProviderConfig();
+
+ $config->setProviderDomain($values[$key_name]);
+ }
+
+ return array($errors, $issues, $values);
+ }
+
+ public function extendEditForm(
+ AphrontRequest $request,
+ AphrontFormView $form,
+ array $values,
+ array $issues) {
+
+ $is_setup = $this->isCreate();
+
+ $e_required = $request->isFormPost() ? null : true;
+
+ $v_name = $values[self::PROPERTY_PHABRICATOR_NAME];
+ if ($is_setup) {
+ $e_name = idx($issues, self::PROPERTY_PHABRICATOR_NAME, $e_required);
+ } else {
+ $e_name = null;
+ }
+
+ $v_uri = $values[self::PROPERTY_PHABRICATOR_URI];
+ $e_uri = idx($issues, self::PROPERTY_PHABRICATOR_URI, $e_required);
+
+ if ($is_setup) {
+ $form
+ ->appendRemarkupInstructions(
+ pht(
+ "**Phabricator Instance Name**\n\n".
+ "Choose a permanent name for the OAuth server instance of ".
+ "Phabricator. //This// instance of Phabricator uses this name ".
+ "internally to keep track of the OAuth server instance of ".
+ "Phabricator, in case the URL changes later.\n\n".
+ "Use lowercase letters, digits, and periods. For example, ".
+ "`phabricator`, `phabricator.oauth` or `phabricator.engineering` ".
+ "are reasonable names."))
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Phabricator Instance Name'))
+ ->setValue($v_name)
+ ->setName(self::PROPERTY_PHABRICATOR_NAME)
+ ->setError($e_name));
+ } else {
+ $form
+ ->appendChild(
+ id(new AphrontFormStaticControl())
+ ->setLabel(pht('Phabricator Instance Name'))
+ ->setValue($v_name));
+ }
+
+ $form
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Phabricator Base URI'))
+ ->setValue($v_uri)
+ ->setName(self::PROPERTY_PHABRICATOR_URI)
+ ->setCaption(
+ pht(
+ 'The URI where the OAuth server instance of Phabricator is '.
+ 'installed. For example: %s',
+ phutil_tag('tt', array(), 'https://phabricator.mycompany.com/')))
+ ->setError($e_uri));
+
+ parent::extendEditForm($request, $form, $values, $issues);
+ }
+
+}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
May 13 2024, 2:25 AM (5 w, 7 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6292128
Default Alt Text
D11287.id27120.diff (7 KB)
Attached To
Mode
D11287: Auth - restore Phabricator OAuth as a provider
Attached
Detach File
Event Timeline
Log In to Comment