Github OAuth

Summary:

Test Plan:

Reviewers:

CC:

Author: epriestley

conf/default.conf.php

@@ -98,6 +98,7 @@
     'recaptcha.private-key',
     'phabricator.csrf-key',
     'facebook.application-secret',
+    'github.secret',
   ),
 
 // --  MySQL  --------------------------------------------------------------- //
@@ -187,6 +188,27 @@
   'facebook.application-secret' => null,
 
 
+// -- Github ---------------------------------------------------------------- //
+
+  // Can users use Github credentials to login to Phabricator?
+  'github.auth-enabled'         => false,
+
+  // The Github "Client ID" to use for Github API access.
+  'github.application-id'       => null,
+
+  // The Github "Secret" to use for Github API access.
+  'github.application-secret'   => null,
+
+
+  // Github Authorize URI. You don't need to change this unless Github changes
+  // its API in the future (this is unlikely).
+  'github.authorize-uri'        => 'https://github.com/login/oauth/authorize',
+
+  // Github Access Token URI. You don't need to change this unless Github
+  // changes its API in the future (this is unlikely).
+  'github.access-token-uri' => 'https://github.com/login/oauth/access_token',
+
+
 // -- Recaptcha ------------------------------------------------------------- //
 
   // Is Recaptcha enabled? If disabled, captchas will not appear.

resources/sql/patches/002.oauth.sql

@@ -0,0 +1,18 @@
+create table phabricator_user.user_oauthinfo (
+  id int unsigned not null auto_increment primary key,
+  userID int unsigned not null,
+  oauthProvider varchar(255) not null,
+  oauthUID varchar(255) not null,
+  unique key (userID, oauthProvider),
+  unique key (oauthProvider, oauthUID),
+  dateCreated int unsigned not null,
+  dateModified int unsigned not null
+);
+
+insert into phabricator_user.user_oauthinfo
+  (userID, oauthProvider, oauthUID, dateCreated, dateModified)
+  SELECT id, 'facebook', facebookUID, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()
+    FROM phabricator_user.user
+    WHERE facebookUID is not null;
+
+alter table phabricator_user.user drop facebookUID;

src/__phutil_library_map__.php

@@ -187,8 +187,6 @@
     'PhabricatorEmailLoginController' => 'applications/auth/controller/email',
     'PhabricatorEmailTokenController' => 'applications/auth/controller/emailtoken',
     'PhabricatorEnv' => 'infrastructure/env',
-    'PhabricatorFacebookAuthController' => 'applications/auth/controller/facebookauth',
-    'PhabricatorFacebookAuthDiagnosticsController' => 'applications/auth/controller/facebookauth/diagnostics',
     'PhabricatorFile' => 'applications/files/storage/file',
     'PhabricatorFileController' => 'applications/files/controller/base',
     'PhabricatorFileDAO' => 'applications/files/storage/base',
@@ -214,6 +212,12 @@
     'PhabricatorMetaMTAMailingListsController' => 'applications/metamta/controller/mailinglists',
     'PhabricatorMetaMTASendController' => 'applications/metamta/controller/send',
     'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/view',
+    'PhabricatorOAuthDiagnosticsController' => 'applications/auth/controller/oauthdiagnostics',
+    'PhabricatorOAuthFailureView' => 'applications/auth/view/oauthfailure',
+    'PhabricatorOAuthLoginController' => 'applications/auth/controller/oauth',
+    'PhabricatorOAuthProvider' => 'applications/auth/oauth/provider/base',
+    'PhabricatorOAuthProviderFacebook' => 'applications/auth/oauth/provider/facebook',
+    'PhabricatorOAuthProviderGithub' => 'applications/auth/oauth/provider/github',
     'PhabricatorObjectHandle' => 'applications/phid/handle',
     'PhabricatorObjectHandleData' => 'applications/phid/handle/data',
     'PhabricatorObjectSelectorDialog' => 'view/control/objectselector',
@@ -270,6 +274,7 @@
     'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/base',
     'PhabricatorUser' => 'applications/people/storage/user',
     'PhabricatorUserDAO' => 'applications/people/storage/base',
+    'PhabricatorUserOAuthInfo' => 'applications/people/storage/useroauthinfo',
     'PhabricatorUserProfile' => 'applications/people/storage/profile',
     'PhabricatorUserSettingsController' => 'applications/people/controller/settings',
     'PhabricatorXHProfController' => 'applications/xhprof/controller/base',
@@ -436,8 +441,6 @@
     'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
     'PhabricatorEmailLoginController' => 'PhabricatorAuthController',
     'PhabricatorEmailTokenController' => 'PhabricatorAuthController',
-    'PhabricatorFacebookAuthController' => 'PhabricatorAuthController',
-    'PhabricatorFacebookAuthDiagnosticsController' => 'PhabricatorAuthController',
     'PhabricatorFile' => 'PhabricatorFileDAO',
     'PhabricatorFileController' => 'PhabricatorController',
     'PhabricatorFileDAO' => 'PhabricatorLiskDAO',
@@ -459,6 +462,11 @@
     'PhabricatorMetaMTAMailingListsController' => 'PhabricatorMetaMTAController',
     'PhabricatorMetaMTASendController' => 'PhabricatorMetaMTAController',
     'PhabricatorMetaMTAViewController' => 'PhabricatorMetaMTAController',
+    'PhabricatorOAuthDiagnosticsController' => 'PhabricatorAuthController',
+    'PhabricatorOAuthFailureView' => 'AphrontView',
+    'PhabricatorOAuthLoginController' => 'PhabricatorAuthController',
+    'PhabricatorOAuthProviderFacebook' => 'PhabricatorOAuthProvider',
+    'PhabricatorOAuthProviderGithub' => 'PhabricatorOAuthProvider',
     'PhabricatorPHID' => 'PhabricatorPHIDDAO',
     'PhabricatorPHIDAllocateController' => 'PhabricatorPHIDController',
     'PhabricatorPHIDController' => 'PhabricatorController',
@@ -507,6 +515,7 @@
     'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
     'PhabricatorUser' => 'PhabricatorUserDAO',
     'PhabricatorUserDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorUserOAuthInfo' => 'PhabricatorUserDAO',
     'PhabricatorUserProfile' => 'PhabricatorUserDAO',
     'PhabricatorUserSettingsController' => 'PhabricatorPeopleController',
     'PhabricatorXHProfController' => 'PhabricatorController',

src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php

@@ -130,6 +130,13 @@ public function getURIMap() {
         'diagnose/$' => 'PhabricatorFacebookAuthDiagnosticsController',
       ),
 
+      '/oauth/' => array(
+        '(?P<provider>github|facebook)/' => array(
+          'login/$'     => 'PhabricatorOAuthLoginController',
+          'diagnose/$'  => 'PhabricatorOAuthDiagnosticsController',
+        ),
+      ),
+
       '/xhprof/' => array(
         'profile/(?P<phid>[^/]+)/$' => 'PhabricatorXHProfProfileController',
       ),