Skip to content

[AI] Fix decode error by adding proper connection termination #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[AI] Fix decode error by adding proper connection termination #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .../main/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,20 @@ public WorkflowTrace createDynamicHandshakeWorkflow(AliasedConnection connection
new SendAction(new ChangeCipherSpecMessage(), new FinishedMessage()));
trace.addTlsAction(new ReceiveTillAction(new FinishedMessage()));
}

// Add proper connection termination with close_notify alert for both TLS 1.2 and TLS
// 1.3
AlertMessage closeNotify = new AlertMessage();
closeNotify.setLevel(AlertLevel.WARNING.getValue());
closeNotify.setDescription(AlertDescription.CLOSE_NOTIFY.getValue());
trace.addTlsAction(new SendAction(closeNotify));

// Expect close_notify from server
AlertMessage serverCloseNotify = new AlertMessage();
serverCloseNotify.setLevel(AlertLevel.WARNING.getValue());
serverCloseNotify.setDescription(AlertDescription.CLOSE_NOTIFY.getValue());
trace.addTlsAction(new ReceiveTillAction(serverCloseNotify));

return trace;
} else {
trace.addTlsAction(new ReceiveTillAction(new FinishedMessage()));
Expand Down
75 changes: 75 additions & 0 deletions ...t/java/de/rub/nds/tlsattacker/core/workflow/factory/WorkflowConfigurationFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import de.rub.nds.tlsattacker.core.config.Config;
import de.rub.nds.tlsattacker.core.constants.AlertDescription;
import de.rub.nds.tlsattacker.core.constants.AlertLevel;
import de.rub.nds.tlsattacker.core.constants.CipherSuite;
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
import de.rub.nds.tlsattacker.core.constants.RunningModeType;
import de.rub.nds.tlsattacker.core.constants.StarttlsType;
import de.rub.nds.tlsattacker.core.exceptions.ConfigurationException;
import de.rub.nds.tlsattacker.core.protocol.ProtocolMessage;
import de.rub.nds.tlsattacker.core.protocol.message.AlertMessage;
import de.rub.nds.tlsattacker.core.protocol.message.ApplicationMessage;
import de.rub.nds.tlsattacker.core.protocol.message.CertificateMessage;
import de.rub.nds.tlsattacker.core.protocol.message.CertificateVerifyMessage;
Expand All @@ -31,6 +34,7 @@
import de.rub.nds.tlsattacker.core.workflow.action.GenericReceiveAsciiAction;
import de.rub.nds.tlsattacker.core.workflow.action.MessageAction;
import de.rub.nds.tlsattacker.core.workflow.action.ReceiveAction;
import de.rub.nds.tlsattacker.core.workflow.action.ReceiveTillAction;
import de.rub.nds.tlsattacker.core.workflow.action.SendAction;
import de.rub.nds.tlsattacker.core.workflow.action.SendAsciiAction;
import de.rub.nds.tlsattacker.util.tests.TestCategories;
Expand Down Expand Up @@ -353,4 +357,75 @@ public void testAddStartTlsAction() {
assertEquals(
GenericReceiveAsciiAction.class, workflowTrace.getTlsActions().get(4).getClass());
}

/** Test that dynamic handshake workflow includes proper connection termination */
@Test
public void testDynamicHandshakeWorkflowIncludesCloseNotify() {
// Test for TLS 1.2
config.setHighestProtocolVersion(ProtocolVersion.TLS12);
workflowConfigurationFactory = new WorkflowConfigurationFactory(config);
WorkflowTrace trace =
workflowConfigurationFactory.createWorkflowTrace(
WorkflowTraceType.DYNAMIC_HANDSHAKE, RunningModeType.CLIENT);

// Find the close_notify send action (should be second to last)
MessageAction secondToLastAction =
trace.getMessageActions().get(trace.getMessageActions().size() - 2);
assertTrue(secondToLastAction instanceof SendAction);
SendAction closeNotifySendAction = (SendAction) secondToLastAction;
assertEquals(1, closeNotifySendAction.getConfiguredMessages().size());
ProtocolMessage closeNotifyMessage = closeNotifySendAction.getConfiguredMessages().get(0);
assertTrue(closeNotifyMessage instanceof AlertMessage);
AlertMessage closeNotifyAlert = (AlertMessage) closeNotifyMessage;
assertEquals(AlertLevel.WARNING.getValue(), closeNotifyAlert.getLevel().getValue());
assertEquals(
AlertDescription.CLOSE_NOTIFY.getValue(),
closeNotifyAlert.getDescription().getValue());

// Find the close_notify receive action (should be last)
MessageAction lastAction = trace.getLastMessageAction();
assertTrue(lastAction instanceof ReceiveTillAction);
ReceiveTillAction closeNotifyReceiveAction = (ReceiveTillAction) lastAction;
ProtocolMessage expectedCloseNotify = closeNotifyReceiveAction.getWaitTillMessage();
assertNotNull(expectedCloseNotify);
assertTrue(expectedCloseNotify instanceof AlertMessage);
AlertMessage expectedCloseNotifyAlert = (AlertMessage) expectedCloseNotify;
assertEquals(AlertLevel.WARNING.getValue(), expectedCloseNotifyAlert.getLevel().getValue());
assertEquals(
AlertDescription.CLOSE_NOTIFY.getValue(),
expectedCloseNotifyAlert.getDescription().getValue());

// Test for TLS 1.3
config.setHighestProtocolVersion(ProtocolVersion.TLS13);
workflowConfigurationFactory = new WorkflowConfigurationFactory(config);
trace =
workflowConfigurationFactory.createWorkflowTrace(
WorkflowTraceType.DYNAMIC_HANDSHAKE, RunningModeType.CLIENT);

// Find the close_notify send action (should be second to last)
secondToLastAction = trace.getMessageActions().get(trace.getMessageActions().size() - 2);
assertTrue(secondToLastAction instanceof SendAction);
closeNotifySendAction = (SendAction) secondToLastAction;
assertEquals(1, closeNotifySendAction.getConfiguredMessages().size());
closeNotifyMessage = closeNotifySendAction.getConfiguredMessages().get(0);
assertTrue(closeNotifyMessage instanceof AlertMessage);
closeNotifyAlert = (AlertMessage) closeNotifyMessage;
assertEquals(AlertLevel.WARNING.getValue(), closeNotifyAlert.getLevel().getValue());
assertEquals(
AlertDescription.CLOSE_NOTIFY.getValue(),
closeNotifyAlert.getDescription().getValue());

// Find the close_notify receive action (should be last)
lastAction = trace.getLastMessageAction();
assertTrue(lastAction instanceof ReceiveTillAction);
closeNotifyReceiveAction = (ReceiveTillAction) lastAction;
expectedCloseNotify = closeNotifyReceiveAction.getWaitTillMessage();
assertNotNull(expectedCloseNotify);
assertTrue(expectedCloseNotify instanceof AlertMessage);
expectedCloseNotifyAlert = (AlertMessage) expectedCloseNotify;
assertEquals(AlertLevel.WARNING.getValue(), expectedCloseNotifyAlert.getLevel().getValue());
assertEquals(
AlertDescription.CLOSE_NOTIFY.getValue(),
expectedCloseNotifyAlert.getDescription().getValue());
}
}