Skip to content

Commit 1de72d0

Browse files
committed
Mail: updated peer verify option name and added test
1 parent f2293a7 commit 1de72d0

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

.env.example.complete

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ MAIL_PORT=1025
7979
MAIL_USERNAME=null
8080
MAIL_PASSWORD=null
8181
MAIL_ENCRYPTION=null
82-
MAIL_VERIFY_PEER=true
82+
MAIL_VERIFY_SSL=true
8383

8484
# Command to use when email is sent via sendmail
8585
MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs"

app/Config/mail.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
3333
'username' => env('MAIL_USERNAME'),
3434
'password' => env('MAIL_PASSWORD'),
35-
'verify_peer' => env('MAIL_VERIFY_PEER', true),
35+
'verify_peer' => env('MAIL_VERIFY_SSL', true),
3636
'timeout' => null,
3737
'local_domain' => env('MAIL_EHLO_DOMAIN'),
3838
],

phpunit.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<server name="DB_CONNECTION" value="mysql_testing"/>
2828
<server name="BCRYPT_ROUNDS" value="4"/>
2929
<server name="MAIL_DRIVER" value="array"/>
30+
<server name="MAIL_VERIFY_SSL" value="true"/>
3031
<server name="LOG_CHANNEL" value="single"/>
3132
<server name="AUTH_METHOD" value="standard"/>
3233
<server name="AUTH_AUTO_INITIATE" value="false"/>

tests/Unit/ConfigTest.php

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
namespace Tests\Unit;
44

55
use Illuminate\Support\Facades\Log;
6+
use Illuminate\Support\Facades\Mail;
7+
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
68
use Tests\TestCase;
79

810
/**
@@ -96,11 +98,30 @@ public function test_snappy_paper_size_options_are_limited()
9698
$this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'snappy.pdf.options.page-size', 'A4');
9799
}
98100

99-
public function test_sendmail_command_is_configurage()
101+
public function test_sendmail_command_is_configurable()
100102
{
101103
$this->checkEnvConfigResult('MAIL_SENDMAIL_COMMAND', '/var/sendmail -o', 'mail.mailers.sendmail.path', '/var/sendmail -o');
102104
}
103105

106+
public function test_mail_disable_ssl_verification_alters_mailer()
107+
{
108+
$getStreamOptions = function (): array {
109+
/** @var EsmtpTransport $transport */
110+
$transport = Mail::mailer('smtp')->getSymfonyTransport();
111+
return $transport->getStream()->getStreamOptions();
112+
};
113+
114+
$this->assertEmpty($getStreamOptions());
115+
116+
117+
$this->runWithEnv('MAIL_VERIFY_SSL', 'false', function () use ($getStreamOptions) {
118+
$options = $getStreamOptions();
119+
$this->assertArrayHasKey('ssl', $options);
120+
$this->assertFalse($options['ssl']['verify_peer']);
121+
$this->assertFalse($options['ssl']['verify_peer_name']);
122+
});
123+
}
124+
104125
/**
105126
* Set an environment variable of the given name and value
106127
* then check the given config key to see if it matches the given result.

0 commit comments

Comments
 (0)