You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/06/25 01:52:46 UTC
[james-project] 04/05: JAMES-2294 FactoriseSimple IMAP SMTP
WebAdmin module
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 85e0b01db9d03964adb8339eac5c933567ffba7e
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jun 21 14:20:53 2019 +0700
JAMES-2294 FactoriseSimple IMAP SMTP WebAdmin module
---
.../java/org/apache/james/MemoryJamesServerMain.java | 16 ++++++++++++++++
.../org/apache/james/mailets/TemporaryJamesServer.java | 1 +
.../james/transport/mailets/DlpIntegrationTest.java | 15 +--------------
.../mailets/MailReprocessingIntegrationTest.java | 17 ++---------------
4 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
index 1e53751..18f4394 100644
--- a/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
+++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/MemoryJamesServerMain.java
@@ -19,7 +19,10 @@
package org.apache.james;
+import java.util.Optional;
+
import org.apache.commons.configuration.DefaultConfigurationBuilder;
+import org.apache.james.jwt.JwtConfiguration;
import org.apache.james.modules.BlobExportMechanismModule;
import org.apache.james.modules.BlobMemoryModule;
import org.apache.james.modules.MailboxModule;
@@ -50,6 +53,9 @@ import org.apache.james.modules.spamassassin.SpamAssassinListenerModule;
import org.apache.james.modules.vault.DeletedMessageVaultModule;
import org.apache.james.modules.vault.DeletedMessageVaultRoutesModule;
import org.apache.james.server.core.configuration.Configuration;
+import org.apache.james.webadmin.WebAdminConfiguration;
+import org.apache.james.webadmin.authentication.AuthenticationFilter;
+import org.apache.james.webadmin.authentication.NoAuthenticationFilter;
import com.google.inject.Module;
import com.google.inject.util.Modules;
@@ -67,6 +73,16 @@ public class MemoryJamesServerMain {
new DLPRoutesModule(),
new SieveRoutesModule());
+
+ public static final JwtConfiguration NO_JWT_CONFIGURATION = new JwtConfiguration(Optional.empty());
+
+ public static final Module WEBADMIN_NO_AUTH_MODULE = Modules.combine(binder -> binder.bind(JwtConfiguration.class).toInstance(NO_JWT_CONFIGURATION),
+ binder -> binder.bind(AuthenticationFilter.class).to(NoAuthenticationFilter.class),
+ binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION));
+
+ public static final Module WEBADMIN_TESTING = Modules.override(WEBADMIN)
+ .with(WEBADMIN_NO_AUTH_MODULE);
+
public static final Module PROTOCOLS = Modules.combine(
new IMAPServerModule(),
new LMTPServerModule(),
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
index a1a7905..f940a29 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java
@@ -61,6 +61,7 @@ public class TemporaryJamesServer {
.putProcessor(CommonProcessors.error())
.putProcessor(CommonProcessors.transport());
+
public static class Builder {
private ImmutableList.Builder<Module> overrideModules;
private Optional<Module> module;
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
index 581d964..5b8575b 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/DlpIntegrationTest.java
@@ -28,11 +28,8 @@ import static org.apache.james.mailets.configuration.Constants.RECIPIENT;
import static org.apache.james.mailets.configuration.Constants.RECIPIENT2;
import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute;
-import java.util.Optional;
-
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.core.builder.MimeMessageBuilder;
-import org.apache.james.jwt.JwtConfiguration;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.MailetConfiguration;
import org.apache.james.mailets.configuration.MailetContainer;
@@ -45,10 +42,7 @@ import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.IMAPMessageReader;
import org.apache.james.utils.SMTPMessageSender;
import org.apache.james.utils.WebAdminGuiceProbe;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.WebAdminUtils;
-import org.apache.james.webadmin.authentication.AuthenticationFilter;
-import org.apache.james.webadmin.authentication.NoAuthenticationFilter;
import org.apache.mailet.base.test.FakeMail;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.After;
@@ -62,7 +56,6 @@ import io.restassured.specification.RequestSpecification;
public class DlpIntegrationTest {
public static final String REPOSITORY_PREFIX = "file://var/mail/dlp/quarantine/";
- public static final JwtConfiguration NO_JWT_CONFIGURATION = new JwtConfiguration(Optional.empty());
@Rule
public TemporaryFolder folder = new TemporaryFolder();
@@ -86,13 +79,7 @@ public class DlpIntegrationTest {
.mailet(Null.class)));
jamesServer = TemporaryJamesServer.builder()
- .withBase(Modules.override(
- MemoryJamesServerMain.SMTP_AND_IMAP_MODULE,
- MemoryJamesServerMain.WEBADMIN)
- .with(
- binder -> binder.bind(JwtConfiguration.class).toInstance(NO_JWT_CONFIGURATION),
- binder -> binder.bind(AuthenticationFilter.class).to(NoAuthenticationFilter.class),
- binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .withBase(Modules.combine(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE, MemoryJamesServerMain.WEBADMIN_TESTING))
.withMailetContainer(mailets)
.build(folder);
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
index 002f458..d77a618 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/MailReprocessingIntegrationTest.java
@@ -31,11 +31,8 @@ import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMin
import static org.apache.james.mailets.configuration.ProcessorConfiguration.STATE_TRANSPORT;
import static org.assertj.core.api.Assertions.assertThat;
-import java.util.Optional;
-
import org.apache.james.MemoryJamesServerMain;
import org.apache.james.core.builder.MimeMessageBuilder;
-import org.apache.james.jwt.JwtConfiguration;
import org.apache.james.mailets.TemporaryJamesServer;
import org.apache.james.mailets.configuration.MailetConfiguration;
import org.apache.james.mailets.configuration.MailetContainer;
@@ -47,10 +44,7 @@ import org.apache.james.transport.matchers.All;
import org.apache.james.utils.DataProbeImpl;
import org.apache.james.utils.SMTPMessageSender;
import org.apache.james.utils.WebAdminGuiceProbe;
-import org.apache.james.webadmin.WebAdminConfiguration;
import org.apache.james.webadmin.WebAdminUtils;
-import org.apache.james.webadmin.authentication.AuthenticationFilter;
-import org.apache.james.webadmin.authentication.NoAuthenticationFilter;
import org.apache.mailet.base.test.FakeMail;
import org.junit.After;
import org.junit.Before;
@@ -65,7 +59,6 @@ import io.restassured.specification.RequestSpecification;
public class MailReprocessingIntegrationTest {
private static final MailRepositoryUrl REPOSITORY_A = MailRepositoryUrl.from("file://var/mail/a");
private static final MailRepositoryUrl REPOSITORY_B = MailRepositoryUrl.from("file://var/mail/b");
- private static final JwtConfiguration NO_JWT_CONFIGURATION = new JwtConfiguration(Optional.empty());
@Rule
public TemporaryFolder folder = new TemporaryFolder();
@@ -92,13 +85,7 @@ public class MailReprocessingIntegrationTest {
.addProperty("repositoryPath", REPOSITORY_B.asString())));
jamesServer = TemporaryJamesServer.builder()
- .withBase(Modules.override(
- MemoryJamesServerMain.SMTP_AND_IMAP_MODULE,
- MemoryJamesServerMain.WEBADMIN)
- .with(
- binder -> binder.bind(JwtConfiguration.class).toInstance(NO_JWT_CONFIGURATION),
- binder -> binder.bind(AuthenticationFilter.class).to(NoAuthenticationFilter.class),
- binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION)))
+ .withBase(Modules.combine(MemoryJamesServerMain.SMTP_AND_IMAP_MODULE, MemoryJamesServerMain.WEBADMIN_TESTING))
.withMailetContainer(mailets)
.build(folder);
@@ -210,7 +197,7 @@ public class MailReprocessingIntegrationTest {
.param("action", "reprocess")
.param("queue", MailQueueFactory.SPOOL)
.param("processor", "unknown")
- .patch("/mailRepositories/" + REPOSITORY_B.getPath().urlEncoded() + "/mails").prettyPeek();
+ .patch("/mailRepositories/" + REPOSITORY_B.getPath().urlEncoded() + "/mails");
// Then I can move it to repository A
awaitAtMostOneMinute.until(() -> containsExactlyOneMail(ERROR_REPOSITORY));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org