Merge pull request #19 from lstrojny/delivery-whitelist

stof · stof · commit d2eae9385c02 · 2012-08-29T05:25:46.000-07:00
Allow specifying delivery whitelists for the redirect plugin
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -83,6 +83,13 @@ public function getConfigTreeBuilder()
                     ->end()
                 ->end()
                 ->scalarNode('delivery_address')->end()
+            ->end()
+            ->fixXmlConfig('delivery_whitelist_pattern', 'delivery_whitelist')
+            ->children()
+                ->arrayNode('delivery_whitelist')
+                    ->prototype('scalar')
+                    ->end()
+                ->end()
                 ->booleanNode('disable_delivery')->end()
                 ->booleanNode('logging')->defaultValue($this->debug)->end()
             ->end()
diff --git a/DependencyInjection/SwiftmailerExtension.php b/DependencyInjection/SwiftmailerExtension.php
@@ -126,6 +126,7 @@ public function load(array $configs, ContainerBuilder $container)
         } else {
             $container->setParameter('swiftmailer.single_address', null);
         }
+        $container->setParameter('swiftmailer.delivery_whitelist', $config['delivery_whitelist']);
     }
 
     /**
diff --git a/Resources/config/schema/swiftmailer-1.0.xsd b/Resources/config/schema/swiftmailer-1.0.xsd
@@ -8,10 +8,11 @@
   <xsd:element name="config" type="config" />
 
   <xsd:complexType name="config">
-    <xsd:all>
-      <xsd:element name="spool" type="spool" minOccurs="0" maxOccurs="1" />
+    <xsd:sequence>
       <xsd:element name="antiflood" type="antiflood" minOccurs="0" maxOccurs="1" />
-    </xsd:all>
+      <xsd:element name="spool" type="spool" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="delivery-whitelist-pattern" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
 
     <xsd:attribute name="username" type="xsd:string" />
     <xsd:attribute name="password" type="xsd:string" />
diff --git a/Resources/config/swiftmailer.xml b/Resources/config/swiftmailer.xml
@@ -63,6 +63,7 @@
 
         <service id="swiftmailer.plugin.redirecting" class="%swiftmailer.plugin.redirecting.class%" public="false">
             <argument>%swiftmailer.single_address%</argument>
+            <argument>%swiftmailer.delivery_whitelist%</argument>
         </service>
 
         <service id="swiftmailer.plugin.antiflood" class="%swiftmailer.plugin.antiflood.class%" public="false">
diff --git a/Tests/DependencyInjection/Fixtures/config/php/antiflood.php b/Tests/DependencyInjection/Fixtures/config/php/antiflood.php
@@ -0,0 +1,4 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'antiflood' => true
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/php/empty.php b/Tests/DependencyInjection/Fixtures/config/php/empty.php
@@ -0,0 +1,2 @@
+<?php
+$container->loadFromExtension('swiftmailer', array());
diff --git a/Tests/DependencyInjection/Fixtures/config/php/full.php b/Tests/DependencyInjection/Fixtures/config/php/full.php
@@ -0,0 +1,16 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'transport'  => "smtp",
+    'username'   =>"user",
+    'password'   => "pass",
+    'host'       => "example.org",
+    'port'       => "12345",
+    'encryption' => "tls",
+    'auth-mode'  => "login",
+    'timeout'    => "1000",
+    'source_ip'  => "127.0.0.1",
+    'logging'    => true,
+    'spool' => array('type' => 'memory'),
+    'delivery_address'   => 'single@host.com',
+    'delivery_whitelist' => array('/foo@.*/', '/.*@bar.com$/'),
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/php/null.php b/Tests/DependencyInjection/Fixtures/config/php/null.php
@@ -0,0 +1,4 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'transport' => null
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/php/redirect.php b/Tests/DependencyInjection/Fixtures/config/php/redirect.php
@@ -0,0 +1,5 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'delivery_address'   => 'single@host.com',
+    'delivery_whitelist' => array('/foo@.*/', '/.*@bar.com$/'),
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/php/redirect_single.php b/Tests/DependencyInjection/Fixtures/config/php/redirect_single.php
@@ -0,0 +1,5 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'delivery_address'   => 'single@host.com',
+    'delivery_whitelist' => array('/foo@.*/'),
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/php/smtp.php b/Tests/DependencyInjection/Fixtures/config/php/smtp.php
@@ -0,0 +1,13 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'transport'  => "smtp",
+    'username'   =>"user",
+    'password'   => "pass",
+    'host'       => "example.org",
+    'port'       => "12345",
+    'encryption' => "tls",
+    'auth-mode'  => "login",
+    'timeout'    => "1000",
+    'source_ip'  => "127.0.0.1",
+    'logging'    => true,
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/php/spool.php b/Tests/DependencyInjection/Fixtures/config/php/spool.php
@@ -0,0 +1,4 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'spool' => true
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/php/spool_memory.php b/Tests/DependencyInjection/Fixtures/config/php/spool_memory.php
@@ -0,0 +1,4 @@
+<?php
+$container->loadFromExtension('swiftmailer', array(
+    'spool' => array('type' => 'memory')
+));
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/antiflood.xml b/Tests/DependencyInjection/Fixtures/config/xml/antiflood.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config>
+        <swiftmailer:antiflood/>
+    </swiftmailer:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/empty.xml b/Tests/DependencyInjection/Fixtures/config/xml/empty.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config/>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/full.xml b/Tests/DependencyInjection/Fixtures/config/xml/full.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config
+            transport="smtp"
+            username="user"
+            password="pass"
+            host="example.org"
+            port="12345"
+            encryption="tls"
+            auth-mode="login"
+            timeout="1000"
+            source-ip="127.0.0.1"
+            logging="true"
+            delivery-address="single@host.com">
+        <swiftmailer:antiflood/>
+        <swiftmailer:spool type="memory"/>
+        <swiftmailer:delivery-whitelist-pattern>/foo@.*/</swiftmailer:delivery-whitelist-pattern>
+        <swiftmailer:delivery-whitelist-pattern>/.*@bar.com$/</swiftmailer:delivery-whitelist-pattern>
+    </swiftmailer:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/null.xml b/Tests/DependencyInjection/Fixtures/config/xml/null.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config transport="null"/>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/redirect.xml b/Tests/DependencyInjection/Fixtures/config/xml/redirect.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config delivery-address="single@host.com">
+        <swiftmailer:delivery-whitelist-pattern>/foo@.*/</swiftmailer:delivery-whitelist-pattern>
+        <swiftmailer:delivery-whitelist-pattern>/.*@bar.com$/</swiftmailer:delivery-whitelist-pattern>
+    </swiftmailer:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/redirect_single.xml b/Tests/DependencyInjection/Fixtures/config/xml/redirect_single.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config delivery-address="single@host.com">
+        <swiftmailer:delivery-whitelist-pattern>/foo@.*/</swiftmailer:delivery-whitelist-pattern>
+    </swiftmailer:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/smtp.xml b/Tests/DependencyInjection/Fixtures/config/xml/smtp.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+
+    <swiftmailer:config
+            transport="smtp"
+            username="user"
+            password="pass"
+            host="example.org"
+            port="12345"
+            encryption="tls"
+            auth-mode="login"
+            timeout="1000"
+            source-ip="127.0.0.1"
+            logging="true"/>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/spool.xml b/Tests/DependencyInjection/Fixtures/config/xml/spool.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config>
+        <swiftmailer:spool/>
+    </swiftmailer:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/spool_memory.xml b/Tests/DependencyInjection/Fixtures/config/xml/spool_memory.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:swiftmailer="http://symfony.com/schema/dic/swiftmailer"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/swiftmailer http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd">
+
+    <swiftmailer:config>
+        <swiftmailer:spool type="memory"/>
+    </swiftmailer:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/antiflood.yml b/Tests/DependencyInjection/Fixtures/config/yml/antiflood.yml
@@ -0,0 +1,2 @@
+swiftmailer:
+    antiflood: true
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/empty.yml b/Tests/DependencyInjection/Fixtures/config/yml/empty.yml
@@ -0,0 +1 @@
+swiftmailer:
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/full.yml b/Tests/DependencyInjection/Fixtures/config/yml/full.yml
@@ -0,0 +1,17 @@
+swiftmailer:
+    transport:  smtp
+    username:   user
+    password:   pass
+    host:       example.org
+    port:       12345
+    encryption: tls
+    auth-mode:  login
+    timeout:    1000
+    source_ip:  127.0.0.1
+    logging:    true
+    spool:
+        type: memory
+    delivery_address: single@host.com
+    delivery_whitelist:
+        - /foo@.*/
+        - /.*@bar.com$/
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/null.yml b/Tests/DependencyInjection/Fixtures/config/yml/null.yml
@@ -0,0 +1,2 @@
+swiftmailer:
+    transport: ~
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/redirect.yml b/Tests/DependencyInjection/Fixtures/config/yml/redirect.yml
@@ -0,0 +1,5 @@
+swiftmailer:
+    delivery_address: single@host.com
+    delivery_whitelist:
+        - /foo@.*/
+        - /.*@bar.com$/
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/redirect_single.yml b/Tests/DependencyInjection/Fixtures/config/yml/redirect_single.yml
@@ -0,0 +1,4 @@
+swiftmailer:
+    delivery_address: single@host.com
+    delivery_whitelist:
+        - /foo@.*/
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/smtp.yml b/Tests/DependencyInjection/Fixtures/config/yml/smtp.yml
@@ -0,0 +1,11 @@
+swiftmailer:
+    transport:  smtp
+    username:   user
+    password:   pass
+    host:       example.org
+    port:       12345
+    encryption: tls
+    auth-mode:  login
+    timeout:    1000
+    source_ip:  127.0.0.1
+    logging:    true
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/spool.yml b/Tests/DependencyInjection/Fixtures/config/yml/spool.yml
@@ -0,0 +1,2 @@
+swiftmailer:
+    spool: true
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/spool_memory.yml b/Tests/DependencyInjection/Fixtures/config/yml/spool_memory.yml
@@ -0,0 +1,3 @@
+swiftmailer:
+    spool:
+        type: memory
diff --git a/Tests/DependencyInjection/SwiftmailerExtensionTest.php b/Tests/DependencyInjection/SwiftmailerExtensionTest.php
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ public function load(array $configs, ContainerBuilder $container)`
`126`	`126`	`} else {`
`127`	`127`	`$container->setParameter('swiftmailer.single_address', null);`
`128`	`128`	`}`
	`129`	`+ $container->setParameter('swiftmailer.delivery_whitelist', $config['delivery_whitelist']);`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`/**`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +<?php
 +$container->loadFromExtension('swiftmailer', array(
 +    'antiflood' => true
 +));
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?php`
	`2`	`+$container->loadFromExtension('swiftmailer', array());`