From dbfdcfb96e6540d430fb20b0fe20944a20f162d2 Mon Sep 17 00:00:00 2001 From: lolodomo Date: Mon, 20 Feb 2023 20:32:55 +0100 Subject: [PATCH] [remoteopenhab] Call createHttpClient with a SslContextFactory parameter (#14465) Signed-off-by: Laurent Garnier --- .../internal/RemoteopenhabHandlerFactory.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/RemoteopenhabHandlerFactory.java b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/RemoteopenhabHandlerFactory.java index fcb60e450..9d012df1b 100644 --- a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/RemoteopenhabHandlerFactory.java +++ b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/RemoteopenhabHandlerFactory.java @@ -30,6 +30,7 @@ import javax.ws.rs.client.ClientBuilder; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; +import org.eclipse.jetty.util.ssl.SslContextFactory; import org.openhab.binding.remoteopenhab.internal.handler.RemoteopenhabBridgeHandler; import org.openhab.binding.remoteopenhab.internal.handler.RemoteopenhabThingHandler; import org.openhab.core.config.core.Configuration; @@ -92,7 +93,6 @@ public class RemoteopenhabHandlerFactory extends BaseThingHandlerFactory { final @Reference RemoteopenhabCommandDescriptionOptionProvider commandDescriptionProvider, final @Reference TranslationProvider i18nProvider, final @Reference LocaleProvider localeProvider) { this.httpClient = httpClientFactory.getCommonHttpClient(); - this.httpClientTrustingCert = httpClientFactory.createHttpClient(RemoteopenhabBindingConstants.BINDING_ID); this.clientBuilder = clientBuilder; this.eventSourceFactory = eventSourceFactory; this.channelTypeProvider = channelTypeProvider; @@ -102,6 +102,7 @@ public class RemoteopenhabHandlerFactory extends BaseThingHandlerFactory { this.i18nProvider = i18nProvider; this.localeProvider = localeProvider; + SslContextFactory sslContextFactory = new SslContextFactory.Client(); try { SSLContext sslContext = SSLContext.getInstance("SSL"); @@ -142,14 +143,15 @@ public class RemoteopenhabHandlerFactory extends BaseThingHandlerFactory { } } }; sslContext.init(null, trustAllCerts, null); - - this.httpClientTrustingCert.getSslContextFactory().setSslContext(sslContext); + sslContextFactory.setSslContext(sslContext); } catch (NoSuchAlgorithmException e) { logger.warn("An exception occurred while requesting the SSL encryption algorithm : '{}'", e.getMessage(), e); } catch (KeyManagementException e) { logger.warn("An exception occurred while initialising the SSL context : '{}'", e.getMessage(), e); } + this.httpClientTrustingCert = httpClientFactory.createHttpClient(RemoteopenhabBindingConstants.BINDING_ID, + sslContextFactory); } @Override