swiftmailer

htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php

@@ -1,13 +1,25 @@
 <?php
 
-require dirname(__FILE__).'/../mime_types.php';
+require __DIR__.'/../mime_types.php';
 
 Swift_DependencyContainer::getInstance()
     ->register('properties.charset')
     ->asValue('utf-8')
 
-    ->register('mime.grammar')
-    ->asSharedInstanceOf('Swift_Mime_Grammar')
+    ->register('email.validator')
+    ->asSharedInstanceOf('Egulias\EmailValidator\EmailValidator')
+
+    ->register('mime.idgenerator.idright')
+    // As SERVER_NAME can come from the user in certain configurations, check that
+    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? $_SERVER['SERVER_NAME'] : 'swift.generated')
+
+    ->register('mime.idgenerator')
+    ->asSharedInstanceOf('Swift_Mime_IdGenerator')
+    ->withDependencies(array(
+        'mime.idgenerator.idright',
+    ))
 
     ->register('mime.message')
     ->asNewInstanceOf('Swift_Mime_SimpleMessage')
@@ -15,7 +27,7 @@ Swift_DependencyContainer::getInstance()
         'mime.headerset',
         'mime.qpcontentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
         'properties.charset',
     ))
 
@@ -25,7 +37,7 @@ Swift_DependencyContainer::getInstance()
         'mime.headerset',
         'mime.qpcontentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
         'properties.charset',
     ))
 
@@ -35,7 +47,7 @@ Swift_DependencyContainer::getInstance()
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
     ))
     ->addConstructorValue($swift_mime_types)
 
@@ -45,7 +57,7 @@ Swift_DependencyContainer::getInstance()
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
     ))
     ->addConstructorValue($swift_mime_types)
 
@@ -54,7 +66,7 @@ Swift_DependencyContainer::getInstance()
     ->withDependencies(array(
             'mime.qpheaderencoder',
             'mime.rfc2231encoder',
-            'mime.grammar',
+            'email.validator',
             'properties.charset',
         ))
 
@@ -93,7 +105,7 @@ Swift_DependencyContainer::getInstance()
     ->withDependencies(array('properties.charset'))
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
 
-    ->register('mime.qpcontentencoderproxy')
+    ->register('mime.qpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
     ->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
 
@@ -113,11 +125,6 @@ Swift_DependencyContainer::getInstance()
     ->register('mime.rfc2231encoder')
     ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
     ->withDependencies(array('mime.charstream'))
-
-    // As of PHP 5.4.7, the quoted_printable_encode() function behaves correctly.
-    // see https://github.com/php/php-src/commit/18bb426587d62f93c54c40bf8535eb8416603629
-    ->register('mime.qpcontentencoder')
-    ->asAliasOf(version_compare(phpversion(), '5.4.7', '>=') ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
 ;
 
 unset($swift_mime_types);

htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php

@@ -1,12 +1,19 @@
 <?php
 
 Swift_DependencyContainer::getInstance()
+    ->register('transport.localdomain')
+    // As SERVER_NAME can come from the user in certain configurations, check that
+    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) === '' ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
+
     ->register('transport.smtp')
     ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
     ->withDependencies(array(
         'transport.buffer',
         array('transport.authhandler'),
         'transport.eventdispatcher',
+        'transport.localdomain',
     ))
 
     ->register('transport.sendmail')
@@ -14,12 +21,9 @@ Swift_DependencyContainer::getInstance()
     ->withDependencies(array(
         'transport.buffer',
         'transport.eventdispatcher',
+        'transport.localdomain',
     ))
 
-    ->register('transport.mail')
-    ->asNewInstanceOf('Swift_Transport_MailTransport')
-    ->withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
-
     ->register('transport.loadbalanced')
     ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
 
@@ -34,9 +38,6 @@ Swift_DependencyContainer::getInstance()
     ->asNewInstanceOf('Swift_Transport_NullTransport')
     ->withDependencies(array('transport.eventdispatcher'))
 
-    ->register('transport.mailinvoker')
-    ->asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
-
     ->register('transport.buffer')
     ->asNewInstanceOf('Swift_Transport_StreamBuffer')
     ->withDependencies(array('transport.replacementfactory'))