From 93e3844e38282663428ab6a02f947a58514baa07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 4 Aug 2016 21:28:34 +0200 Subject: [PATCH] add: allow the test-manager to filter forwarded mails based on config-regexes. Change-Id: I81e26418127f5a49bd9db78e0e64035343af117c --- .../org/cacert/gigi/pages/Manager.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java index 2bc7bdea..8600785b 100644 --- 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 { + Pattern[] toForward; + 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 @@ -159,7 +171,12 @@ public class Manager extends Page { 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; + } + } } } -- 2.39.2