Merge branch 'feature/mail-verify-peer' into development
This commit is contained in:
		
						commit
						58cadce052
					
				| 
						 | 
				
			
			@ -83,6 +83,7 @@ MAIL_PORT=1025
 | 
			
		|||
MAIL_USERNAME=null
 | 
			
		||||
MAIL_PASSWORD=null
 | 
			
		||||
MAIL_ENCRYPTION=null
 | 
			
		||||
MAIL_VERIFY_SSL=true
 | 
			
		||||
 | 
			
		||||
# Command to use when email is sent via sendmail
 | 
			
		||||
MAIL_SENDMAIL_COMMAND="/usr/sbin/sendmail -bs"
 | 
			
		||||
| 
						 | 
				
			
			@ -383,4 +384,4 @@ LOG_FAILED_LOGIN_CHANNEL=errorlog_plain_webserver
 | 
			
		|||
# IP address '146.191.42.4' would result in '146.191.x.x' being logged.
 | 
			
		||||
# For the IPv6 address '2001:db8:85a3:8d3:1319:8a2e:370:7348' this would result as:
 | 
			
		||||
# '2001:db8:85a3:8d3:x:x:x:x'
 | 
			
		||||
IP_ADDRESS_PRECISION=4
 | 
			
		||||
IP_ADDRESS_PRECISION=4
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,6 +32,7 @@ return [
 | 
			
		|||
            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
 | 
			
		||||
            'username' => env('MAIL_USERNAME'),
 | 
			
		||||
            'password' => env('MAIL_PASSWORD'),
 | 
			
		||||
            'verify_peer' => env('MAIL_VERIFY_SSL', true),
 | 
			
		||||
            'timeout' => null,
 | 
			
		||||
            'local_domain' => env('MAIL_EHLO_DOMAIN'),
 | 
			
		||||
        ],
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -27,6 +27,7 @@
 | 
			
		|||
    <server name="DB_CONNECTION" value="mysql_testing"/>
 | 
			
		||||
    <server name="BCRYPT_ROUNDS" value="4"/>
 | 
			
		||||
    <server name="MAIL_DRIVER" value="array"/>
 | 
			
		||||
    <server name="MAIL_VERIFY_SSL" value="true"/>
 | 
			
		||||
    <server name="LOG_CHANNEL" value="single"/>
 | 
			
		||||
    <server name="AUTH_METHOD" value="standard"/>
 | 
			
		||||
    <server name="AUTH_AUTO_INITIATE" value="false"/>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,6 +3,8 @@
 | 
			
		|||
namespace Tests\Unit;
 | 
			
		||||
 | 
			
		||||
use Illuminate\Support\Facades\Log;
 | 
			
		||||
use Illuminate\Support\Facades\Mail;
 | 
			
		||||
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
 | 
			
		||||
use Tests\TestCase;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
| 
						 | 
				
			
			@ -96,11 +98,30 @@ class ConfigTest extends TestCase
 | 
			
		|||
        $this->checkEnvConfigResult('EXPORT_PAGE_SIZE', 'a4', 'snappy.pdf.options.page-size', 'A4');
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public function test_sendmail_command_is_configurage()
 | 
			
		||||
    public function test_sendmail_command_is_configurable()
 | 
			
		||||
    {
 | 
			
		||||
        $this->checkEnvConfigResult('MAIL_SENDMAIL_COMMAND', '/var/sendmail -o', 'mail.mailers.sendmail.path', '/var/sendmail -o');
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    public function test_mail_disable_ssl_verification_alters_mailer()
 | 
			
		||||
    {
 | 
			
		||||
        $getStreamOptions = function (): array {
 | 
			
		||||
            /** @var EsmtpTransport $transport */
 | 
			
		||||
            $transport = Mail::mailer('smtp')->getSymfonyTransport();
 | 
			
		||||
            return $transport->getStream()->getStreamOptions();
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        $this->assertEmpty($getStreamOptions());
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        $this->runWithEnv('MAIL_VERIFY_SSL', 'false', function () use ($getStreamOptions) {
 | 
			
		||||
            $options = $getStreamOptions();
 | 
			
		||||
            $this->assertArrayHasKey('ssl', $options);
 | 
			
		||||
            $this->assertFalse($options['ssl']['verify_peer']);
 | 
			
		||||
            $this->assertFalse($options['ssl']['verify_peer_name']);
 | 
			
		||||
        });
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Set an environment variable of the given name and value
 | 
			
		||||
     * then check the given config key to see if it matches the given result.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue