From 15aa8bfea2f05a788bfb50b127a3d329e1c09e25 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Wed, 17 Apr 2024 15:14:42 -0400 Subject: [PATCH] ensure null header values are ignored --- src/main/java/io/cryostat/agent/MainModule.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/cryostat/agent/MainModule.java b/src/main/java/io/cryostat/agent/MainModule.java index 263b58e6..47bcae74 100644 --- a/src/main/java/io/cryostat/agent/MainModule.java +++ b/src/main/java/io/cryostat/agent/MainModule.java @@ -23,6 +23,7 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.HashSet; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.Executors; @@ -162,7 +163,10 @@ public static HttpClient provideHttpClient( @Named(ConfigModule.CRYOSTAT_AGENT_WEBCLIENT_CONNECT_TIMEOUT_MS) int connectTimeout, @Named(ConfigModule.CRYOSTAT_AGENT_WEBCLIENT_RESPONSE_TIMEOUT_MS) int responseTimeout) { Set
headers = new HashSet<>(); - authorization.map(v -> new BasicHeader("Authorization", v)).ifPresent(headers::add); + authorization + .filter(Objects::nonNull) + .map(v -> new BasicHeader("Authorization", v)) + .ifPresent(headers::add); HttpClientBuilder builder = HttpClients.custom() .setDefaultHeaders(headers)