Fix EHLO domain for Versio Exim anti-spoofing and upgrade test email to formatted HTML

2026-11-02 11:39:56 +01:00
parent ab1d46e0e3
commit 72c0feb1f3
2 changed files with 27 additions and 3 deletions
@@ -47,7 +47,14 @@ return [
            'username' => env('MAIL_USERNAME'),
            'password' => env('MAIL_PASSWORD'),
            'timeout' => null,
-            'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
+            'local_domain' => env('MAIL_EHLO_DOMAIN', (function () {
+                $host = parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST);
+                if (! $host || $host === 'localhost' || $host === '127.0.0.1') {
+                    return null;
+                }
+
+                return str_starts_with($host, 'mail.') ? $host : 'mail.'.$host;
+            })()),
        ],

        'ses' => [