Page MenuHomePhabricator
Files F13202502

D11763.diff
No OneTemporary
Actions

D11763.diff
View Options

diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
@@ -206,6 +206,8 @@
'translation.provider' => pht(
'The translation implementation has changed and providers are no '.
'longer used or supported.'),
+ 'config.mask' => pht(
+ 'Use `config.hide` instead of this option.'),
);
return $ancient_config;
diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php
--- a/src/applications/config/controller/PhabricatorConfigAllController.php
+++ b/src/applications/config/controller/PhabricatorConfigAllController.php
@@ -17,9 +17,7 @@
foreach ($options as $option) {
$key = $option->getKey();
- if ($option->getMasked()) {
- $value = phutil_tag('em', array(), pht('Masked'));
- } else if ($option->getHidden()) {
+ if ($option->getHidden()) {
$value = phutil_tag('em', array(), pht('Hidden'));
} else {
$value = PhabricatorEnv::getEnvConfig($key);
diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php
--- a/src/applications/config/controller/PhabricatorConfigGroupController.php
+++ b/src/applications/config/controller/PhabricatorConfigGroupController.php
@@ -72,7 +72,7 @@
->setHref('/config/edit/'.$option->getKey().'/')
->addAttribute($summary);
- if (!$option->getHidden() && !$option->getMasked()) {
+ if (!$option->getHidden()) {
$current_value = PhabricatorEnv::getEnvConfig($option->getKey());
$current_value = PhabricatorConfigJSON::prettyPrintJSON(
$current_value);
@@ -96,8 +96,6 @@
if ($option->getHidden()) {
$item->addIcon('unpublish', pht('Hidden'));
- } else if ($option->getMasked()) {
- $item->addIcon('unpublish-grey', pht('Masked'));
} else if ($option->getLocked()) {
$item->addIcon('lock', pht('Locked'));
}
diff --git a/src/applications/config/option/PhabricatorAWSConfigOptions.php b/src/applications/config/option/PhabricatorAWSConfigOptions.php
--- a/src/applications/config/option/PhabricatorAWSConfigOptions.php
+++ b/src/applications/config/option/PhabricatorAWSConfigOptions.php
@@ -25,13 +25,13 @@
->setLocked(true)
->setDescription(pht('Access key for Amazon SES.')),
$this->newOption('amazon-ses.secret-key', 'string', null)
- ->setMasked(true)
+ ->setHidden(true)
->setDescription(pht('Secret key for Amazon SES.')),
$this->newOption('amazon-s3.access-key', 'string', null)
->setLocked(true)
->setDescription(pht('Access key for Amazon S3.')),
$this->newOption('amazon-s3.secret-key', 'string', null)
- ->setMasked(true)
+ ->setHidden(true)
->setDescription(pht('Secret key for Amazon S3.')),
$this->newOption('amazon-s3.endpoint', 'string', null)
->setLocked(true)
@@ -45,7 +45,7 @@
->setLocked(true)
->setDescription(pht('Access key for Amazon EC2.')),
$this->newOption('amazon-ec2.secret-key', 'string', null)
- ->setMasked(true)
+ ->setHidden(true)
->setDescription(pht('Secret key for Amazon EC2.')),
);
}
diff --git a/src/applications/config/option/PhabricatorConfigOption.php b/src/applications/config/option/PhabricatorConfigOption.php
--- a/src/applications/config/option/PhabricatorConfigOption.php
+++ b/src/applications/config/option/PhabricatorConfigOption.php
@@ -16,7 +16,6 @@
private $locked;
private $lockedMessage;
private $hidden;
- private $masked;
private $baseClass;
private $customData;
private $customObject;
@@ -30,26 +29,6 @@
return $this->baseClass;
}
- public function setMasked($masked) {
- $this->masked = $masked;
- return $this;
- }
-
- public function getMasked() {
- if ($this->masked) {
- return true;
- }
-
- if ($this->getHidden()) {
- return true;
- }
-
- return idx(
- PhabricatorEnv::getEnvConfig('config.mask'),
- $this->getKey(),
- false);
- }
-
public function setHidden($hidden) {
$this->hidden = $hidden;
return $this;
diff --git a/src/applications/config/option/PhabricatorCoreConfigOptions.php b/src/applications/config/option/PhabricatorCoreConfigOptions.php
--- a/src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ b/src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -179,9 +179,6 @@
$this->newOption('config.hide', 'set', array())
->setLocked(true)
->setDescription(pht('Additional configuration options to hide.')),
- $this->newOption('config.mask', 'set', array())
- ->setLocked(true)
- ->setDescription(pht('Additional configuration options to mask.')),
$this->newOption('config.ignore-issues', 'set', array())
->setLocked(true)
->setDescription(pht('Setup issues to ignore.')),
diff --git a/src/applications/config/option/PhabricatorMailgunConfigOptions.php b/src/applications/config/option/PhabricatorMailgunConfigOptions.php
--- a/src/applications/config/option/PhabricatorMailgunConfigOptions.php
+++ b/src/applications/config/option/PhabricatorMailgunConfigOptions.php
@@ -28,7 +28,7 @@
'Mailgun domain name. See https://mailgun.com/cp/domains'))
->addExample('mycompany.com', 'Use specific domain'),
$this->newOption('mailgun.api-key', 'string', null)
- ->setMasked(true)
+ ->setHidden(true)
->setDescription(pht('Mailgun API key.')),
);
diff --git a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
--- a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
+++ b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php
@@ -50,7 +50,7 @@
->setLocked(true)
->setDescription(pht('Username for SMTP.')),
$this->newOption('phpmailer.smtp-password', 'string', null)
- ->setMasked(true)
+ ->setHidden(true)
->setDescription(pht('Password for SMTP.')),
$this->newOption('phpmailer.smtp-encoding', 'string', '8bit')
->setSummary(pht('Configure how mail is encoded.'))
diff --git a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
--- a/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
+++ b/src/applications/config/option/PhabricatorRecaptchaConfigOptions.php
@@ -38,7 +38,7 @@
->setDescription(
pht('Recaptcha public key, obtained by signing up for Recaptcha.')),
$this->newOption('recaptcha.private-key', 'string', null)
- ->setMasked(true)
+ ->setHidden(true)
->setDescription(
pht('Recaptcha private key, obtained by signing up for Recaptcha.')),
);
diff --git a/src/applications/config/option/PhabricatorSMSConfigOptions.php b/src/applications/config/option/PhabricatorSMSConfigOptions.php
--- a/src/applications/config/option/PhabricatorSMSConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSMSConfigOptions.php
@@ -54,7 +54,6 @@
'string',
null)
->setDescription(pht('Authorization token from Twilio service.'))
- ->setLocked(true)
->setHidden(true)
->addExample('f3jsi4i67wiwt6w54hf2zwvy3fjf5h', pht('30 characters')),
);
diff --git a/src/applications/config/option/PhabricatorSecurityConfigOptions.php b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
--- a/src/applications/config/option/PhabricatorSecurityConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSecurityConfigOptions.php
@@ -45,8 +45,7 @@
'security.hmac-key',
'string',
'[D\t~Y7eNmnQGJ;rnH6aF;m2!vJ8@v8C=Cs:aQS\.Qw')
- ->setMasked(true)
- ->setLocked(true)
+ ->setHidden(true)
->setSummary(
pht('Key for HMAC digests.'))
->setDescription(
@@ -104,8 +103,7 @@
'phabricator.csrf-key',
'string',
'0b7ec0592e0a2829d8b71df2fa269b2c6172eca3')
- ->setMasked(true)
- ->setLocked(true)
+ ->setHidden(true)
->setSummary(
pht('Hashed with other inputs to generate CSRF tokens.'))
->setDescription(
@@ -120,8 +118,7 @@
'phabricator.mail-key',
'string',
'5ce3e7e8787f6e40dfae861da315a5cdf1018f12')
- ->setMasked(true)
- ->setLocked(true)
+ ->setHidden(true)
->setSummary(
pht('Hashed with other inputs to generate mail tokens.'))
->setDescription(
diff --git a/src/applications/config/option/PhabricatorSendGridConfigOptions.php b/src/applications/config/option/PhabricatorSendGridConfigOptions.php
--- a/src/applications/config/option/PhabricatorSendGridConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSendGridConfigOptions.php
@@ -25,7 +25,7 @@
->setLocked(true)
->setDescription(pht('SendGrid API username.')),
$this->newOption('sendgrid.api-key', 'string', null)
- ->setMasked(true)
+ ->setHidden(true)
->setDescription(pht('SendGrid API key.')),
);
}

File Metadata

Mime Type
text/plain
Expires
Wed, May 15, 10:45 PM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6297023
Default Alt Text
D11763.diff (9 KB)

Event Timeline

Phabricator · Built by Phacility