This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new bf39c71d2a5 Update protocol for MemcachedCache (#16035)
bf39c71d2a5 is described below
commit bf39c71d2a51a9bd48ce8971060442e29a721b2f
Author: Parth Agrawal <[email protected]>
AuthorDate: Thu Mar 7 11:58:11 2024 +0530
Update protocol for MemcachedCache (#16035)
---
server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java | 2 +-
.../src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
index d67e01b110b..d5849fad99e 100644
--- a/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
+++ b/server/src/main/java/org/apache/druid/client/cache/MemcachedCache.java
@@ -413,7 +413,7 @@ public class MemcachedCache implements Cache
// 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);
diff --git
a/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
index ceb3a828772..d7748c7e48f 100644
--- a/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
+++ b/server/src/test/java/org/apache/druid/client/cache/MemcachedCacheTest.java
@@ -254,6 +254,8 @@ public class MemcachedCacheTest
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
