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
This commit is contained in:
		@@ -559,13 +559,6 @@ return array(
 | 
			
		||||
  // to have.
 | 
			
		||||
  'auth.sessions.conduit'       => 5,
 | 
			
		||||
 | 
			
		||||
  // Set this true to enable the Settings -> SSH Public Keys panel, which will
 | 
			
		||||
  // allow users to associated SSH public keys with their accounts. This is only
 | 
			
		||||
  // really useful if you're setting up services over SSH and want to use
 | 
			
		||||
  // Phabricator for authentication; in most situations you can leave this
 | 
			
		||||
  // disabled.
 | 
			
		||||
  'auth.sshkeys.enabled'        => false,
 | 
			
		||||
 | 
			
		||||
  // If true, email addresses must be verified (by clicking a link in an
 | 
			
		||||
  // email) before a user can login. By default, verification is optional
 | 
			
		||||
  // unless 'auth.email-domains' is nonempty (see below).
 | 
			
		||||
 
 | 
			
		||||
@@ -162,6 +162,8 @@ final class PhabricatorSetupCheckExtraConfig extends PhabricatorSetupCheck {
 | 
			
		||||
          'been migrated.'),
 | 
			
		||||
      'differential.custom-remarkup-rules' => $markup_reason,
 | 
			
		||||
      'differential.custom-remarkup-block-rules' => $markup_reason,
 | 
			
		||||
      'auth.sshkeys.enabled' => pht(
 | 
			
		||||
        'SSH keys are now actually useful, so they are always enabled.'),
 | 
			
		||||
    );
 | 
			
		||||
 | 
			
		||||
    return $ancient_config;
 | 
			
		||||
 
 | 
			
		||||
@@ -29,21 +29,6 @@ final class PhabricatorAuthenticationConfigOptions
 | 
			
		||||
          pht(
 | 
			
		||||
            "Maximum number of simultaneous Conduit sessions each user is ".
 | 
			
		||||
            "permitted to have.")),
 | 
			
		||||
     $this->newOption('auth.sshkeys.enabled', 'bool', false)
 | 
			
		||||
        ->setBoolOptions(
 | 
			
		||||
          array(
 | 
			
		||||
            pht("Enable SSH key storage"),
 | 
			
		||||
            pht("Disable SSH key storage")))
 | 
			
		||||
        ->setSummary(
 | 
			
		||||
          pht("Allow users to associate SSH keys with their accounts."))
 | 
			
		||||
        ->setDescription(
 | 
			
		||||
          pht(
 | 
			
		||||
            "Set this true to enable the Settings -> SSH Public Keys panel, ".
 | 
			
		||||
            "which will allow users to associated SSH public keys with their ".
 | 
			
		||||
            "accounts. This is only really useful if you're setting up ".
 | 
			
		||||
            "services over SSH and want to use Phabricator for ".
 | 
			
		||||
            "authentication; in most situations you can leave this ".
 | 
			
		||||
            "disabled.")),
 | 
			
		||||
     $this->newOption('auth.require-email-verification', 'bool', false)
 | 
			
		||||
        ->setBoolOptions(
 | 
			
		||||
          array(
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,7 @@ final class PhabricatorSettingsPanelSSHKeys
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  public function isEnabled() {
 | 
			
		||||
    return PhabricatorEnv::getEnvConfig('auth.sshkeys.enabled');
 | 
			
		||||
    return true;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  public function processRequest(AphrontRequest $request) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user