Skip to content
New issue

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

#

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

Already on GitHub? # to your account

TLSv1.3 test #892

Closed
wants to merge 8 commits into from
Closed

TLSv1.3 test #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d4ff59
Update SSLCertificateTest.java
chrjohn Oct 16, 2024
4257f2c
Updated cipher suites
chrjohn Oct 16, 2024
7b3cacd
Merge branch 'master' into chrjohn-tls13-test
chrjohn Oct 27, 2024
30f6154
Merge branch 'master' into chrjohn-tls13-test
chrjohn Jan 17, 2025
1d880bb
Merge branch 'master' into chrjohn-tls13-test
chrjohn Jan 24, 2025
15ee3d7
Merge branch 'master' into chrjohn-tls13-test
chrjohn Jan 25, 2025
e70eaa2
added some debug logging for unwritten requests
chrjohn Jan 27, 2025
2155a9f
typo
chrjohn Jan 27, 2025
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
5 changes: 5 additions & 0 deletions quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ public void exceptionCaught(IoSession ioSession, Throwable cause) throws Excepti
reason = "Socket exception (" + ioSession.getRemoteAddress() + "): " + cause;
} else {
reason = "Socket (" + ioSession.getRemoteAddress() + "): " + cause;
if (realCause instanceof org.apache.mina.core.write.WriteException) {
org.apache.mina.core.write.WriteRequest writeRequest = ((org.apache.mina.core.write.WriteException)realCause).getRequest();
Object message = writeRequest.getMessage();
log.error("First unwritten message = " + message);
}
}
disconnectNeeded = true;
} else if (realCause instanceof CriticalProtocolCodecException) {
Expand Down
67 changes: 33 additions & 34 deletions quickfixj-core/src/test/java/quickfix/mina/ssl/SSLCertificateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
public class SSLCertificateTest {

// Note: To diagnose cipher suite errors, run with -Djavax.net.debug=ssl:handshake
private static final String CIPHER_SUITES_TLS = "TLS_RSA_WITH_AES_128_CBC_SHA";
private static final String CIPHER_SUITES_TLS = "TLS_AES_256_GCM_SHA384";

@After
public void cleanup() {
Expand All @@ -86,14 +86,14 @@ public void cleanup() {
public void shouldAuthenticateServerCertificate() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand Down Expand Up @@ -138,13 +138,13 @@ public void shouldAuthenticateServerCertificateViaSocksProxy(String proxyVersion
try {
int port = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", port));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", port));

try {
acceptor.start();

SessionSettings initiatorSettings = createInitiatorSettings("single-session/empty.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(port), "JKS", "JKS");
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(port), "JKS", "JKS");

Properties defaults = initiatorSettings.getDefaultProperties();

Expand Down Expand Up @@ -185,15 +185,14 @@ public void shouldAuthenticateServerCertificateViaSocksProxy(String proxyVersion
public void shouldAuthenticateServerNameUsingServerCommonName() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-cn.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-cn.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));

CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));
try {
initiator.start();

Expand All @@ -220,15 +219,15 @@ public void shouldAuthenticateServerNameUsingServerCommonName() throws Exception
public void shouldAuthenticateServerNameUsingSNIExtension() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-sni.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-sni.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));

CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));
try {
initiator.start();

Expand Down Expand Up @@ -256,14 +255,14 @@ public void shouldFailWhenHostnameDoesNotMatchServerName() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();

TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-bad-cn.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client-bad-cn.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS", "HTTPS"));

try {
initiator.start();
Expand All @@ -287,14 +286,14 @@ public void shouldFailWhenHostnameDoesNotMatchServerName() throws Exception {
public void shouldAuthenticateServerAndClientCertificates() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", true,
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/client.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -320,14 +319,14 @@ public void shouldAuthenticateServerAndClientCertificates() throws Exception {
public void shouldAuthenticateServerAndClientCertificatesWhenUsingDifferentKeystoreFormats() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server-pkcs12.keystore", true,
"single-session/server-jceks.truststore", CIPHER_SUITES_TLS, "TLSv1.2", "PKCS12",
"single-session/server-jceks.truststore", CIPHER_SUITES_TLS, "TLSv1.3", "PKCS12",
"JCEKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(createInitiatorSettings("single-session/client-jceks.keystore",
"single-session/client-jceks.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA",
"single-session/client-jceks.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA",
Integer.toString(freePort), "JCEKS", "JCEKS"));

try {
Expand Down Expand Up @@ -355,20 +354,20 @@ public void shouldAuthenticateServerAndClientCertificatesForIndividualSessions()
TestAcceptor acceptor = new TestAcceptor(createMultiSessionAcceptorSettings(
"multi-session/server.keystore", true, new String[] { "multi-session/server1.truststore",
"multi-session/server2.truststore", "multi-session/server3.truststore" },
CIPHER_SUITES_TLS, "TLSv1.2"));
CIPHER_SUITES_TLS, "TLSv1.3"));

try {
acceptor.start();

TestInitiator initiator1 = new TestInitiator(
createInitiatorSettings("multi-session/client1.keystore", "multi-session/client1.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
TestInitiator initiator2 = new TestInitiator(
createInitiatorSettings("multi-session/client2.keystore", "multi-session/client2.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
TestInitiator initiator3 = new TestInitiator(
createInitiatorSettings("multi-session/client3.keystore", "multi-session/client3.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));

try {
initiator1.start();
Expand Down Expand Up @@ -416,20 +415,20 @@ public void shouldFailIndividualSessionsWhenInvalidCertificatesUsed() throws Exc
TestAcceptor acceptor = new TestAcceptor(createMultiSessionAcceptorSettings(
"multi-session/server.keystore", true, new String[] { "multi-session/server1.truststore",
"multi-session/server2.truststore", "multi-session/server3.truststore" },
CIPHER_SUITES_TLS, "TLSv1.2"));
CIPHER_SUITES_TLS, "TLSv1.3"));

try {
acceptor.start();

TestInitiator initiator1 = new TestInitiator(
createInitiatorSettings("multi-session/client2.keystore", "multi-session/client2.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU0", "ALFA0", "12340", "JKS", "JKS"));
TestInitiator initiator2 = new TestInitiator(
createInitiatorSettings("multi-session/client1.keystore", "multi-session/client1.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU1", "ALFA1", "12341", "JKS", "JKS"));
TestInitiator initiator3 = new TestInitiator(
createInitiatorSettings("multi-session/client3.keystore", "multi-session/client3.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU2", "ALFA2", "12342", "JKS", "JKS"));

try {
initiator1.start();
Expand Down Expand Up @@ -501,14 +500,14 @@ public void shouldFailWhenUsingEmptyServerKeyStore() throws Exception {
public void shouldFailWhenUsingEmptyClientTruststore() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/empty.keystore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -532,14 +531,14 @@ public void shouldFailWhenUsingEmptyClientTruststore() throws Exception {
public void shouldFailWhenUsingEmptyServerTrustore() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", true,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/client.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -563,14 +562,14 @@ public void shouldFailWhenUsingEmptyServerTrustore() throws Exception {
public void shouldFailWhenUsingBadClientCertificate() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/server.keystore", true,
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/server.truststore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/server.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand All @@ -594,14 +593,14 @@ public void shouldFailWhenUsingBadClientCertificate() throws Exception {
public void shouldFailWhenUsingBadServerCertificate() throws Exception {
int freePort = AvailablePortFinder.getNextAvailable();
TestAcceptor acceptor = new TestAcceptor(createAcceptorSettings("single-session/client.keystore", false,
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.2", "JKS", "JKS", freePort));
"single-session/empty.keystore", CIPHER_SUITES_TLS, "TLSv1.3", "JKS", "JKS", freePort));

try {
acceptor.start();

TestInitiator initiator = new TestInitiator(
createInitiatorSettings("single-session/empty.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU", "ALFA", Integer.toString(freePort), "JKS", "JKS"));

try {
initiator.start();
Expand Down Expand Up @@ -632,7 +631,7 @@ public void shouldConnectDifferentTypesOfSessions() throws Exception {

TestInitiator sslInitiator = new TestInitiator(
createInitiatorSettings("single-session/client.keystore", "single-session/client.truststore",
CIPHER_SUITES_TLS, "TLSv1.2", "ZULU_SSL", "ALFA_SSL", Integer.toString(sslPort), "JKS", "JKS"));
CIPHER_SUITES_TLS, "TLSv1.3", "ZULU_SSL", "ALFA_SSL", Integer.toString(sslPort), "JKS", "JKS"));

TestInitiator nonSslInitiator = new TestInitiator(createInitiatorSettings("ZULU_NON_SSL", "ALFA_NON_SSL", nonSslPort));

Expand Down
Loading