@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Enable "SSH Keys" auth panel unconditionally

Summary: We've had support for this for a long time, but it was conditional on config. Since it more-or-less actually does something now, just enable it unconditionally.

Test Plan: Settings -> SSH Public Keys

Reviewers: btrahan

Reviewed By: btrahan

CC: hach-que, aran

Maniphest Tasks: T2230

Differential Revision: https://secure.phabricator.com/D7426

+3 -23
-7
conf/default.conf.php
··· 559 559 // to have. 560 560 'auth.sessions.conduit' => 5, 561 561 562 - // Set this true to enable the Settings -> SSH Public Keys panel, which will 563 - // allow users to associated SSH public keys with their accounts. This is only 564 - // really useful if you're setting up services over SSH and want to use 565 - // Phabricator for authentication; in most situations you can leave this 566 - // disabled. 567 - 'auth.sshkeys.enabled' => false, 568 - 569 562 // If true, email addresses must be verified (by clicking a link in an 570 563 // email) before a user can login. By default, verification is optional 571 564 // unless 'auth.email-domains' is nonempty (see below).
+2
src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
··· 162 162 'been migrated.'), 163 163 'differential.custom-remarkup-rules' => $markup_reason, 164 164 'differential.custom-remarkup-block-rules' => $markup_reason, 165 + 'auth.sshkeys.enabled' => pht( 166 + 'SSH keys are now actually useful, so they are always enabled.'), 165 167 ); 166 168 167 169 return $ancient_config;
-15
src/applications/config/option/PhabricatorAuthenticationConfigOptions.php
··· 29 29 pht( 30 30 "Maximum number of simultaneous Conduit sessions each user is ". 31 31 "permitted to have.")), 32 - $this->newOption('auth.sshkeys.enabled', 'bool', false) 33 - ->setBoolOptions( 34 - array( 35 - pht("Enable SSH key storage"), 36 - pht("Disable SSH key storage"))) 37 - ->setSummary( 38 - pht("Allow users to associate SSH keys with their accounts.")) 39 - ->setDescription( 40 - pht( 41 - "Set this true to enable the Settings -> SSH Public Keys panel, ". 42 - "which will allow users to associated SSH public keys with their ". 43 - "accounts. This is only really useful if you're setting up ". 44 - "services over SSH and want to use Phabricator for ". 45 - "authentication; in most situations you can leave this ". 46 - "disabled.")), 47 32 $this->newOption('auth.require-email-verification', 'bool', false) 48 33 ->setBoolOptions( 49 34 array(
+1 -1
src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
··· 16 16 } 17 17 18 18 public function isEnabled() { 19 - return PhabricatorEnv::getEnvConfig('auth.sshkeys.enabled'); 19 + return true; 20 20 } 21 21 22 22 public function processRequest(AphrontRequest $request) {