From 9082f74cb4ec9beba384b0bff9798b361a0e5f6b Mon Sep 17 00:00:00 2001 From: Jonny Mccoubrey Date: Tue, 26 Mar 2024 10:21:13 +0000 Subject: [PATCH 1/3] Set fixed version of TLS --- .../src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java b/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java index 53d0480a9..bee6a941b 100644 --- a/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java +++ b/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java @@ -115,7 +115,7 @@ public static Connection createRabbitConnection(final RabbitConfiguration rc, final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm); trustManagerFactory.init((KeyStore) null); - final SSLContext context = SSLContext.getInstance("TLS"); + final SSLContext context = SSLContext.getInstance("TLSv1.3"); context.init(null, trustManagerFactory.getTrustManagers(), null); factory.useSslProtocol(context); From d74b71a035ef577e266228b41536cdf8a9429396 Mon Sep 17 00:00:00 2001 From: Jonny Mccoubrey Date: Tue, 26 Mar 2024 12:27:40 +0000 Subject: [PATCH 2/3] Handle null Rabbit connection --- .../java/com/hpe/caf/worker/queue/rabbit/RabbitWorkerQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker-queue-rabbit/src/main/java/com/hpe/caf/worker/queue/rabbit/RabbitWorkerQueue.java b/worker-queue-rabbit/src/main/java/com/hpe/caf/worker/queue/rabbit/RabbitWorkerQueue.java index 884574c41..eb171a1b6 100644 --- a/worker-queue-rabbit/src/main/java/com/hpe/caf/worker/queue/rabbit/RabbitWorkerQueue.java +++ b/worker-queue-rabbit/src/main/java/com/hpe/caf/worker/queue/rabbit/RabbitWorkerQueue.java @@ -308,7 +308,7 @@ public WorkerQueueMetricsReporter getMetrics() @Override public HealthResult healthCheck() { - if (!conn.isOpen()) { + if (conn == null || !conn.isOpen()) { return new HealthResult(HealthStatus.UNHEALTHY, "Rabbit connection failed"); } else if (!incomingChannel.isOpen()) { return new HealthResult(HealthStatus.UNHEALTHY, "Incoming channel failed"); From 849cf3e4fb1af0bcf717f14146bcf86b9fecbb58 Mon Sep 17 00:00:00 2001 From: Jonny Mccoubrey <44871582+jonny-mccoubrey@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:44:35 +0000 Subject: [PATCH 3/3] Update RabbitUtil.java --- .../src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java b/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java index bee6a941b..52101e4b0 100644 --- a/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java +++ b/util-rabbitmq/src/main/java/com/hpe/caf/util/rabbitmq/RabbitUtil.java @@ -115,7 +115,7 @@ public static Connection createRabbitConnection(final RabbitConfiguration rc, final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(tmfAlgorithm); trustManagerFactory.init((KeyStore) null); - final SSLContext context = SSLContext.getInstance("TLSv1.3"); + final SSLContext context = SSLContext.getInstance("TLSv1.2"); context.init(null, trustManagerFactory.getTrustManagers(), null); factory.useSslProtocol(context);