sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27306 from nextcloud/enh/noid/set-local-domain-for-swiftmailer 

Set local domain for swiftmailer
pull/27430/head
Christoph Wurst 2021-06-08 15:43:39 +07:00 committed by GitHub
parent 662ab937e0 747325fc43
commit 745543d8c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/Mail/Mailer.php
Unescape Escape View File

@ -44,11 +44,11 @@ use OCP\IL10N;
use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\L10N\IFactory;
use OCP\Mail\Events\BeforeMessageSent;
use OCP\Mail\IAttachment;
use OCP\Mail\IEMailTemplate;
use OCP\Mail\IMailer;
use OCP\Mail\IMessage;
use OCP\Mail\Events\BeforeMessageSent;
/**
* Class Mailer provides some basic functions to create a mail message that can be used in combination with
@ -292,6 +292,15 @@ class Mailer implements IMailer {
$transport->setStreamOptions($streamingOptions);
}
$overwriteCliUrl = parse_url(
$this->config->getSystemValueString('overwrite.cli.url', ''),
PHP_URL_HOST
);
if (!empty($overwriteCliUrl)) {
$transport->setLocalDomain($overwriteCliUrl);
}
return $transport;
}

40
tests/lib/Mail/MailerTest.php
Unescape Escape View File

@ -22,8 +22,8 @@ use OCP\ILogger;
use OCP\IURLGenerator;
use OCP\L10N\IFactory;
use OCP\Mail\Events\BeforeMessageSent;
use Test\TestCase;
use Swift_SwiftException;
use Test\TestCase;
class MailerTest extends TestCase {
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
@ -218,4 +218,42 @@ class MailerTest extends TestCase {
$mailer = self::invokePrivate($this->mailer, 'getInstance');
$this->assertEquals(0, count($mailer->getTransport()->getStreamOptions()));
}
public function testLocalDomain(): void {
$this->config->method('getSystemValue')
->willReturnMap([
['mail_smtpmode', 'smtp', 'smtp']
]);
$this->config->method('getSystemValueString')
->with('overwrite.cli.url', '')
->willReturn('https://some.valid.url.com:8080');
/** @var \Swift_Mailer $mailer */
$mailer = self::invokePrivate($this->mailer, 'getInstance');
self::assertInstanceOf(\Swift_Mailer::class, $mailer);
/** @var \Swift_Transport_EsmtpTransport $transport */
$transport = $mailer->getTransport();
self::assertInstanceOf(\Swift_Transport_EsmtpTransport::class, $transport);
self::assertEquals('some.valid.url.com', $transport->getLocalDomain());
}
public function testLocalDomainInvalidUrl(): void {
$this->config->method('getSystemValue')
->willReturnMap([
['mail_smtpmode', 'smtp', 'smtp']
]);
$this->config->method('getSystemValueString')
->with('overwrite.cli.url', '')
->willReturn('https:only.slash.does.not.work:8080');
/** @var \Swift_Mailer $mailer */
$mailer = self::invokePrivate($this->mailer, 'getInstance');
self::assertInstanceOf(\Swift_Mailer::class, $mailer);
/** @var \Swift_Transport_EsmtpTransport $transport */
$transport = $mailer->getTransport();
self::assertInstanceOf(\Swift_Transport_EsmtpTransport::class, $transport);
self::assertEquals('[127.0.0.1]', $transport->getLocalDomain());
}
}