Merge pull request #664 from RUB-NDS/better_starttls

removed unnecessary starttls exchanges

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/StarttlsMessage.java

@@ -14,8 +14,6 @@ public enum StarttlsMessage {
     FTP_TLS("AUTH TLS\r\n"),
     FTP_S_READY("234 AUTH command ok. Initializing TLS Connection.\r\n"),
     IMAP_S_CONNECTED(". OK IMAP4rev1 Service Ready\r\n"),
-    IMAP_C_CAP("a CAPABILITY\r\n"),
-    IMAP_S_CAP(". CAPABILITY IMAP4rev1 STARTTLS LOGINDISABLED\r\na OK CAPABILITY completed\r\n"),
     IMAP_TLS("a STARTTLS\r\n"),
     IMAP_S_READY("a OK BEGIN TLS NEGOTIATION\r\n"),
     POP3_S_CONNECTED("+OK Service Ready\r\n"),
@@ -24,9 +22,6 @@ public enum StarttlsMessage {
     SMTP_S_CONNECTED("220 mail.example.com SMTP service ready\r\n"),
     SMTP_C_CONNECTED("EHLO mail.example.org\r\n"),
     SMTP_S_OK("250-mail.example.org offers a warm hug of welcome\r\n"),
-    SMTP_S_OK_MIME("250-8BITMIME\r\n"),
-    SMTP_S_OK_STARTTLS("250-STARTTLS\r\n"),
-    SMTP_S_OK_DSN("250 DSN\r\n"),
     SMTP_TLS("STARTTLS\r\n"),
     SMTP_S_READY("220 GO AHEAD\r\n");
 

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactory.java

@@ -810,10 +810,6 @@ public WorkflowTrace addStartTlsActions(AliasedConnection connection, StarttlsTy
             case IMAP: {
                 workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,
                         StarttlsMessage.IMAP_S_CONNECTED.getStarttlsMessage(), "US-ASCII"));
-                workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.CLIENT,
-                        StarttlsMessage.IMAP_C_CAP.getStarttlsMessage(), "US-ASCII"));
-                workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,
-                        StarttlsMessage.IMAP_S_CAP.getStarttlsMessage(), "US-ASCII"));
                 workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.CLIENT,
                         StarttlsMessage.IMAP_TLS.getStarttlsMessage(), "US-ASCII"));
                 workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,
@@ -836,12 +832,6 @@ public WorkflowTrace addStartTlsActions(AliasedConnection connection, StarttlsTy
                         StarttlsMessage.SMTP_C_CONNECTED.getStarttlsMessage(), "US-ASCII"));
                 workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,
                         StarttlsMessage.SMTP_S_OK.getStarttlsMessage(), "US-ASCII"));
-                workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,
-                        StarttlsMessage.SMTP_S_OK_MIME.getStarttlsMessage(), "US-ASCII"));
-                workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,
-                        StarttlsMessage.SMTP_S_OK_STARTTLS.getStarttlsMessage(), "US-ASCII"));
-                workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,
-                        StarttlsMessage.SMTP_S_OK_DSN.getStarttlsMessage(), "US-ASCII"));
                 workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.CLIENT,
                         StarttlsMessage.SMTP_TLS.getStarttlsMessage(), "US-ASCII"));
                 workflowTrace.addTlsAction(MessageActionFactory.createAsciiAction(connection, ConnectionEndType.SERVER,

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactoryTest.java

@@ -400,8 +400,6 @@ public void testAddStartTlsAction() {
         Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(0).getClass());
         Assert.assertEquals(SendAsciiAction.class, workflowTrace.getTlsActions().get(1).getClass());
         Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(2).getClass());
-        Assert.assertEquals(SendAsciiAction.class, workflowTrace.getTlsActions().get(3).getClass());
-        Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(4).getClass());
 
         config.setStarttlsType(StarttlsType.POP3);
         workflowConfigurationFactory = new WorkflowConfigurationFactory(config);
@@ -420,10 +418,7 @@ public void testAddStartTlsAction() {
         Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(0).getClass());
         Assert.assertEquals(SendAsciiAction.class, workflowTrace.getTlsActions().get(1).getClass());
         Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(2).getClass());
-        Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(3).getClass());
+        Assert.assertEquals(SendAsciiAction.class, workflowTrace.getTlsActions().get(3).getClass());
         Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(4).getClass());
-        Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(5).getClass());
-        Assert.assertEquals(SendAsciiAction.class, workflowTrace.getTlsActions().get(6).getClass());
-        Assert.assertEquals(GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(7).getClass());
     }
 }