Skip to content

Commit d02202c

Browse files
author
epriestley
committedOct 29, 2013
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
1 parent c6665b1 commit d02202c

File tree

4 files changed

+3
-23
lines changed

4 files changed

+3
-23
lines changed
 

‎conf/default.conf.php

-7
Original file line numberDiff line numberDiff line change
@@ -559,13 +559,6 @@
559559
// to have.
560560
'auth.sessions.conduit' => 5,
561561

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-
569562
// If true, email addresses must be verified (by clicking a link in an
570563
// email) before a user can login. By default, verification is optional
571564
// unless 'auth.email-domains' is nonempty (see below).

‎src/applications/config/check/PhabricatorSetupCheckExtraConfig.php

+2
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ public static function getAncientConfig() {
162162
'been migrated.'),
163163
'differential.custom-remarkup-rules' => $markup_reason,
164164
'differential.custom-remarkup-block-rules' => $markup_reason,
165+
'auth.sshkeys.enabled' => pht(
166+
'SSH keys are now actually useful, so they are always enabled.'),
165167
);
166168

167169
return $ancient_config;

‎src/applications/config/option/PhabricatorAuthenticationConfigOptions.php

-15
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,6 @@ public function getOptions() {
2929
pht(
3030
"Maximum number of simultaneous Conduit sessions each user is ".
3131
"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.")),
4732
$this->newOption('auth.require-email-verification', 'bool', false)
4833
->setBoolOptions(
4934
array(

‎src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function getPanelGroup() {
1616
}
1717

1818
public function isEnabled() {
19-
return PhabricatorEnv::getEnvConfig('auth.sshkeys.enabled');
19+
return true;
2020
}
2121

2222
public function processRequest(AphrontRequest $request) {

0 commit comments

Comments
 (0)
Failed to load comments.