upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-07 15:53:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #45793 from nextcloud/backport/45660/stable28

Browse source 
[stable28] fix(Mailer): Allow to enforce strict email format
This commit is contained in:
Ferdinand Thiessen 2024-06-11 21:22:22 +02:00 committed by GitHub
commit d1eaf26ade
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Mail/Mailer.php
View file

@ -36,6 +36,7 @@ declare(strict_types=1);
namespace OC\Mail;
use Egulias\EmailValidator\EmailValidator;
use Egulias\EmailValidator\Validation\NoRFCWarningsValidation;
use Egulias\EmailValidator\Validation\RFCValidation;
use OCP\Defaults;
use OCP\EventDispatcher\IEventDispatcher;
@ -233,8 +234,10 @@ class Mailer implements IMailer {
// Shortcut: empty addresses are never valid
return false;
}
$strictMailCheck = $this->config->getAppValue('core', 'enforce_strict_email_check', 'no') === 'yes';
$validator = new EmailValidator();
$validation = new RFCValidation();
$validation = $strictMailCheck ? new NoRFCWarningsValidation() : new RFCValidation();
return $validator->isValid($email, $validation);
}

26
tests/lib/Mail/MailerTest.php
View file

@ -42,7 +42,7 @@ class MailerTest extends TestCase {
private $l10n;
/** @var Mailer */
private $mailer;
/** @var IEventDispatcher */
/** @var IEventDispatcher&MockObject */
private $dispatcher;
@ -197,6 +197,7 @@ class MailerTest extends TestCase {
]);
$this->expectException(\Exception::class);
/** @var Message&MockObject */
$message = $this->getMockBuilder('\OC\Mail\Message')
->disableOriginalConstructor()->getMock();
$message->expects($this->once())
@ -211,20 +212,27 @@ class MailerTest extends TestCase {
*/
public function mailAddressProvider() {
return [
['lukas@owncloud.com', true],
['lukas@localhost', true],
['lukas@192.168.1.1', true],
['lukas@éxämplè.com', true],
['asdf', false],
['', false],
['lukas@owncloud.org@owncloud.com', false],
['lukas@owncloud.com', true, false],
['lukas@localhost', true, false],
['lukas@192.168.1.1', true, false],
['lukas@éxämplè.com', true, false],
['asdf', false, false],
['', false, false],
['lukas@owncloud.org@owncloud.com', false, false],
['test@localhost', true, false],
['test@localhost', false, true],
];
}
/**
* @dataProvider mailAddressProvider
*/
public function testValidateMailAddress($email, $expected) {
public function testValidateMailAddress($email, $expected, $strict) {
$this->config
->expects($this->atMost(1))
->method('getAppValue')
->with('core', 'enforce_strict_email_check')
->willReturn($strict ? 'yes' : 'no');
$this->assertSame($expected, $this->mailer->validateMailAddress($email));
}

16
tests/lib/UtilTest.php
View file

@ -91,11 +91,27 @@ class UtilTest extends \Test\TestCase {
$this->assertEquals($expected, \OC_Util::fileInfoLoaded());
}
/**
* Host is "localhost" this is a valid for emails,
* but not for default strict email verification that requires a top level domain.
* So we check that with strict email verification we fallback to the default
*/
public function testGetDefaultEmailAddress() {
$email = \OCP\Util::getDefaultEmailAddress("no-reply");
$this->assertEquals('no-reply@localhost', $email);
}
/**
* If strict email check is enabled "localhost.localdomain" should validate as a valid email domain
*/
public function testGetDefaultEmailAddressStrict() {
$config = \OC::$server->getConfig();
$config->setAppValue('core', 'enforce_strict_email_check', 'yes');
$email = \OCP\Util::getDefaultEmailAddress("no-reply");
$this->assertEquals('no-reply@localhost.localdomain', $email);
$config->deleteAppValue('core', 'enforce_strict_email_check');
}
public function testGetDefaultEmailAddressFromConfig() {
$config = \OC::$server->getConfig();
$config->setSystemValue('mail_domain', 'example.com');