[FIX] AbstractValidRcptHandler fix error handling on invalid username (…

…apache#2122) Syntactically valid email address but invalid username. The best is to advertise "no such person here".
ops-center · Apr 30, 2024 · 51e7c76 · 51e7c76
1 parent 710fee9
commit 51e7c76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java b/...src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
@@ -48,12 +48,12 @@ public HookResult doRcpt(SMTPSession session, MaybeSender sender, MailAddress rc
                 return reject(rcpt);
             }
             return HookResult.DECLINED;
-        } catch (IllegalAccessException e) {
-            LOGGER.warn("Encounter an error upon RCPT validation ({}), deny-soft", rcpt.asString());
+        } catch (IllegalArgumentException e) {
+            LOGGER.info("Encounter an error upon RCPT validation ({}), deny", rcpt.asString());
             return HookResult.builder()
                 .hookReturnCode(HookReturnCode.deny())
-                .smtpReturnCode(SMTPRetCode.SYNTAX_ERROR_ARGUMENTS)
-                .smtpDescription(DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.DELIVERY_SYNTAX) + " Unexpected error for " + rcpt.asString())
+                .smtpReturnCode(SMTPRetCode.MAILBOX_PERM_UNAVAILABLE)
+                .smtpDescription(DSNStatus.getStatus(DSNStatus.PERMANENT, DSNStatus.ADDRESS_MAILBOX) + " Unknown user: " + rcpt.asString())
                 .build();
         } catch (Exception e) {
             LOGGER.error("Encounter an error upon RCPT validation ({}), deny-soft", rcpt.asString(), e);

diff --git a/...tocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java b/...tocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
@@ -236,4 +236,12 @@ void doRcptShouldReturnDenySoftWhenUsersRepositoryError() throws Exception {
         assertThat(rCode).isEqualTo(HookReturnCode.denySoft());
     }
 
+    @Test
+    void doRcptShouldReturnDeclineWhenInvalidUsername() throws Exception {
+        SMTPSession session = setupMockedSMTPSession(!RELAYING_ALLOWED);
+
+        HookReturnCode rCode = handler.doRcpt(session, MAYBE_SENDER, new MailAddress("\"abc@\"@localhost")).getResult();
+
+        assertThat(rCode).isEqualTo(HookReturnCode.deny());
+    }
 }