This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 95f818f593e8b3d0b446dd21d2c3689ea9f8b725 Author: Gary Gregory <[email protected]> AuthorDate: Thu Jul 2 14:33:11 2026 +0000 Sort members --- src/main/java/org/apache/commons/net/ftp/FTP.java | 14 +++++++------- .../java/org/apache/commons/net/imap/IMAPTest.java | 8 ++++---- .../net/io/DotTerminatedMessageWriterTest.java | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/commons/net/ftp/FTP.java b/src/main/java/org/apache/commons/net/ftp/FTP.java index 2beebb0e..4245387d 100644 --- a/src/main/java/org/apache/commons/net/ftp/FTP.java +++ b/src/main/java/org/apache/commons/net/ftp/FTP.java @@ -191,6 +191,13 @@ public class FTP extends SocketClient { private static final String MODES = "AEILNTCFRPSBCZ"; + private static void checkCRLF(final String command, final String args) { + if (command != null && (command.indexOf('\r') >= 0 || command.indexOf('\n') >= 0) + || args != null && (args.indexOf('\r') >= 0 || args.indexOf('\n') >= 0)) { + throw new IllegalArgumentException("Commands and arguments cannot contain CR or LF characters"); + } + } + /** * The last FTP reply code. */ @@ -427,13 +434,6 @@ public class FTP extends SocketClient { return sendCommand(FTPCmd.APPE, path); } - private static void checkCRLF(final String command, final String args) { - if (command != null && (command.indexOf('\r') >= 0 || command.indexOf('\n') >= 0) - || args != null && (args.indexOf('\r') >= 0 || args.indexOf('\n') >= 0)) { - throw new IllegalArgumentException("Commands and arguments cannot contain CR or LF characters"); - } - } - private String buildMessage(final String command, final String args) { final StringBuilder builder = new StringBuilder(command); if (args != null) { diff --git a/src/test/java/org/apache/commons/net/imap/IMAPTest.java b/src/test/java/org/apache/commons/net/imap/IMAPTest.java index 51751efd..1193ec0a 100644 --- a/src/test/java/org/apache/commons/net/imap/IMAPTest.java +++ b/src/test/java/org/apache/commons/net/imap/IMAPTest.java @@ -90,13 +90,13 @@ class IMAPTest { } @Test - void testQuoteMailboxNameRejectsLineFeed() { - assertThrows(IllegalArgumentException.class, () -> IMAP.quoteMailboxName("INBOX\nA001 DELETE Sent")); + void testQuoteMailboxNameRejectsCarriageReturn() { + assertThrows(IllegalArgumentException.class, () -> IMAP.quoteMailboxName("INBOX\r\nA001 DELETE Sent")); } @Test - void testQuoteMailboxNameRejectsCarriageReturn() { - assertThrows(IllegalArgumentException.class, () -> IMAP.quoteMailboxName("INBOX\r\nA001 DELETE Sent")); + void testQuoteMailboxNameRejectsLineFeed() { + assertThrows(IllegalArgumentException.class, () -> IMAP.quoteMailboxName("INBOX\nA001 DELETE Sent")); } @Test diff --git a/src/test/java/org/apache/commons/net/io/DotTerminatedMessageWriterTest.java b/src/test/java/org/apache/commons/net/io/DotTerminatedMessageWriterTest.java index 2889d9fd..7f54c763 100644 --- a/src/test/java/org/apache/commons/net/io/DotTerminatedMessageWriterTest.java +++ b/src/test/java/org/apache/commons/net/io/DotTerminatedMessageWriterTest.java @@ -26,14 +26,6 @@ import org.junit.jupiter.api.Test; class DotTerminatedMessageWriterTest { - private String write(final String message) throws IOException { - final StringWriter sw = new StringWriter(); - try (DotTerminatedMessageWriter writer = new DotTerminatedMessageWriter(sw)) { - writer.write(message); - } - return sw.toString(); - } - @Test void testDoubleLeadingDotOnFirstLine() throws IOException { // A leading dot on the first line must be doubled, otherwise it is @@ -42,6 +34,11 @@ class DotTerminatedMessageWriterTest { assertEquals("..hidden\r\n.\r\n", write(".hidden")); } + @Test + void testDoubleLeadingDotOnLaterLine() throws IOException { + assertEquals("a\r\n..b\r\n.\r\n", write("a\r\n.b")); + } + @Test void testFirstLineDotCannotTerminateEarly() throws IOException { // "." CR LF as the first line would otherwise end the message and let the @@ -49,8 +46,11 @@ class DotTerminatedMessageWriterTest { assertEquals("..\r\nINJECT\r\n.\r\n", write(".\r\nINJECT")); } - @Test - void testDoubleLeadingDotOnLaterLine() throws IOException { - assertEquals("a\r\n..b\r\n.\r\n", write("a\r\n.b")); + private String write(final String message) throws IOException { + final StringWriter sw = new StringWriter(); + try (DotTerminatedMessageWriter writer = new DotTerminatedMessageWriter(sw)) { + writer.write(message); + } + return sw.toString(); } }
