From 44032a00fed9b0799d553e06cae9e6eafd3e1234 Mon Sep 17 00:00:00 2001 From: pagrawal Date: Mon, 4 Mar 2024 20:38:20 +0530 Subject: [PATCH] Update protocol for MemcachedCache --- .../main/java/org/apache/druid/client/cache/MemcachedCache.java | 2 +- .../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 d67e01b110b3..d5849fad99e8 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 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); 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 ceb3a828772e..d7748c7e48fe 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 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