No OneTemporary
Actions

Size

36 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	index b35b3cfb5d..e597c52897 100644
	--- a/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	+++ b/src/applications/config/check/PhabricatorExtraConfigSetupCheck.php
	@@ -1,399 +1,402 @@
	<?php

	final class PhabricatorExtraConfigSetupCheck extends PhabricatorSetupCheck {

	public function getDefaultGroup() {
	return self::GROUP_OTHER;
	}

	protected function executeChecks() {
	$ancient_config = self::getAncientConfig();

	$all_keys = PhabricatorEnv::getAllConfigKeys();
	$all_keys = array_keys($all_keys);
	sort($all_keys);

	$defined_keys = PhabricatorApplicationConfigOptions::loadAllOptions();

	foreach ($all_keys as $key) {
	if (isset($defined_keys[$key])) {
	continue;
	}

	if (isset($ancient_config[$key])) {
	$summary = pht(
	'This option has been removed. You may delete it at your '.
	'convenience.');
	$message = pht(
	"The configuration option '%s' has been removed. You may delete ".
	"it at your convenience.".
	"\n\n%s",
	$key,
	$ancient_config[$key]);
	$short = pht('Obsolete Config');
	$name = pht('Obsolete Configuration Option "%s"', $key);
	} else {
	$summary = pht('This option is not recognized. It may be misspelled.');
	$message = pht(
	"The configuration option '%s' is not recognized. It may be ".
	"misspelled, or it might have existed in an older version of ".
	"Phabricator. It has no effect, and should be corrected or deleted.",
	$key);
	$short = pht('Unknown Config');
	$name = pht('Unknown Configuration Option "%s"', $key);
	}

	$issue = $this->newIssue('config.unknown.'.$key)
	->setShortName($short)
	->setName($name)
	->setSummary($summary);

	$stack = PhabricatorEnv::getConfigSourceStack();
	$stack = $stack->getStack();

	$found = array();
	$found_local = false;
	$found_database = false;

	foreach ($stack as $source_key => $source) {
	$value = $source->getKeys(array($key));
	if ($value) {
	$found[] = $source->getName();
	if ($source instanceof PhabricatorConfigDatabaseSource) {
	$found_database = true;
	}
	if ($source instanceof PhabricatorConfigLocalSource) {
	$found_local = true;
	}
	}
	}

	$message = $message."\n\n".pht(
	'This configuration value is defined in these %d '.
	'configuration source(s): %s.',
	count($found),
	implode(', ', $found));
	$issue->setMessage($message);

	if ($found_local) {
	$command = csprintf('phabricator/ $ ./bin/config delete %s', $key);
	$issue->addCommand($command);
	}

	if ($found_database) {
	$issue->addPhabricatorConfig($key);
	}
	}
	}

	/**
	* Return a map of deleted config options. Keys are option keys; values are
	* explanations of what happened to the option.
	*/
	public static function getAncientConfig() {
	$reason_auth = pht(
	'This option has been migrated to the "Auth" application. Your old '.
	'configuration is still in effect, but now stored in "Auth" instead of '.
	'configuration. Going forward, you can manage authentication from '.
	'the web UI.');

	$auth_config = array(
	'controller.oauth-registration',
	'auth.password-auth-enabled',
	'facebook.auth-enabled',
	'facebook.registration-enabled',
	'facebook.auth-permanent',
	'facebook.application-id',
	'facebook.application-secret',
	'facebook.require-https-auth',
	'github.auth-enabled',
	'github.registration-enabled',
	'github.auth-permanent',
	'github.application-id',
	'github.application-secret',
	'google.auth-enabled',
	'google.registration-enabled',
	'google.auth-permanent',
	'google.application-id',
	'google.application-secret',
	'ldap.auth-enabled',
	'ldap.hostname',
	'ldap.port',
	'ldap.base_dn',
	'ldap.search_attribute',
	'ldap.search-first',
	'ldap.username-attribute',
	'ldap.real_name_attributes',
	'ldap.activedirectory_domain',
	'ldap.version',
	'ldap.referrals',
	'ldap.anonymous-user-name',
	'ldap.anonymous-user-password',
	'ldap.start-tls',
	'disqus.auth-enabled',
	'disqus.registration-enabled',
	'disqus.auth-permanent',
	'disqus.application-id',
	'disqus.application-secret',
	'phabricator.oauth-uri',
	'phabricator.auth-enabled',
	'phabricator.registration-enabled',
	'phabricator.auth-permanent',
	'phabricator.application-id',
	'phabricator.application-secret',
	);

	$ancient_config = array_fill_keys($auth_config, $reason_auth);

	$markup_reason = pht(
	'Custom remarkup rules are now added by subclassing '.
	'%s or %s.',
	'PhabricatorRemarkupCustomInlineRule',
	'PhabricatorRemarkupCustomBlockRule');

	$session_reason = pht(
	'Sessions now expire and are garbage collected rather than having an '.
	'arbitrary concurrency limit.');

	$differential_field_reason = pht(
	'All Differential fields are now managed through the configuration '.
	'option "%s". Use that option to configure which fields are shown.',
	'differential.fields');

	$reply_domain_reason = pht(
	'Individual application reply handler domains have been removed. '.
	'Configure a reply domain with "%s".',
	'metamta.reply-handler-domain');

	$reply_handler_reason = pht(
	'Reply handlers can no longer be overridden with configuration.');

	$monospace_reason = pht(
	'Phabricator no longer supports global customization of monospaced '.
	'fonts.');

	$public_mail_reason = pht(
	'Inbound mail addresses are now configured for each application '.
	'in the Applications tool.');

	$gc_reason = pht(
	'Garbage collectors are now configured with "%s".',
	'bin/garbage set-policy');

	$aphlict_reason = pht(
	'Configuration of the notification server has changed substantially. '.
	'For discussion, see T10794.');

	$stale_reason = pht(
	'The Differential revision list view age UI elements have been removed '.
	'to simplify the interface.');

	$global_settings_reason = pht(
	'The "Re: Prefix" and "Vary Subjects" settings are now configured '.
	'in global settings.');

	$dashboard_reason = pht(
	'This option has been removed, you can use Dashboards to provide '.
	'homepage customization. See T11533 for more details.');

	$elastic_reason = pht(
	'Elasticsearch is now configured with "%s".',
	'cluster.search');

	$mailers_reason = pht(
	'Inbound and outbound mail is now configured with "cluster.mailers".');

	$ancient_config += array(
	'phid.external-loaders' =>
	pht(
	'External loaders have been replaced. Extend `%s` '.
	'to implement new PHID and handle types.',
	'PhabricatorPHIDType'),
	'maniphest.custom-task-extensions-class' =>
	pht(
	'Maniphest fields are now loaded automatically. '.
	'You can configure them with `%s`.',
	'maniphest.fields'),
	'maniphest.custom-fields' =>
	pht(
	'Maniphest fields are now defined in `%s`. '.
	'Existing definitions have been migrated.',
	'maniphest.custom-field-definitions'),
	'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.'),
	'differential.anonymous-access' => pht(
	'Phabricator now has meaningful global access controls. See `%s`.',
	'policy.allow-public'),
	'celerity.resource-path' => pht(
	'An alternate resource map is no longer supported. Instead, use '.
	'multiple maps. See T4222.'),
	'metamta.send-immediately' => pht(
	'Mail is now always delivered by the daemons.'),
	'auth.sessions.conduit' => $session_reason,
	'auth.sessions.web' => $session_reason,
	'tokenizer.ondemand' => pht(
	'Phabricator now manages typeahead strategies automatically.'),
	'differential.revision-custom-detail-renderer' => pht(
	'Obsolete; use standard rendering events instead.'),
	'differential.show-host-field' => $differential_field_reason,
	'differential.show-test-plan-field' => $differential_field_reason,
	'differential.field-selector' => $differential_field_reason,
	'phabricator.show-beta-applications' => pht(
	'This option has been renamed to `%s` to emphasize the '.
	'unfinished nature of many prototype applications. '.
	'Your existing setting has been migrated.',
	'phabricator.show-prototypes'),
	'notification.user' => pht(
	'The notification server no longer requires root permissions. Start '.
	'the server as the user you want it to run under.'),
	'notification.debug' => pht(
	'Notifications no longer have a dedicated debugging mode.'),
	'translation.provider' => pht(
	'The translation implementation has changed and providers are no '.
	'longer used or supported.'),
	'config.mask' => pht(
	'Use `%s` instead of this option.',
	'config.hide'),
	'phd.start-taskmasters' => pht(
	'Taskmasters now use an autoscaling pool. You can configure the '.
	'pool size with `%s`.',
	'phd.taskmasters'),
	'storage.engine-selector' => pht(
	'Phabricator now automatically discovers available storage engines '.
	'at runtime.'),
	'storage.upload-size-limit' => pht(
	'Phabricator now supports arbitrarily large files. Consult the '.
	'documentation for configuration details.'),
	'security.allow-outbound-http' => pht(
	'This option has been replaced with the more granular option `%s`.',
	'security.outbound-blacklist'),
	'metamta.reply.show-hints' => pht(
	'Phabricator no longer shows reply hints in mail.'),

	'metamta.differential.reply-handler-domain' => $reply_domain_reason,
	'metamta.diffusion.reply-handler-domain' => $reply_domain_reason,
	'metamta.macro.reply-handler-domain' => $reply_domain_reason,
	'metamta.maniphest.reply-handler-domain' => $reply_domain_reason,
	'metamta.pholio.reply-handler-domain' => $reply_domain_reason,

	'metamta.diffusion.reply-handler' => $reply_handler_reason,
	'metamta.differential.reply-handler' => $reply_handler_reason,
	'metamta.maniphest.reply-handler' => $reply_handler_reason,
	'metamta.package.reply-handler' => $reply_handler_reason,

	'metamta.precedence-bulk' => pht(
	'Phabricator now always sends transaction mail with '.
	'"Precedence: bulk" to improve deliverability.'),

	'style.monospace' => $monospace_reason,
	'style.monospace.windows' => $monospace_reason,

	'search.engine-selector' => pht(
	'Phabricator now automatically discovers available search engines '.
	'at runtime.'),

	'metamta.files.public-create-email' => $public_mail_reason,
	'metamta.maniphest.public-create-email' => $public_mail_reason,
	'metamta.maniphest.default-public-author' => $public_mail_reason,
	'metamta.paste.public-create-email' => $public_mail_reason,

	'security.allow-conduit-act-as-user' => pht(
	'Impersonating users over the API is no longer supported.'),

	'feed.public' => pht('The framable public feed is no longer supported.'),

	'auth.login-message' => pht(
	'This configuration option has been replaced with a modular '.
	'handler. See T9346.'),

	'gcdaemon.ttl.herald-transcripts' => $gc_reason,
	'gcdaemon.ttl.daemon-logs' => $gc_reason,
	'gcdaemon.ttl.differential-parse-cache' => $gc_reason,
	'gcdaemon.ttl.markup-cache' => $gc_reason,
	'gcdaemon.ttl.task-archive' => $gc_reason,
	'gcdaemon.ttl.general-cache' => $gc_reason,
	'gcdaemon.ttl.conduit-logs' => $gc_reason,

	'phd.variant-config' => pht(
	'This configuration is no longer relevant because daemons '.
	'restart automatically on configuration changes.'),

	'notification.ssl-cert' => $aphlict_reason,
	'notification.ssl-key' => $aphlict_reason,
	'notification.pidfile' => $aphlict_reason,
	'notification.log' => $aphlict_reason,
	'notification.enabled' => $aphlict_reason,
	'notification.client-uri' => $aphlict_reason,
	'notification.server-uri' => $aphlict_reason,

	'metamta.differential.unified-comment-context' => pht(
	'Inline comments are now always rendered with a limited amount '.
	'of context.'),

	'differential.days-fresh' => $stale_reason,
	'differential.days-stale' => $stale_reason,

	'metamta.re-prefix' => $global_settings_reason,
	'metamta.vary-subjects' => $global_settings_reason,

	'ui.custom-header' => pht(
	'This option has been replaced with `ui.logo`, which provides more '.
	'flexible configuration options.'),

	'welcome.html' => $dashboard_reason,
	'maniphest.priorities.unbreak-now' => $dashboard_reason,
	'maniphest.priorities.needs-triage' => $dashboard_reason,

	'mysql.implementation' => pht(
	'Phabricator now automatically selects the best available '.
	'MySQL implementation.'),

	'mysql.configuration-provider' => pht(
	'Phabricator now has application-level management of partitioning '.
	'and replicas.'),

	'search.elastic.host' => $elastic_reason,
	'search.elastic.namespace' => $elastic_reason,

	'metamta.mail-adapter' => $mailers_reason,
	'amazon-ses.access-key' => $mailers_reason,
	'amazon-ses.secret-key' => $mailers_reason,
	'amazon-ses.endpoint' => $mailers_reason,
	'mailgun.domain' => $mailers_reason,
	'mailgun.api-key' => $mailers_reason,
	'phpmailer.mailer' => $mailers_reason,
	'phpmailer.smtp-host' => $mailers_reason,
	'phpmailer.smtp-port' => $mailers_reason,
	'phpmailer.smtp-protocol' => $mailers_reason,
	'phpmailer.smtp-user' => $mailers_reason,
	'phpmailer.smtp-password' => $mailers_reason,
	'phpmailer.smtp-encoding' => $mailers_reason,
	'sendgrid.api-user' => $mailers_reason,
	'sendgrid.api-key' => $mailers_reason,

	'celerity.resource-hash' => pht(
	'This option generally did not prove useful. Resource hash keys '.
	'are now managed automatically.'),
	'celerity.enable-deflate' => pht(
	'Resource deflation is now managed automatically.'),
	'celerity.minify' => pht(
	'Resource minification is now managed automatically.'),

	'metamta.domain' => pht(
	'Mail thread IDs are now generated automatically.'),
	'metamta.placeholder-to-recipient' => pht(
	'Placeholder recipients are now generated automatically.'),

	'metamta.mail-key' => pht(
	'Mail object address hash keys are now generated automatically.'),

	'phabricator.csrf-key' => pht(
	'CSRF HMAC keys are now managed automatically.'),
	+
	+ 'metamta.insecure-auth-with-reply-to' => pht(
	+ 'Authenticating users based on "Reply-To" is no longer supported.'),
	);

	return $ancient_config;
	}

	}
	diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
	index 7b13303b51..c5d9cf027b 100644
	--- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
	+++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php
	@@ -1,299 +1,291 @@
	<?php

	final class PhabricatorMetaMTAConfigOptions
	extends PhabricatorApplicationConfigOptions {

	public function getName() {
	return pht('Mail');
	}

	public function getDescription() {
	return pht('Configure Mail.');
	}

	public function getIcon() {
	return 'fa-send';
	}

	public function getGroup() {
	return 'core';
	}

	public function getOptions() {
	$send_as_user_desc = $this->deformat(pht(<<<EODOC
	When a user takes an action which generates an email notification (like
	commenting on a Differential revision), Phabricator can either send that mail
	"From" the user's email address (like "alincoln@logcabin.com") or "From" the
	'%s' address.

	The user experience is generally better if Phabricator uses the user's real
	address as the "From" since the messages are easier to organize when they appear
	in mail clients, but this will only work if the server is authorized to send
	email on behalf of the "From" domain. Practically, this means:

	- If you are doing an install for Example Corp and all the users will have
	corporate @corp.example.com addresses and any hosts Phabricator is running
	on are authorized to send email from corp.example.com, you can enable this
	to make the user experience a little better.
	- If you are doing an install for an open source project and your users will
	be registering via Facebook and using personal email addresses, you probably
	should not enable this or all of your outgoing email might vanish into SFP
	blackholes.
	- If your install is anything else, you're safer leaving this off, at least
	initially, since the risk in turning it on is that your outgoing mail will
	never arrive.
	EODOC
	,
	'metamta.default-address'));

	$one_mail_per_recipient_desc = $this->deformat(pht(<<<EODOC
	When a message is sent to multiple recipients (for example, several reviewers on
	a code review), Phabricator can either deliver one email to everyone (e.g., "To:
	alincoln, usgrant, htaft") or separate emails to each user (e.g., "To:
	alincoln", "To: usgrant", "To: htaft"). The major advantages and disadvantages
	of each approach are:

	- One mail to everyone:
	- This violates policy controls. The body of the mail is generated without
	respect for object policies.
	- Recipients can see To/Cc at a glance.
	- If you use mailing lists, you won't get duplicate mail if you're
	a normal recipient and also Cc'd on a mailing list.
	- Getting threading to work properly is harder, and probably requires
	making mail less useful by turning off options.
	- Sometimes people will "Reply All", which can send mail to too many
	recipients. Phabricator will try not to send mail to users who already
	received a similar message, but can not prevent all stray email arising
	from "Reply All".
	- Not supported with a private reply-to address.
	- Mail messages are sent in the server default translation.
	- Mail that must be delivered over secure channels will leak the recipient
	list in the "To" and "Cc" headers.
	- One mail to each user:
	- Policy controls work correctly and are enforced per-user.
	- Recipients need to look in the mail body to see To/Cc.
	- If you use mailing lists, recipients may sometimes get duplicate
	mail.
	- Getting threading to work properly is easier, and threading settings
	can be customzied by each user.
	- "Reply All" will never send extra mail to other users involved in the
	thread.
	- Required if private reply-to addresses are configured.
	- Mail messages are sent in the language of user preference.

	EODOC
	));

	$reply_hints_description = $this->deformat(pht(<<<EODOC
	You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer
	smaller messages. The actions themselves will still work properly.
	EODOC
	));

	$recipient_hints_description = $this->deformat(pht(<<<EODOC
	You can disable the "To:" and "Cc:" footers in mail if users prefer smaller
	messages.
	EODOC
	));

	$email_preferences_description = $this->deformat(pht(<<<EODOC
	You can disable the email preference link in emails if users prefer smaller
	emails.
	EODOC
	));

	$re_prefix_description = $this->deformat(pht(<<<EODOC
	Mail.app on OS X Lion won't respect threading headers unless the subject is
	prefixed with "Re:". If you enable this option, Phabricator will add "Re:" to
	the subject line of all mail which is expected to thread. If you've set
	'metamta.one-mail-per-recipient', users can override this setting in their
	preferences.
	EODOC
	));

	$vary_subjects_description = $this->deformat(pht(<<<EODOC
	If true, allow MetaMTA to change mail subjects to put text like '[Accepted]' and
	'[Commented]' in them. This makes subjects more useful, but might break
	threading on some clients. If you've set '%s', users can override this setting
	in their preferences.
	EODOC
	,
	'metamta.one-mail-per-recipient'));

	$reply_to_description = $this->deformat(pht(<<<EODOC
	If you enable `%s`, Phabricator uses "From" to authenticate users. You can
	additionally enable this setting to try to authenticate with 'Reply-To'. Note
	that this is completely spoofable and insecure (any user can set any 'Reply-To'
	address) but depending on the nature of your install or other deliverability
	conditions this might be okay. Generally, you can't do much more by spoofing
	Reply-To than be annoying (you can write but not read content). But this is
	still COMPLETELY INSECURE.
	EODOC
	,
	'metamta.public-replies'));

	$adapter_description = $this->deformat(pht(<<<EODOC
	Adapter class to use to transmit mail to the MTA. The default uses
	PHPMailerLite, which will invoke "sendmail". This is appropriate if sendmail
	actually works on your host, but if you haven't configured mail it may not be so
	great. A number of other mailers are available (e.g., SES, SendGrid, SMTP,
	custom mailers). This option is deprecated in favor of 'cluster.mailers'.
	EODOC
	));

	$public_replies_description = $this->deformat(pht(<<<EODOC
	By default, Phabricator generates unique reply-to addresses and sends a separate
	email to each recipient when you enable reply handling. This is more secure than
	using "From" to establish user identity, but can mean users may receive multiple
	emails when they are on mailing lists. Instead, you can use a single, non-unique
	reply to address and authenticate users based on the "From" address by setting
	this to 'true'. This trades away a little bit of security for convenience, but
	it's reasonable in many installs. Object interactions are still protected using
	hashes in the single public email address, so objects can not be replied to
	blindly.
	EODOC
	));

	$single_description = $this->deformat(pht(<<<EODOC
	If you want to use a single mailbox for Phabricator reply mail, you can use this
	and set a common prefix for reply addresses generated by Phabricator. It will
	make use of the fact that a mail-address such as
	`phabricator+D123+1hjk213h@example.com` will be delivered to the `phabricator`
	user's mailbox. Set this to the left part of the email address and it will be
	prepended to all generated reply addresses.

	For example, if you want to use `phabricator@example.com`, this should be set
	to `phabricator`.
	EODOC
	));

	$address_description = $this->deformat(pht(<<<EODOC
	When email is sent, what format should Phabricator use for user's email
	addresses? Valid values are:

	- `short`: 'gwashington <gwashington@example.com>'
	- `real`: 'George Washington <gwashington@example.com>'
	- `full`: 'gwashington (George Washington) <gwashington@example.com>'

	The default is `full`.
	EODOC
	));

	$mailers_description = $this->deformat(pht(<<<EODOC
	Define one or more mail transmission services. For help with configuring
	mailers, see [[ %s \| %s ]] in the documentation.
	EODOC
	,
	PhabricatorEnv::getDoclink('Configuring Outbound Email'),
	pht('Configuring Outbound Email')));

	return array(
	$this->newOption('cluster.mailers', 'cluster.mailers', null)
	->setHidden(true)
	->setDescription($mailers_description),
	$this->newOption(
	'metamta.default-address',
	'string',
	'noreply@phabricator.example.com')
	->setDescription(pht('Default "From" address.')),
	$this->newOption(
	'metamta.one-mail-per-recipient',
	'bool',
	true)
	->setLocked(true)
	->setBoolOptions(
	array(
	pht('Send Mail To Each Recipient'),
	pht('Send Mail To All Recipients'),
	))
	->setSummary(
	pht(
	'Controls whether Phabricator sends one email with multiple '.
	'recipients in the "To:" line, or multiple emails, each with a '.
	'single recipient in the "To:" line.'))
	->setDescription($one_mail_per_recipient_desc),
	$this->newOption('metamta.can-send-as-user', 'bool', false)
	->setBoolOptions(
	array(
	pht('Send as User Taking Action'),
	pht('Send as Phabricator'),
	))
	->setSummary(
	pht(
	'Controls whether Phabricator sends email "From" users.'))
	->setDescription($send_as_user_desc),
	$this->newOption(
	'metamta.reply-handler-domain',
	'string',
	null)
	->setLocked(true)
	->setDescription(pht('Domain used for reply email addresses.'))
	->addExample('phabricator.example.com', ''),
	$this->newOption('metamta.recipients.show-hints', 'bool', true)
	->setBoolOptions(
	array(
	pht('Show Recipient Hints'),
	pht('No Recipient Hints'),
	))
	->setSummary(pht('Show "To:" and "Cc:" footer hints in email.'))
	->setDescription($recipient_hints_description),
	$this->newOption('metamta.email-preferences', 'bool', true)
	->setBoolOptions(
	array(
	pht('Show Email Preferences Link'),
	pht('No Email Preferences Link'),
	))
	->setSummary(pht('Show email preferences link in email.'))
	->setDescription($email_preferences_description),
	- $this->newOption('metamta.insecure-auth-with-reply-to', 'bool', false)
	- ->setBoolOptions(
	- array(
	- pht('Allow Insecure Reply-To Auth'),
	- pht('Disallow Reply-To Auth'),
	- ))
	- ->setSummary(pht('Trust "Reply-To" headers for authentication.'))
	- ->setDescription($reply_to_description),
	$this->newOption('metamta.public-replies', 'bool', false)
	->setBoolOptions(
	array(
	pht('Use Public Replies (Less Secure)'),
	pht('Use Private Replies (More Secure)'),
	))
	->setSummary(
	pht(
	'Phabricator can use less-secure but mailing list friendly public '.
	'reply addresses.'))
	->setDescription($public_replies_description),
	$this->newOption('metamta.single-reply-handler-prefix', 'string', null)
	->setSummary(
	pht('Allow Phabricator to use a single mailbox for all replies.'))
	->setDescription($single_description),
	$this->newOption('metamta.user-address-format', 'enum', 'full')
	->setEnumOptions(
	array(
	'short' => pht('Short'),
	'real' => pht('Real'),
	'full' => pht('Full'),
	))
	->setSummary(pht('Control how Phabricator renders user names in mail.'))
	->setDescription($address_description)
	->addExample('gwashington <gwashington@example.com>', 'short')
	->addExample('George Washington <gwashington@example.com>', 'real')
	->addExample(
	'gwashington (George Washington) <gwashington@example.com>',
	'full'),
	$this->newOption('metamta.email-body-limit', 'int', 524288)
	->setDescription(
	pht(
	'You can set a limit for the maximum byte size of outbound mail. '.
	'Mail which is larger than this limit will be truncated before '.
	'being sent. This can be useful if your MTA rejects mail which '.
	'exceeds some limit (this is reasonably common). Specify a value '.
	'in bytes.'))
	->setSummary(pht('Global cap for size of generated emails (bytes).'))
	->addExample(524288, pht('Truncate at 512KB'))
	->addExample(1048576, pht('Truncate at 1MB')),
	);
	}

	}
	diff --git a/src/applications/metamta/receiver/PhabricatorMailReceiver.php b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
	index f7f22d6131..b8fa148534 100644
	--- a/src/applications/metamta/receiver/PhabricatorMailReceiver.php
	+++ b/src/applications/metamta/receiver/PhabricatorMailReceiver.php
	@@ -1,215 +1,190 @@
	<?php

	abstract class PhabricatorMailReceiver extends Phobject {

	private $applicationEmail;

	public function setApplicationEmail(
	PhabricatorMetaMTAApplicationEmail $email) {
	$this->applicationEmail = $email;
	return $this;
	}

	public function getApplicationEmail() {
	return $this->applicationEmail;
	}

	abstract public function isEnabled();
	abstract public function canAcceptMail(PhabricatorMetaMTAReceivedMail $mail);
	final protected function canAcceptApplicationMail(
	PhabricatorApplication $app,
	PhabricatorMetaMTAReceivedMail $mail) {

	$application_emails = id(new PhabricatorMetaMTAApplicationEmailQuery())
	->setViewer($this->getViewer())
	->withApplicationPHIDs(array($app->getPHID()))
	->execute();

	foreach ($mail->newTargetAddresses() as $address) {
	foreach ($application_emails as $application_email) {
	$create_address = $application_email->newAddress();
	if (PhabricatorMailUtil::matchAddresses($create_address, $address)) {
	$this->setApplicationEmail($application_email);
	return true;
	}
	}
	}

	return false;
	}


	abstract protected function processReceivedMail(
	PhabricatorMetaMTAReceivedMail $mail,
	PhabricatorUser $sender);

	final public function receiveMail(
	PhabricatorMetaMTAReceivedMail $mail,
	PhabricatorUser $sender) {
	$this->processReceivedMail($mail, $sender);
	}

	public function getViewer() {
	return PhabricatorUser::getOmnipotentUser();
	}

	public function validateSender(
	PhabricatorMetaMTAReceivedMail $mail,
	PhabricatorUser $sender) {

	$failure_reason = null;
	if ($sender->getIsDisabled()) {
	$failure_reason = pht(
	'Your account (%s) is disabled, so you can not interact with '.
	'Phabricator over email.',
	$sender->getUsername());
	} else if ($sender->getIsStandardUser()) {
	if (!$sender->getIsApproved()) {
	$failure_reason = pht(
	'Your account (%s) has not been approved yet. You can not interact '.
	'with Phabricator over email until your account is approved.',
	$sender->getUsername());
	} else if (PhabricatorUserEmail::isEmailVerificationRequired() &&
	!$sender->getIsEmailVerified()) {
	$failure_reason = pht(
	'You have not verified the email address for your account (%s). '.
	'You must verify your email address before you can interact '.
	'with Phabricator over email.',
	$sender->getUsername());
	}
	}

	if ($failure_reason) {
	throw new PhabricatorMetaMTAReceivedMailProcessingException(
	MetaMTAReceivedMailStatus::STATUS_DISABLED_SENDER,
	$failure_reason);
	}
	}

	/**
	* Identifies the sender's user account for a piece of received mail. Note
	* that this method does not validate that the sender is who they say they
	* are, just that they've presented some credential which corresponds to a
	* recognizable user.
	*/
	public function loadSender(PhabricatorMetaMTAReceivedMail $mail) {
	$raw_from = $mail->getHeader('From');
	$from = self::getRawAddress($raw_from);

	$reasons = array();

	// Try to find a user with this email address.
	$user = PhabricatorUser::loadOneWithEmailAddress($from);
	if ($user) {
	return $user;
	} else {
	$reasons[] = pht(
	'This email was sent from "%s", but that address is not recognized by '.
	'Phabricator and does not correspond to any known user account.',
	$raw_from);
	}

	- // If we missed on "From", try "Reply-To" if we're configured for it.
	- $raw_reply_to = $mail->getHeader('Reply-To');
	- if (strlen($raw_reply_to)) {
	- $reply_to_key = 'metamta.insecure-auth-with-reply-to';
	- $allow_reply_to = PhabricatorEnv::getEnvConfig($reply_to_key);
	- if ($allow_reply_to) {
	- $reply_to = self::getRawAddress($raw_reply_to);
	-
	- $user = PhabricatorUser::loadOneWithEmailAddress($reply_to);
	- if ($user) {
	- return $user;
	- } else {
	- $reasons[] = pht(
	- 'Phabricator is configured to authenticate users using the '.
	- '"Reply-To" header, but the reply address ("%s") on this '.
	- 'message does not correspond to any known user account.',
	- $raw_reply_to);
	- }
	- } else {
	- $reasons[] = pht(
	- '(Phabricator is not configured to authenticate users using the '.
	- '"Reply-To" header, so it was ignored.)');
	- }
	- }
	-
	// If we don't know who this user is, load or create an external user
	// account for them if we're configured for it.
	$email_key = 'phabricator.allow-email-users';
	$allow_email_users = PhabricatorEnv::getEnvConfig($email_key);
	if ($allow_email_users) {
	$from_obj = new PhutilEmailAddress($from);
	$xuser = id(new PhabricatorExternalAccountQuery())
	->setViewer($this->getViewer())
	->withAccountTypes(array('email'))
	->withAccountDomains(array($from_obj->getDomainName(), 'self'))
	->withAccountIDs(array($from_obj->getAddress()))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->loadOneOrCreate();
	return $xuser->getPhabricatorUser();
	} else {
	// NOTE: Currently, we'll always drop this mail (since it's headed to
	// an unverified recipient). See T12237. These details are still useful
	// because they'll appear in the mail logs and Mail web UI.

	$reasons[] = pht(
	'Phabricator is also not configured to allow unknown external users '.
	'to send mail to the system using just an email address.');
	$reasons[] = pht(
	'To interact with Phabricator, add this address ("%s") to your '.
	'account.',
	$raw_from);
	}

	if ($this->getApplicationEmail()) {
	$application_email = $this->getApplicationEmail();
	$default_user_phid = $application_email->getConfigValue(
	PhabricatorMetaMTAApplicationEmail::CONFIG_DEFAULT_AUTHOR);

	if ($default_user_phid) {
	$user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$default_user_phid);
	if ($user) {
	return $user;
	}

	$reasons[] = pht(
	'Phabricator is misconfigured: the application email '.
	'"%s" is set to user "%s", but that user does not exist.',
	$application_email->getAddress(),
	$default_user_phid);
	}
	}

	$reasons = implode("\n\n", $reasons);

	throw new PhabricatorMetaMTAReceivedMailProcessingException(
	MetaMTAReceivedMailStatus::STATUS_UNKNOWN_SENDER,
	$reasons);
	}

	/**
	* Reduce an email address to its canonical form. For example, an address
	* like:
	*
	* "Abraham Lincoln" < ALincoln@example.com >
	*
	* ...will be reduced to:
	*
	* alincoln@example.com
	*
	* @param string Email address in noncanonical form.
	* @return string Canonical email address.
	*/
	public static function getRawAddress($address) {
	$address = id(new PhutilEmailAddress($address))->getAddress();
	return trim(phutil_utf8_strtolower($address));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 16:25 (2 w, 6 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1126452
Default Alt Text: (36 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions