From 6f8cb7ec2adc4e91fa6a253ef937ba78d115ae00 Mon Sep 17 00:00:00 2001 From: Thomas <> Date: Wed, 23 Oct 2024 17:37:31 +0200 Subject: chore(core): update third-party libs --- eaaf-springboot-utils/pom.xml | 8 +- .../eaaf/core/impl/http/HttpClientFactory.java | 132 +++++++++++---------- pom.xml | 73 ++++++++---- 3 files changed, 123 insertions(+), 90 deletions(-) diff --git a/eaaf-springboot-utils/pom.xml b/eaaf-springboot-utils/pom.xml index fc26e150..1208512e 100644 --- a/eaaf-springboot-utils/pom.xml +++ b/eaaf-springboot-utils/pom.xml @@ -60,10 +60,14 @@ provided - ch.qos.logback - logback-access + ch.qos.logback.access + common provided + + ch.qos.logback.access + logback-access-tomcat + org.apache.logging.log4j log4j-to-slf4j diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java index ceffe26c..9b51ccd1 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/http/HttpClientFactory.java @@ -22,14 +22,13 @@ import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner; import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.protocol.RedirectStrategy; -import org.apache.hc.client5.http.socket.ConnectionSocketFactory; -import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory; -import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy; import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; -import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; +import org.apache.hc.client5.http.ssl.TlsSocketStrategy; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; @@ -40,6 +39,7 @@ import org.apache.hc.core5.http.config.RegistryBuilder; import org.apache.hc.core5.http.io.SocketConfig; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.pool.PoolConcurrencyPolicy; +import org.apache.hc.core5.pool.PoolReusePolicy; import org.apache.hc.core5.util.TimeValue; import org.springframework.beans.factory.annotation.Autowired; @@ -185,7 +185,7 @@ public class HttpClientFactory implements IHttpClientFactory { injectBasicAuthenticationIfRequired(builder, config); // inject authentication if required - final LayeredConnectionSocketFactory sslConnectionFactory = getSslContext(config); + final DefaultClientTlsStrategy sslConnectionFactory = getSslContext(config); // set pool connection if required final HttpClientConnectionManager connectionManager = injectConnectionManager(builder, @@ -252,7 +252,7 @@ public class HttpClientFactory implements IHttpClientFactory { injectBasicAuthenticationIfRequired(defaultHttpClientBuilder, defaultHttpClientConfig); // inject authentication if required - final LayeredConnectionSocketFactory sslConnectionFactory = + final DefaultClientTlsStrategy sslConnectionFactory = getSslContext(defaultHttpClientConfig); // set pool connection if required @@ -379,7 +379,7 @@ public class HttpClientFactory implements IHttpClientFactory { } @Nonnull - private LayeredConnectionSocketFactory getSslContext(final HttpClientConfiguration httpClientConfig) + private DefaultClientTlsStrategy getSslContext(final HttpClientConfiguration httpClientConfig) throws EaafException { SSLContext sslContext = null; if (httpClientConfig.getAuthMode().equals(HttpClientConfiguration.ClientAuthMode.SSL)) { @@ -410,10 +410,9 @@ public class HttpClientFactory implements IHttpClientFactory { } - final LayeredConnectionSocketFactory sslSocketFactory = - new SSLConnectionSocketFactory(sslContext, hostnameVerifier); + DefaultClientTlsStrategy tslStrategy = new DefaultClientTlsStrategy(sslContext, hostnameVerifier); log.debug("HTTP client-builder successfuly initialized"); - return sslSocketFactory; + return tslStrategy; } @@ -431,7 +430,7 @@ public class HttpClientFactory implements IHttpClientFactory { @Nonnull private HttpClientConnectionManager injectConnectionManager( - HttpClientBuilder builder, final LayeredConnectionSocketFactory sslConnectionFactory) + HttpClientBuilder builder, final DefaultClientTlsStrategy sslConnectionFactory) throws EaafConfigurationException { if (basicConfig.getBasicConfigurationBoolean(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_USE, true)) { @@ -441,34 +440,39 @@ public class HttpClientFactory implements IHttpClientFactory { TimeUnit.SECONDS); log.debug("Set {} seconds as time-to-life for pooled http connections"); - final PoolingHttpClientConnectionManager connectionPool = new PoolingHttpClientConnectionManager( - getDefaultRegistry(sslConnectionFactory), - PoolConcurrencyPolicy.STRICT, timeToLife, null); - connectionPool.setDefaultMaxPerRoute(Integer.parseInt( - basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE, - DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE))); - connectionPool.setMaxTotal(Integer.parseInt( - basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL, - DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL))); - connectionPool.setDefaultSocketConfig(SocketConfig.custom() - .setSoTimeout( - Integer.parseInt( - basicConfig.getBasicConfiguration( - PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET, - DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS) - .build()); - connectionPool.setDefaultConnectionConfig(ConnectionConfig.custom() - .setConnectTimeout(Long.parseLong( - basicConfig.getBasicConfiguration( - PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION, - DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS) - .setValidateAfterInactivity(Integer.parseInt( - basicConfig.getBasicConfiguration( - PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY, - DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY)), TimeUnit.SECONDS) - .build()); - - + final PoolingHttpClientConnectionManager connectionPool = PoolingHttpClientConnectionManagerBuilder + .create() + .setTlsSocketStrategy(sslConnectionFactory) + .setDefaultSocketConfig( + SocketConfig.custom() + .setSoTimeout( + Integer.parseInt( + basicConfig.getBasicConfiguration( + PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET, + DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS) + .build()) + .setDefaultConnectionConfig( + ConnectionConfig.custom() + .setTimeToLive(timeToLife) + .setConnectTimeout(Long.parseLong( + basicConfig.getBasicConfiguration( + PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION, + DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS) + .setValidateAfterInactivity(Integer.parseInt( + basicConfig.getBasicConfiguration( + PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY, + DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_VALIDATION_INACTIVITY)), + TimeUnit.SECONDS) + .build()) + .setMaxConnPerRoute(Integer.parseInt( + basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE, + DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXPERROUTE))) + .setMaxConnTotal(Integer.parseInt( + basicConfig.getBasicConfiguration(PROP_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL, + DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_POOL_MAXTOTAL))) + .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT) + .setConnPoolPolicy(PoolReusePolicy.FIFO) + .build(); builder.setConnectionManager(connectionPool); log.debug("Initalize http-client pool with, maxTotal: {} maxPerRoute: {}", connectionPool.getMaxTotal(), connectionPool.getDefaultMaxPerRoute()); @@ -476,25 +480,25 @@ public class HttpClientFactory implements IHttpClientFactory { } else { log.debug("Building http-client without Connection-Pool ... "); - final BasicHttpClientConnectionManager basicPool = new BasicHttpClientConnectionManager( - getDefaultRegistry(sslConnectionFactory)); - - basicPool.setSocketConfig(SocketConfig.custom() - .setSoTimeout( - Integer.parseInt( - basicConfig.getBasicConfiguration( - PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET, - DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS) - .build()); - basicPool.setConnectionConfig(ConnectionConfig.custom() - .setConnectTimeout( - Long.parseLong(basicConfig.getBasicConfiguration( - PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION, - DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS) - .build()); - - + BasicHttpClientConnectionManager basicPool = BasicHttpClientConnectionManager + .create(getDefaultRegistry(sslConnectionFactory)); + basicPool.setSocketConfig( + SocketConfig.custom() + .setSoTimeout( + Integer.parseInt( + basicConfig.getBasicConfiguration( + PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET, + DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_SOCKET)), TimeUnit.SECONDS) + .build()); + basicPool.setConnectionConfig( + ConnectionConfig.custom() + .setConnectTimeout( + Long.parseLong(basicConfig.getBasicConfiguration( + PROP_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION, + DEFAULT_CONFIG_CLIENT_HTTP_CONNECTION_TIMEOUT_CONNECTION)), TimeUnit.SECONDS) + .build()); + builder.setConnectionManager(basicPool); return basicPool; @@ -502,6 +506,7 @@ public class HttpClientFactory implements IHttpClientFactory { } + private RequestConfig buildDefaultRequestConfig(HttpClientConfiguration config) { final RequestConfig requestConfig = RequestConfig.custom() @@ -541,11 +546,12 @@ public class HttpClientFactory implements IHttpClientFactory { } - private static Registry getDefaultRegistry( - final LayeredConnectionSocketFactory sslConnectionFactory) { - final RegistryBuilder builder = - RegistryBuilder.create() - .register("http", PlainConnectionSocketFactory.getSocketFactory()); + private static Registry getDefaultRegistry( + final DefaultClientTlsStrategy sslConnectionFactory) { + + final RegistryBuilder builder = + RegistryBuilder.create() + .register("http", DefaultClientTlsStrategy.createDefault()); if (sslConnectionFactory != null) { log.trace("Inject own SSLSocketFactory into pooled connection"); @@ -553,7 +559,7 @@ public class HttpClientFactory implements IHttpClientFactory { } else { log.trace("Inject default SSLSocketFactory into pooled connection"); - builder.register("https", SSLConnectionSocketFactory.getSocketFactory()); + builder.register("https", DefaultClientTlsStrategy.createDefault()); } diff --git a/pom.xml b/pom.xml index 1a8d39d4..d69b1634 100644 --- a/pom.xml +++ b/pom.xml @@ -47,9 +47,9 @@ 1.53.0 - 3.1.10 - 6.0.18 - 10.1.20 + 3.3.4 + 6.1.14 + 10.1.31 5.0.0 3.0.4 1.2.6 @@ -57,51 +57,54 @@ 1.71.1 - 2.0.12 - 2.23.1 - 1.4.14 + 2.0.16 + 2.24.1 + 1.5.11 + 2.0.3 + 2.0.4 1.2.3 - 3.14.0 - 1.11.0 + 3.17.0 + 1.12.0 4.4 - 2.16.0 - 1.16.1 + 2.17.0 + 1.17.1 2.0.0-M1 6.0.0 2.1.1 - 2.12.7 + 2.13.0 2.3 - 33.1.0-jre + 33.3.1-jre 0.9.6 3.0.2 - 5.2.3 + 5.3.1 + 5.4 2.17.0 2.17.0 - 2.10.1 + 2.11.0 2.0.0 2.12.2 2.7.1 - 6.6.2 + 6.7.0 2.2 - 3.1.2 - 5.10.0 - 5.5.0 - 4.11.0 - 3.5.0 + 3.5.1 + 5.11.3 + 5.14.2 + 4.12.0 + 3.9.1 2.0.9 - 1.18.28 + 1.18.34 0.8.10 @@ -544,11 +547,16 @@ log4j-to-slf4j ${log4j.version} - - ch.qos.logback - logback-access - ${ch.qos.logback.version} + + ch.qos.logback.access + common + ${logback.access.common.version} + + ch.qos.logback.access + logback-access-tomcat + ${logback-access-tomcat.version} + ch.qos.logback logback-classic @@ -649,11 +657,26 @@ ${xalan.version} + + org.apache.httpcomponents.core5 + httpcore5 + ${httpcore5.version} + + + org.apache.httpcomponents.core5 + httpcore5-h2 + ${httpcore5.version} + org.apache.httpcomponents.client5 httpclient5 ${httpclient.version} + + org.apache.httpcomponents.client5 + httpclient5-cache + ${httpclient.version} + org.owasp.encoder -- cgit v1.2.3