You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2026/06/04 12:35:24 UTC
(james-project) 09/31: [REFACTORING] Split IMAPServerStartTLSTest
This is an automated email from the ASF dual-hosted git repository.
chibenwa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1c0845c9ebc4a763e8aa11574e9b68f4a3d3c571
Author: Quan Tran <hq...@linagora.com>
AuthorDate: Thu Jun 4 14:20:03 2026 +0700
[REFACTORING] Split IMAPServerStartTLSTest
---
.../imapserver/netty/IMAPServerStartTLSTest.java | 147 +++++++++++++++++++++
.../james/imapserver/netty/IMAPServerTest.java | 103 ---------------
2 files changed, 147 insertions(+), 103 deletions(-)
diff --git a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerStartTLSTest.java b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerStartTLSTest.java
new file mode 100644
index 0000000000..9954297ec0
--- /dev/null
+++ b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerStartTLSTest.java
@@ -0,0 +1,147 @@
+/****************************************************************
+ * 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 org.apache.james.imapserver.netty;
+
+import static org.apache.james.jmap.JMAPTestingConstants.LOCALHOST_IP;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.EOFException;
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+import org.apache.commons.net.imap.IMAPReply;
+import org.apache.commons.net.imap.IMAPSClient;
+import org.apache.james.imap.processor.base.AbstractProcessor;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.read.ListAppender;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelOption;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+import reactor.netty.Connection;
+import reactor.netty.tcp.TcpClient;
+
+
+@SuppressWarnings("checkstyle:membername")
+class IMAPServerStartTLSTest extends AbstractIMAPServerTest {
+ IMAPServer imapServer;
+ private int port;
+ private Connection connection;
+ private ConcurrentLinkedDeque<String> responses;
+
+ @BeforeEach
+ void beforeEach() throws Exception {
+ imapServer = createImapServer("imapServerStartTLS.xml");
+ port = imapServer.getListenAddresses().get(0).getPort();
+ connection = TcpClient.create()
+ .noSSL()
+ .remoteAddress(() -> new InetSocketAddress(LOCALHOST_IP, port))
+ .option(ChannelOption.TCP_NODELAY, true)
+ .connectNow();
+ responses = new ConcurrentLinkedDeque<>();
+ connection.inbound().receive().asString()
+ .doOnNext(responses::addLast)
+ .subscribeOn(Schedulers.newSingle("imap-test"))
+ .subscribe();
+ }
+
+ @AfterEach
+ void tearDown() {
+ imapServer.destroy();
+ }
+
+ @Test
+ void extraLinesBatchedWithStartTLSShouldBeSanitized() throws Exception {
+ IMAPSClient imapClient = new IMAPSClient();
+ imapClient.connect("127.0.0.1", port);
+ assertThatThrownBy(() -> imapClient.sendCommand("STARTTLS\r\nA1 NOOP\r\n"))
+ .isInstanceOf(EOFException.class)
+ .hasMessage("Connection closed without indication.");
+ }
+
+ @Test
+ void extraLFLinesBatchedWithStartTLSShouldBeSanitized() throws Exception {
+ IMAPSClient imapClient = new IMAPSClient();
+ imapClient.connect("127.0.0.1", port);
+ assertThatThrownBy(() -> imapClient.sendCommand("STARTTLS\nA1 NOOP\r\n"))
+ .isInstanceOf(EOFException.class)
+ .hasMessage("Connection closed without indication.");
+ }
+
+ @Test
+ void tagsShouldBeWellSanitized() throws Exception {
+ IMAPSClient imapClient = new IMAPSClient();
+ imapClient.connect("127.0.0.1", port);
+ assertThatThrownBy(() -> imapClient.sendCommand("NOOP\r\n A1 STARTTLS\r\nA2 NOOP"))
+ .isInstanceOf(EOFException.class)
+ .hasMessage("Connection closed without indication.");
+ }
+
+ @Test
+ void lineFollowingStartTLSShouldBeSanitized() throws Exception {
+ IMAPSClient imapClient = new IMAPSClient();
+ imapClient.connect("127.0.0.1", port);
+ assertThatThrownBy(() -> imapClient.sendCommand("STARTTLS A1 NOOP\r\n"))
+ .isInstanceOf(EOFException.class)
+ .hasMessage("Connection closed without indication.");
+ }
+
+ @Test
+ void startTLSShouldFailWhenAuthenticated() throws Exception {
+ // Avoids session fixation attacks as described in https://www.usenix.org/system/files/sec21-poddebniak.pdf
+ // section 6.2
+
+ IMAPSClient imapClient = new IMAPSClient();
+ imapClient.connect("127.0.0.1", port);
+ imapClient.login(USER.asString(), USER_PASS);
+ int imapCode = imapClient.sendCommand("STARTTLS\r\n");
+
+ assertThat(imapCode).isEqualTo(IMAPReply.NO);
+ }
+
+ private void send(String format) {
+ connection.outbound()
+ .send(Mono.just(Unpooled.wrappedBuffer(format
+ .getBytes(StandardCharsets.UTF_8))))
+ .then()
+ .subscribe();
+ }
+
+ @RepeatedTest(10)
+ void concurrencyShouldNotLeadToCommandInjection() throws Exception {
+ ListAppender<ILoggingEvent> listAppender = getListAppenderForClass(AbstractProcessor.class);
+
+ send("a0 STARTTLS\r\n");
+ send("a1 NOOP\r\n");
+
+ Thread.sleep(50);
+
+ assertThat(listAppender.list)
+ .filteredOn(event -> event.getFormattedMessage().contains("Processing org.apache.james.imap.message.request.NoopRequest"))
+ .isEmpty();
+ }
+}
diff --git a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java
index 5d0d14d522..c0e8a46bcb 100644
--- a/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java
+++ b/server/protocols/protocols-imap4/src/test/java/org/apache/james/imapserver/netty/IMAPServerTest.java
@@ -34,7 +34,6 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
-import java.io.EOFException;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -73,13 +72,11 @@ import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.commons.net.imap.AuthenticatingIMAPClient;
-import org.apache.commons.net.imap.IMAPReply;
import org.apache.commons.net.imap.IMAPSClient;
import org.apache.james.core.Username;
import org.apache.james.imap.api.ConnectionCheck;
import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imap.main.DefaultImapDecoderFactory;
-import org.apache.james.imap.processor.base.AbstractProcessor;
import org.apache.james.imap.processor.fetch.FetchProcessor;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.jwt.OidcTokenFixture;
@@ -130,7 +127,6 @@ import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelOption;
import io.netty.handler.codec.compression.JdkZlibDecoder;
import io.netty.handler.codec.compression.JdkZlibEncoder;
import io.netty.handler.codec.compression.ZlibWrapper;
@@ -262,105 +258,6 @@ class IMAPServerTest {
}
- @Nested
- class StartTLS {
- IMAPServer imapServer;
- private int port;
- private Connection connection;
- private ConcurrentLinkedDeque<String> responses;
-
- @BeforeEach
- void beforeEach() throws Exception {
- imapServer = createImapServer("imapServerStartTLS.xml");
- port = imapServer.getListenAddresses().get(0).getPort();
- connection = TcpClient.create()
- .noSSL()
- .remoteAddress(() -> new InetSocketAddress(LOCALHOST_IP, port))
- .option(ChannelOption.TCP_NODELAY, true)
- .connectNow();
- responses = new ConcurrentLinkedDeque<>();
- connection.inbound().receive().asString()
- .doOnNext(responses::addLast)
- .subscribeOn(Schedulers.newSingle("imap-test"))
- .subscribe();
- }
-
- @AfterEach
- void tearDown() {
- imapServer.destroy();
- }
-
- @Test
- void extraLinesBatchedWithStartTLSShouldBeSanitized() throws Exception {
- IMAPSClient imapClient = new IMAPSClient();
- imapClient.connect("127.0.0.1", port);
- assertThatThrownBy(() -> imapClient.sendCommand("STARTTLS\r\nA1 NOOP\r\n"))
- .isInstanceOf(EOFException.class)
- .hasMessage("Connection closed without indication.");
- }
-
- @Test
- void extraLFLinesBatchedWithStartTLSShouldBeSanitized() throws Exception {
- IMAPSClient imapClient = new IMAPSClient();
- imapClient.connect("127.0.0.1", port);
- assertThatThrownBy(() -> imapClient.sendCommand("STARTTLS\nA1 NOOP\r\n"))
- .isInstanceOf(EOFException.class)
- .hasMessage("Connection closed without indication.");
- }
-
- @Test
- void tagsShouldBeWellSanitized() throws Exception {
- IMAPSClient imapClient = new IMAPSClient();
- imapClient.connect("127.0.0.1", port);
- assertThatThrownBy(() -> imapClient.sendCommand("NOOP\r\n A1 STARTTLS\r\nA2 NOOP"))
- .isInstanceOf(EOFException.class)
- .hasMessage("Connection closed without indication.");
- }
-
- @Test
- void lineFollowingStartTLSShouldBeSanitized() throws Exception {
- IMAPSClient imapClient = new IMAPSClient();
- imapClient.connect("127.0.0.1", port);
- assertThatThrownBy(() -> imapClient.sendCommand("STARTTLS A1 NOOP\r\n"))
- .isInstanceOf(EOFException.class)
- .hasMessage("Connection closed without indication.");
- }
-
- @Test
- void startTLSShouldFailWhenAuthenticated() throws Exception {
- // Avoids session fixation attacks as described in https://www.usenix.org/system/files/sec21-poddebniak.pdf
- // section 6.2
-
- IMAPSClient imapClient = new IMAPSClient();
- imapClient.connect("127.0.0.1", port);
- imapClient.login(USER.asString(), USER_PASS);
- int imapCode = imapClient.sendCommand("STARTTLS\r\n");
-
- assertThat(imapCode).isEqualTo(IMAPReply.NO);
- }
-
- private void send(String format) {
- connection.outbound()
- .send(Mono.just(Unpooled.wrappedBuffer(format
- .getBytes(StandardCharsets.UTF_8))))
- .then()
- .subscribe();
- }
-
- @RepeatedTest(10)
- void concurrencyShouldNotLeadToCommandInjection() throws Exception {
- ListAppender<ILoggingEvent> listAppender = getListAppenderForClass(AbstractProcessor.class);
-
- send("a0 STARTTLS\r\n");
- send("a1 NOOP\r\n");
-
- Thread.sleep(50);
-
- assertThat(listAppender.list)
- .filteredOn(event -> event.getFormattedMessage().contains("Processing org.apache.james.imap.message.request.NoopRequest"))
- .isEmpty();
- }
- }
@Nested
class Ssl {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org