add: allow the test-manager to filter forwarded mails

based on config-regexes.

Change-Id: I81e26418127f5a49bd9db78e0e64035343af117c

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 2bc7bdea20d182dc50b1220a013bd0dcf728aea6..8600785bc4a9da3033342c566f6a93e59ae231d6 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -142,8 +142,20 @@ public class Manager extends Page {
 
     public static class MailFetcher extends DelegateMailProvider {
 
 
     public static class MailFetcher extends DelegateMailProvider {
 

+        Pattern[] toForward;
+

         public MailFetcher(Properties props) {
             super(props, props.getProperty("emailProvider.manager.target"));
         public MailFetcher(Properties props) {
             super(props, props.getProperty("emailProvider.manager.target"));

+            String str = props.getProperty("emailProvider.manager.filter");
+            if (str == null) {
+                toForward = new Pattern[0];
+            } else {
+                String[] parts = str.split(" ");
+                toForward = new Pattern[parts.length];
+                for (int i = 0; i < parts.length; i++) {
+                    toForward[i] = Pattern.compile(parts[i]);
+                }
+            }

         }
 
         @Override
         }
 
         @Override


@@ -159,7 +171,12 @@ public class Manager extends Page {
                 mails.put(to, hismails = new LinkedList<>());
             }
             hismails.addFirst(subject + "\n" + message);
                 mails.put(to, hismails = new LinkedList<>());
             }
             hismails.addFirst(subject + "\n" + message);

-            super.sendMail(to, subject, message, from, replyto, toname, fromname, errorsto, extra);
+            for (int i = 0; i < toForward.length; i++) {
+                if (toForward[i].matcher(to).matches()) {
+                    super.sendMail(to, subject, message, from, replyto, toname, fromname, errorsto, extra);
+                    return;
+                }
+            }

         }
 
     }
         }
 
     }