You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/03/25 08:04:07 UTC
[syncope] branch 2_0_X updated: Upgrading GreenMail
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new b67c84a Upgrading GreenMail
b67c84a is described below
commit b67c84ab3cdc84698eaf96c5fd60d7e1c4ba5bd8
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Mar 25 09:01:10 2019 +0100
Upgrading GreenMail
---
.../greenmail/smtp/InterruptableGreenMail.java | 330 ---------------------
.../greenmail/util/InterruptableGreenMail.java | 54 ++++
.../fit/buildtools/GreenMailStartStopListener.java | 2 +-
.../fit/buildtools/cxf/GreenMailServiceImpl.java | 2 +-
pom.xml | 2 +-
5 files changed, 57 insertions(+), 333 deletions(-)
diff --git a/fit/build-tools/src/main/java/com/icegreen/greenmail/smtp/InterruptableGreenMail.java b/fit/build-tools/src/main/java/com/icegreen/greenmail/smtp/InterruptableGreenMail.java
deleted file mode 100644
index 33387f0..0000000
--- a/fit/build-tools/src/main/java/com/icegreen/greenmail/smtp/InterruptableGreenMail.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package com.icegreen.greenmail.smtp;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-import com.icegreen.greenmail.Managers;
-import com.icegreen.greenmail.configuration.ConfiguredGreenMail;
-import com.icegreen.greenmail.configuration.GreenMailConfiguration;
-import com.icegreen.greenmail.imap.ImapHostManager;
-import com.icegreen.greenmail.imap.ImapServer;
-import com.icegreen.greenmail.pop3.Pop3Server;
-import com.icegreen.greenmail.server.AbstractServer;
-import com.icegreen.greenmail.store.FolderException;
-import com.icegreen.greenmail.store.InMemoryStore;
-import com.icegreen.greenmail.store.MailFolder;
-import com.icegreen.greenmail.store.StoredMessage;
-import com.icegreen.greenmail.user.GreenMailUser;
-import com.icegreen.greenmail.user.UserException;
-import com.icegreen.greenmail.util.GreenMail;
-import com.icegreen.greenmail.util.GreenMailUtil;
-import com.icegreen.greenmail.util.ServerSetup;
-import com.icegreen.greenmail.util.ServerSetupTest;
-import com.icegreen.greenmail.util.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Utility class that manages a greenmail server with support for multiple protocols.
- */
-public class InterruptableGreenMail extends ConfiguredGreenMail {
-
- protected static final Logger LOG = LoggerFactory.getLogger(GreenMail.class);
-
- protected Managers managers;
-
- protected Map<String, AbstractServer> services;
-
- protected ServerSetup[] config;
-
- /**
- * Creates a SMTP, SMTPS, POP3, POP3S, IMAP, and IMAPS server binding onto non-default ports.
- * The ports numbers are defined in {@link ServerSetupTest}
- */
- public InterruptableGreenMail() {
- this(ServerSetupTest.ALL);
- }
-
- /**
- * Call this constructor if you want to run one of the email servers only
- *
- * @param config Server setup to use
- */
- public InterruptableGreenMail(final ServerSetup config) {
- this(new ServerSetup[] { config });
- }
-
- /**
- * Call this constructor if you want to run more than one of the email servers
- *
- * @param config Server setup to use
- */
- public InterruptableGreenMail(final ServerSetup[] config) {
- this.config = config;
- init();
- }
-
- /**
- * Initialize
- */
- protected void init() {
- if (managers == null) {
- managers = new Managers();
- }
- if (services == null) {
- services = createServices(config, managers);
- }
- }
-
- @Override
- public synchronized void start() {
- init();
-
- final Collection<AbstractServer> servers = services.values();
- for (AbstractServer service : servers) {
- service.startService();
- }
-
- // Wait till all services are up and running
- for (AbstractServer service : servers) {
- try {
- service.waitTillRunning(service.getServerSetup().getServerStartupTimeout());
- } catch (InterruptedException ex) {
- Thread.currentThread().interrupt();
- throw new IllegalStateException("Could not start mail service " + service, ex);
- }
-
- }
-
- LOG.debug("Started services, performing check if all up");
- // Make sure if all services are up in a second loop, giving slow services more time.
- for (AbstractServer service : servers) {
- if (!service.isRunning()) {
- throw new IllegalStateException("Could not start mail server " + service
- + ", try to set server startup timeout > " + service.getServerSetup().getServerStartupTimeout()
- + " via " + ServerSetup.class.getSimpleName() + ".setServerStartupTimeout(timeoutInMs) or "
- + "-Dgreenmail.startup.timeout");
- }
- }
-
- doConfigure();
- }
-
- @Override
- public synchronized void stop() {
- LOG.debug("Stopping GreenMail ...");
-
- if (services != null) {
- for (Service service : services.values()) {
- LOG.debug("Stopping service {}", service);
- service.stopService();
- }
- }
- managers = new Managers();
- services = null;
- }
-
- @Override
- public void reset() {
- stop();
- start();
- }
-
- /**
- * Create the required services according to the server setup
- *
- * @param config Service configuration
- * @param mgr Service manager
- * @return Services map
- */
- protected Map<String, AbstractServer> createServices(final ServerSetup[] config, final Managers mgr) {
- Map<String, AbstractServer> srvc = new HashMap<>();
- for (ServerSetup setup : config) {
- if (srvc.containsKey(setup.getProtocol())) {
- throw new IllegalArgumentException("Server '" + setup.getProtocol()
- + "' was found at least twice in the array");
- }
- final String protocol = setup.getProtocol();
- if (protocol.startsWith(ServerSetup.PROTOCOL_SMTP)) {
- srvc.put(protocol, new InterruptableSmtpServer(setup, mgr));
- } else if (protocol.startsWith(ServerSetup.PROTOCOL_POP3)) {
- srvc.put(protocol, new Pop3Server(setup, mgr));
- } else if (protocol.startsWith(ServerSetup.PROTOCOL_IMAP)) {
- srvc.put(protocol, new ImapServer(setup, mgr));
- }
- }
- return srvc;
- }
-
- @Override
- public SmtpServer getSmtp() {
- return (SmtpServer) services.get(ServerSetup.PROTOCOL_SMTP);
- }
-
- @Override
- public ImapServer getImap() {
- return (ImapServer) services.get(ServerSetup.PROTOCOL_IMAP);
-
- }
-
- @Override
- public Pop3Server getPop3() {
- return (Pop3Server) services.get(ServerSetup.PROTOCOL_POP3);
- }
-
- @Override
- public SmtpServer getSmtps() {
- return (SmtpServer) services.get(ServerSetup.PROTOCOL_SMTPS);
- }
-
- @Override
- public ImapServer getImaps() {
- return (ImapServer) services.get(ServerSetup.PROTOCOL_IMAPS);
-
- }
-
- @Override
- public Pop3Server getPop3s() {
- return (Pop3Server) services.get(ServerSetup.PROTOCOL_POP3S);
- }
-
- @Override
- public Managers getManagers() {
- return managers;
- }
-
- //~ Convenience Methods, often needed while testing ---------------------------------------------------------------
- @Override
- public boolean waitForIncomingEmail(final long timeout, final int emailCount) {
- final CountDownLatch waitObject = managers.getSmtpManager().createAndAddNewWaitObject(emailCount);
- final long endTime = System.currentTimeMillis() + timeout;
- while (waitObject.getCount() > 0) {
- final long waitTime = endTime - System.currentTimeMillis();
- if (waitTime < 0L) {
- return waitObject.getCount() == 0;
- }
- try {
- waitObject.await(waitTime, TimeUnit.MILLISECONDS);
- } catch (InterruptedException e) {
- // Continue loop, in case of premature interruption
- }
- }
- return waitObject.getCount() == 0;
- }
-
- @Override
- public boolean waitForIncomingEmail(final int emailCount) {
- return waitForIncomingEmail(5000L, emailCount);
- }
-
- @Override
- public MimeMessage[] getReceivedMessages() {
- List<StoredMessage> msgs = managers.getImapHostManager().getAllMessages();
- MimeMessage[] ret = new MimeMessage[msgs.size()];
- for (int i = 0; i < msgs.size(); i++) {
- StoredMessage storedMessage = msgs.get(i);
- ret[i] = storedMessage.getMimeMessage();
- }
- return ret;
- }
-
- @Deprecated
- @Override
- public MimeMessage[] getReceviedMessagesForDomain(final String domain) {
- return getReceivedMessagesForDomain(domain);
- }
-
- @Override
- public MimeMessage[] getReceivedMessagesForDomain(final String domain) {
- List<StoredMessage> msgs = managers.getImapHostManager().getAllMessages();
- List<MimeMessage> ret = new ArrayList<>();
- try {
- for (StoredMessage msg : msgs) {
- String tos = GreenMailUtil.getAddressList(msg.getMimeMessage().getAllRecipients());
- if (tos.toLowerCase().contains(domain)) {
- ret.add(msg.getMimeMessage());
- }
- }
- } catch (MessagingException e) {
- throw new RuntimeException(e);
- }
- return ret.toArray(new MimeMessage[ret.size()]);
- }
-
- @Override
- public GreenMailUser setUser(final String login, final String password) {
- return setUser(login, login, password);
- }
-
- @Override
- public GreenMailUser setUser(final String email, final String login, final String password) {
- GreenMailUser user = managers.getUserManager().getUser(login);
- if (null == user) {
- try {
- user = managers.getUserManager().createUser(email, login, password);
- } catch (UserException e) {
- throw new RuntimeException(e);
- }
- } else {
- user.setPassword(password);
- }
- return user;
- }
-
- @Override
- public void setQuotaSupported(final boolean isEnabled) {
- managers.getImapHostManager().getStore().setQuotaSupported(isEnabled);
- }
-
- @Override
- public void setUsers(final Properties users) {
- for (Object o : users.keySet()) {
- String email = (String) o;
- String password = users.getProperty(email);
- setUser(email, email, password);
- }
- }
-
- @Override
- public InterruptableGreenMail withConfiguration(final GreenMailConfiguration config) {
- // Just overriding to return more specific type
- super.withConfiguration(config);
- return this;
- }
-
- @Override
- public void purgeEmailFromAllMailboxes() throws FolderException {
- ImapHostManager imaphost = getManagers().getImapHostManager();
- InMemoryStore store = (InMemoryStore) imaphost.getStore();
- Collection<MailFolder> mailboxes = store.listMailboxes("*");
- for (MailFolder folder : mailboxes) {
- folder.deleteAllMessages();
- }
- }
-}
diff --git a/fit/build-tools/src/main/java/com/icegreen/greenmail/util/InterruptableGreenMail.java b/fit/build-tools/src/main/java/com/icegreen/greenmail/util/InterruptableGreenMail.java
new file mode 100644
index 0000000..101708e
--- /dev/null
+++ b/fit/build-tools/src/main/java/com/icegreen/greenmail/util/InterruptableGreenMail.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.icegreen.greenmail.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.icegreen.greenmail.Managers;
+import com.icegreen.greenmail.imap.ImapServer;
+import com.icegreen.greenmail.pop3.Pop3Server;
+import com.icegreen.greenmail.server.AbstractServer;
+import com.icegreen.greenmail.smtp.InterruptableSmtpServer;
+
+public class InterruptableGreenMail extends GreenMail {
+
+ public InterruptableGreenMail(final ServerSetup[] config) {
+ super(config);
+ }
+
+ @Override
+ protected Map<String, AbstractServer> createServices(final ServerSetup[] config, final Managers mgr) {
+ Map<String, AbstractServer> srvc = new HashMap<>();
+ for (ServerSetup setup : config) {
+ if (srvc.containsKey(setup.getProtocol())) {
+ throw new IllegalArgumentException("Server '" + setup.getProtocol()
+ + "' was found at least twice in the array");
+ }
+ final String protocol = setup.getProtocol();
+ if (protocol.startsWith(ServerSetup.PROTOCOL_SMTP)) {
+ srvc.put(protocol, new InterruptableSmtpServer(setup, mgr));
+ } else if (protocol.startsWith(ServerSetup.PROTOCOL_POP3)) {
+ srvc.put(protocol, new Pop3Server(setup, mgr));
+ } else if (protocol.startsWith(ServerSetup.PROTOCOL_IMAP)) {
+ srvc.put(protocol, new ImapServer(setup, mgr));
+ }
+ }
+ return srvc;
+ }
+}
diff --git a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/GreenMailStartStopListener.java b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/GreenMailStartStopListener.java
index dfd71f3..abc396a 100644
--- a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/GreenMailStartStopListener.java
+++ b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/GreenMailStartStopListener.java
@@ -18,7 +18,7 @@
*/
package org.apache.syncope.fit.buildtools;
-import com.icegreen.greenmail.smtp.InterruptableGreenMail;
+import com.icegreen.greenmail.util.InterruptableGreenMail;
import com.icegreen.greenmail.util.ServerSetup;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
diff --git a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/GreenMailServiceImpl.java b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/GreenMailServiceImpl.java
index e7a34be..56e7655 100644
--- a/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/GreenMailServiceImpl.java
+++ b/fit/build-tools/src/main/java/org/apache/syncope/fit/buildtools/cxf/GreenMailServiceImpl.java
@@ -20,7 +20,7 @@ package org.apache.syncope.fit.buildtools.cxf;
import javax.ws.rs.core.Context;
import org.apache.cxf.jaxrs.ext.MessageContext;
-import com.icegreen.greenmail.smtp.InterruptableGreenMail;
+import com.icegreen.greenmail.util.InterruptableGreenMail;
import org.apache.syncope.fit.buildtools.GreenMailStartStopListener;
import com.icegreen.greenmail.smtp.InterruptableSmtpServer;
import org.slf4j.Logger;
diff --git a/pom.xml b/pom.xml
index a13f107..189d900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1207,7 +1207,7 @@ under the License.
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
- <version>1.5.9</version>
+ <version>1.5.10</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>