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/11/07 06:44:43 UTC

[james-project] 12/12: JAMES-2945 Make Sender case insensitive in SMTP

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 78fc0569b6f49c99ae2bbf0e5faf08565d445205
Author: Gautier DI FOLCO <gd...@linagora.com>
AuthorDate: Wed Oct 30 11:29:11 2019 +0100

    JAMES-2945 Make Sender case insensitive in SMTP
---
 .../core/AbstractSenderAuthIdentifyVerificationRcptHook.java | 12 +++++++-----
 .../org/apache/james/mailets/SmtpAuthIntegrationTest.java    | 11 +++++++++++
 .../smtpserver/SenderAuthIdentifyVerificationRcptHook.java   |  9 +++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
index 9265833..4a60cfc 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractSenderAuthIdentifyVerificationRcptHook.java
@@ -18,8 +18,6 @@
  ****************************************************************/
 package org.apache.james.protocols.smtp.core;
 
-import java.util.Locale;
-
 import org.apache.james.core.Domain;
 import org.apache.james.core.MailAddress;
 import org.apache.james.core.MaybeSender;
@@ -68,10 +66,10 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements
     private boolean senderMatchSessionUser(MaybeSender maybeSender, SMTPSession session) {
         Preconditions.checkArgument(!maybeSender.isNullSender());
 
-        String authUser = session.getUser().toLowerCase(Locale.US);
-        String username = getUser(maybeSender.get());
+        String authUser = session.getUser();
+        String sender = getUser(maybeSender.get());
 
-        return username.equals(authUser);
+        return isSenderAllowed(authUser, sender);
     }
 
     private boolean belongsToLocalDomain(MaybeSender maybeSender) {
@@ -94,4 +92,8 @@ public abstract class AbstractSenderAuthIdentifyVerificationRcptHook implements
      */
     protected abstract String getUser(MailAddress mailAddress);
 
+    /**
+     * Is a given sender allowed for a user
+     */
+    protected abstract boolean isSenderAllowed(String user, String sender);
 }
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
index d96391b..40c5215 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/SmtpAuthIntegrationTest.java
@@ -126,4 +126,15 @@ public class SmtpAuthIntegrationTest {
             .isFalse();
     }
 
+    @Test
+    public void mixedCaseSenderMailShouldBeDelivered() throws Exception {
+        messageSender.connect(LOCALHOST_IP, jamesServer.getProbe(SmtpGuiceProbe.class).getSmtpPort())
+            .authenticate(FROM, PASSWORD)
+            .sendMessage("FROMUSER@" + DEFAULT_DOMAIN, FROM);
+
+        imapMessageReader.connect(LOCALHOST_IP, jamesServer.getProbe(ImapGuiceProbe.class).getImapPort())
+            .login(FROM, PASSWORD)
+            .select(IMAPMessageReader.INBOX)
+            .awaitMessage(awaitAtMostOneMinute);
+    }
 }
diff --git a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
index 0de9ccf..f56ee43 100644
--- a/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
+++ b/server/protocols/protocols-smtp/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java
@@ -18,6 +18,9 @@
  ****************************************************************/
 package org.apache.james.smtpserver;
 
+import java.text.Collator;
+import java.util.Locale;
+
 import javax.inject.Inject;
 
 import org.apache.james.core.Domain;
@@ -77,4 +80,10 @@ public class SenderAuthIdentifyVerificationRcptHook extends AbstractSenderAuthId
         }
     }
 
+    @Override
+    protected boolean isSenderAllowed(String user, String sender) {
+        Collator collator = Collator.getInstance(Locale.US);
+        collator.setStrength(Collator.PRIMARY);
+        return collator.compare(user, sender) == 0;
+    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org