(james-project) 01/02: JAMES-4038 EHLO: IPV6 check should not be case sensitive

[rcordier]

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit 563f2fb62e8d74c512cc04cc846d3b790ecbb00f
Author: Quan Tran <hqt...@linagora.com>
AuthorDate: Thu Nov 7 13:47:29 2024 +0700

    JAMES-4038 EHLO: IPV6 check should not be case sensitive
---
 .../org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java    | 3 ++-
 .../src/test/java/org/apache/james/smtpserver/SMTPServerTest.java     | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
 
b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
index a68ba17e30..85ade34463 100644
--- 
a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
+++ 
b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
@@ -21,6 +21,7 @@ package org.apache.james.protocols.smtp.core.esmtp;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 import jakarta.inject.Inject;
 
@@ -132,7 +133,7 @@ public class EhloCmdHandler extends 
AbstractHookableCmdHandler<HeloHook> impleme
     }
 
     private static String removeEmIPV6Prefix(String ipv6) {
-        if (ipv6.startsWith("IPv6:")) {
+        if (ipv6.toLowerCase(Locale.US).startsWith("ipv6:")) {
             ipv6 = ipv6.substring(5);
         }
         return ipv6;
diff --git 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
index 147a3d097f..ecd1458f84 100644
--- 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
+++ 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
@@ -536,7 +536,9 @@ public class SMTPServerTest {
     @ParameterizedTest
     @ValueSource(strings = {"good", "127.0.0.1", "adomain.com", 
"sub.domain.com", "[abc.def]", "[124.54.67.43]",
         "fe80::1ff:fe23:4567:890a", "[fe80::1ff:fe23:4567:890a]",
-        "2001:db8:85a3:8d3:1319:8a2e:370:7348", 
"[2001:db8:85a3:8d3:1319:8a2e:370:7348]"})
+        "2001:db8:85a3:8d3:1319:8a2e:370:7348", 
"[2001:db8:85a3:8d3:1319:8a2e:370:7348]",
+        "IPV6:2a01:cb06:b841:bf5d:38ff:861a:1646:ab00", 
"ipv6:2a01:cb06:b841:bf5d:38ff:861a:1646:ab00",
+        "[IPV6:2a01:cb06:b841:bf5d:38ff:861a:1646:ab00]", 
"[ipv6:2a01:cb06:b841:bf5d:38ff:861a:1646:ab00]"})
     public void testValidEHLO(String helo) throws Exception {
         init(smtpConfiguration);
 


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org