respect first overall negative reply in smtp pipelining

ippschi · Dec 10, 2018 · fda70cb · fda70cb
1 parent bad3f20
commit fda70cb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
@@ -655,6 +655,7 @@ private void readPipelinedResponse(Queue<String> pipelinedCommands) throws IOExc
         String responseLine;
         List<String> results = new ArrayList<>();
         NegativeSmtpReplyException firstNegativeResponse = null;
+        boolean dataCommandOk = true;
         for (String command : pipelinedCommands) {
             results.clear();
             responseLine = readCommandResponseLine(results);
@@ -663,17 +664,19 @@ private void readPipelinedResponse(Queue<String> pipelinedCommands) throws IOExc
 
             } catch (MessagingException exception) {
                 if (command.equals("DATA")) {
-                    throw exception;
+                    dataCommandOk = false;
                 }
-                if (command.startsWith("RCPT") && firstNegativeResponse == null) {
+                if (firstNegativeResponse == null) {
                     firstNegativeResponse = (NegativeSmtpReplyException) exception;
                 }
             }
         }
 
         if (firstNegativeResponse != null) {
             try {
-                executeCommand(".");
+                if (dataCommandOk) {
+                    executeCommand(".");
+                }
                 throw firstNegativeResponse;
             } catch (NegativeSmtpReplyException e) {
                 throw firstNegativeResponse;

diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java
@@ -836,8 +836,8 @@ public void sendMessagePipelining_without354ReplyforData_shouldThrow() throws Ex
             transport.sendMessage(message);
             fail("Expected exception");
         } catch (NegativeSmtpReplyException e) {
-            assertEquals(554, e.getReplyCode());
-            assertEquals("no valid recipients given", e.getReplyText());
+            assertEquals(550, e.getReplyCode());
+            assertEquals("remote mail to <user2@localhost> not allowed", e.getReplyText());
         }
 
         server.verifyConnectionClosed();