Skip to content

Update Memcache SSLContext Protocol to TLSv1.2 #16035

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

Merged
xvrl merged 4 commits into from
Mar 7, 2024
Merged

Update Memcache SSLContext Protocol to TLSv1.2 #16035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7891c3
Merge pull request #1 from apache/master
pagrawal10 Nov 29, 2023
33a2ee6
Merge branch 'master' of github.com:pagrawal10/druid
pagrawal10 Feb 8, 2024
dab360d
Merge branch 'master' of github.com:pagrawal10/druid
pagrawal10 Mar 4, 2024
44032a0
Update protocol for MemcachedCache
pagrawal10 Mar 4, 2024
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
2 changes: 1 addition & 1 deletion server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public static ConnectionFactory createConnectionFactory(final MemcachedCacheConf
// Build SSLContext
TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init((KeyStore) null);
SSLContext sslContext = SSLContext.getInstance("TLS");
SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
sslContext.init(null, tmf.getTrustManagers(), null);
// Create the client in TLS mode
connectionFactoryBuilder.setSSLContext(sslContext);
Expand Down
2 changes: 2 additions & 0 deletions server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ public String getHosts()
Assert.assertEquals(connectionFactoryDynamic.getClientMode(), ClientMode.Dynamic);
//enableTls is true so sslContext is not null
Assert.assertNotNull(connectionFactoryDynamic.getSSLContext());
// Ensure Protocol is TLSv1.2
Assert.assertEquals("TLSv1.2", connectionFactoryDynamic.getSSLContext().getProtocol());
}

@Test
Expand Down