fixup! smtp: complete transactions by progress state

Author: jasonish

src/app-layer-smtp.c

@@ -1018,7 +1018,17 @@ static int SMTPProcessReply(
         }
     } else if (IsReplyToCommand(state, SMTP_COMMAND_DATA)) {
         if (reply_code == SMTP_REPLY_354) {
-            SMTPSetProgressTC(state->curr_tx, SMTP_RESPONSE_DATA);
+            SMTPTransaction *tx;
+            TAILQ_FOREACH(tx, &state->tx_list, next) {
+                if (tx->progress_ts >= SMTP_REQUEST_DATA &&
+                        tx->progress_tc < SMTP_RESPONSE_DATA) {
+                    break;
+                }
+            }
+            if (tx != NULL) {
+                tx->tx_data.updated_tc = true;
+                SMTPSetProgressTC(tx, SMTP_RESPONSE_DATA);
+            }
             /* Next comes the mail for the DATA command in toserver direction */
             state->parser_state |= SMTP_PARSER_STATE_COMMAND_DATA_MODE;
         } else {
@@ -2948,6 +2958,17 @@ static int SMTPParserTest03(void)
         0x0a
     };
     uint32_t reply2_len = sizeof(reply2);
+    uint8_t request3[] =
+            ".\r\n"
+            "MAIL FROM:pipeline2@asdfs.com\r\n"
+            "RCPT TO:pipeline2@asdfs.com\r\n"
+            "DATA\r\n";
+    uint32_t request3_len = sizeof(request3) - 1;
+    uint8_t reply3[] = {
+        0x32, 0x35, 0x30, 0x20, 0x32, 0x2e, 0x30, 0x2e,
+        0x30, 0x20, 0x4f, 0x6b, 0x0d, 0x0a
+    };
+    uint32_t reply3_len = sizeof(reply3);
 
     TcpSession ssn;
     AppLayerParserThreadCtx *alp_tctx = AppLayerParserThreadCtxAlloc();
@@ -3022,20 +3043,57 @@ static int SMTPParserTest03(void)
         printf("smtp parser in inconsistent state\n");
         goto end;
     }
+    SMTPTransaction *tx0 = smtp_state->curr_tx;
+
+    r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_SMTP,
+                            STREAM_TOSERVER, request3, request3_len);
+    if (r != 0) {
+        printf("smtp check returned %" PRId32 ", expected 0: ", r);
+        goto end;
+    }
+    SMTPTransaction *tx1 = smtp_state->curr_tx;
+    if (smtp_state->cmds_cnt != 7 || smtp_state->cmds_idx != 0 ||
+            smtp_state->cmds[3] != SMTP_COMMAND_DATA_MODE ||
+            smtp_state->cmds[4] != SMTP_COMMAND_OTHER_CMD ||
+            smtp_state->cmds[5] != SMTP_COMMAND_OTHER_CMD ||
+            smtp_state->cmds[6] != SMTP_COMMAND_DATA || tx0 == tx1 ||
+            smtp_state->parser_state !=
+                    (SMTP_PARSER_STATE_FIRST_REPLY_SEEN | SMTP_PARSER_STATE_COMMAND_DATA_MODE |
+                            SMTP_PARSER_STATE_PIPELINING_SERVER)) {
+        printf("smtp parser in inconsistent state\n");
+        goto end;
+    }
 
     r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_SMTP,
                             STREAM_TOCLIENT, reply2, reply2_len);
     if (r != 0) {
         printf("smtp check returned %" PRId32 ", expected 0: ", r);
         goto end;
     }
-    if (smtp_state->cmds_cnt != 0 || smtp_state->cmds_idx != 0 ||
+    if (smtp_state->cmds_cnt != 7 || smtp_state->cmds_idx != 3 ||
             smtp_state->parser_state !=
                     (SMTP_PARSER_STATE_FIRST_REPLY_SEEN | SMTP_PARSER_STATE_COMMAND_DATA_MODE |
                             SMTP_PARSER_STATE_PIPELINING_SERVER)) {
         printf("smtp parser in inconsistent state\n");
         goto end;
     }
+    if (SMTPStateGetAlstateProgress(tx0, STREAM_TOCLIENT) != SMTP_RESPONSE_DATA ||
+            SMTPStateGetAlstateProgress(tx1, STREAM_TOCLIENT) >= SMTP_RESPONSE_DATA) {
+        printf("smtp progress in inconsistent state\n");
+        goto end;
+    }
+
+    r = AppLayerParserParse(NULL, alp_tctx, &f, ALPROTO_SMTP,
+                            STREAM_TOCLIENT, reply3, reply3_len);
+    if (r != 0) {
+        printf("smtp check returned %" PRId32 ", expected 0: ", r);
+        goto end;
+    }
+    if (smtp_state->cmds_cnt != 7 || smtp_state->cmds_idx != 4 ||
+            SMTPStateGetAlstateProgress(tx0, STREAM_TOCLIENT) != SMTP_RESPONSE_COMPLETE) {
+        printf("smtp progress in inconsistent state\n");
+        goto end;
+    }
 
     result = 1;
 end: