Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions src/main/java/io/mapsmessaging/security/ssl/SslHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,14 @@ public static SSLContext createContext(String context, ConfigurationProperties c
return sslContext;
}

public static SSLEngine createSSLEngine(SSLContext sslContext, ConfigurationProperties tls){
public static SSLEngine createSSLEngine(SSLContext sslContext, ConfigurationProperties tls) {
SSLEngine sslEngine = sslContext.createSSLEngine();
sslEngine.setNeedClientAuth(tls.getBooleanProperty("clientCertificateRequired", false));
sslEngine.setWantClientAuth(tls.getBooleanProperty("clientCertificateWanted", false));
boolean clientCertificateRequired = tls.getBooleanProperty("clientCertificateRequired", false);
if (clientCertificateRequired) {
sslEngine.setNeedClientAuth(true);
} else {
sslEngine.setWantClientAuth(tls.getBooleanProperty("clientCertificateWanted", false));
}
return sslEngine;
}

Expand Down
21 changes: 21 additions & 0 deletions src/test/java/io/mapsmessaging/security/ssl/SslHelperTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,25 @@ void simpleHelperTest() throws Exception {
SSLEngine sslEngine = SslHelper.createSSLEngine(sslContext, new ConfigurationProperties() );
Assertions.assertNotNull(sslEngine);
}

@Test
void clientCertificateAuthenticationModesAreMutuallyExclusive() throws Exception {
SSLContext sslContext = SSLContext.getDefault();

assertClientAuthenticationMode(sslContext, false, false, false, false);
assertClientAuthenticationMode(sslContext, false, true, false, true);
assertClientAuthenticationMode(sslContext, true, false, true, false);
assertClientAuthenticationMode(sslContext, true, true, true, false);
}

private void assertClientAuthenticationMode(SSLContext sslContext, boolean required, boolean wanted, boolean expectedRequired, boolean expectedWanted) {
ConfigurationProperties properties = new ConfigurationProperties();
properties.put("clientCertificateRequired", required);
properties.put("clientCertificateWanted", wanted);

SSLEngine sslEngine = SslHelper.createSSLEngine(sslContext, properties);

Assertions.assertEquals(expectedRequired, sslEngine.getNeedClientAuth());
Assertions.assertEquals(expectedWanted, sslEngine.getWantClientAuth());
}
}