Skip to content

Set local domain for swiftmailer #27306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 1 commit into from
Jun 8, 2021
Merged

Set local domain for swiftmailer #27306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/private/Mail/Mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
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
Expand Down Expand Up @@ -293,6 +293,15 @@ protected function getSmtpInstance(): \Swift_SmtpTransport {
$transport->setStreamOptions($streamingOptions);
}

$overwriteCliUrl = parse_url(
$this->config->getSystemValueString('overwrite.cli.url', ''),
PHP_URL_HOST
);

if (!empty($overwriteCliUrl)) {
$transport->setLocalDomain($overwriteCliUrl);
}

return $transport;
}

Expand Down
40 changes: 39 additions & 1 deletion tests/lib/Mail/MailerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
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 */
Expand Down Expand Up @@ -218,4 +218,42 @@ public function testStreamingOptionsWrongType() {
$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());
}
}