bloup

Author: guillaumejparis

.drone.yml

@@ -191,7 +191,7 @@ services:
       POSTGRES_PASSWORD: openbas
       POSTGRES_DB: openbas
   - name: elastic
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.0.4
     environment:
       discovery.type: single-node
       xpack.security.enabled: false

openbas-api/pom.xml

@@ -24,7 +24,6 @@
         <opencsv-version>5.11.2</opencsv-version>
         <opentelemetry.version>1.52.0</opentelemetry.version>
         <opentelemetry-semconv.version>1.34.0</opentelemetry-semconv.version>
-        <elasticsearch.version>8.18.3</elasticsearch.version>
     </properties>
 
     <profiles>
@@ -51,11 +50,6 @@
             <artifactId>openbas-framework</artifactId>
             <version>1.18.9</version>
         </dependency>
-        <dependency>
-            <groupId>co.elastic.clients</groupId>
-            <artifactId>elasticsearch-java</artifactId>
-            <version>${elasticsearch.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.rabbitmq</groupId>
             <artifactId>amqp-client</artifactId>
@@ -286,6 +280,11 @@
             <artifactId>zip4j</artifactId>
             <version>2.11.5</version>
         </dependency>
+        <dependency>
+            <groupId>co.elastic.clients</groupId>
+            <artifactId>elasticsearch-java</artifactId>
+            <version>${elasticsearch.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

openbas-dev/docker-compose.yml

@@ -81,7 +81,7 @@ services:
       PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_PASSWORD}
   openbas-dev-elasticsearch:
     container_name: openbas-dev-elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.0.4
     volumes:
       - esdata:/usr/share/elasticsearch/data
       - essnapshots:/usr/share/elasticsearch/snapshots
@@ -128,7 +128,7 @@ services:
       - 9600:9600
   openbas-test-elasticsearch:
     container_name: openbas-test-elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.0.4
     environment:
       - discovery.type=single-node
       - xpack.ml.enabled=false
@@ -149,7 +149,7 @@ services:
       - 9301:9300
   openbas-dev-kibana:
     container_name: openbas-dev-kibana
-    image: docker.elastic.co/kibana/kibana:8.18.3
+    image: docker.elastic.co/kibana/kibana:9.0.4
     environment:
       - ELASTICSEARCH_HOSTS=http://openbas-dev-elasticsearch:9200
     restart: unless-stopped
@@ -159,7 +159,7 @@ services:
       - openbas-dev-elasticsearch
   openbas-test-kibana:
     container_name: openbas-test-kibana
-    image: docker.elastic.co/kibana/kibana:8.18.3
+    image: docker.elastic.co/kibana/kibana:9.0.4
     environment:
       - ELASTICSEARCH_HOSTS=http://openbas-test-elasticsearch:9200
     restart: unless-stopped

openbas-model/pom.xml

@@ -13,11 +13,6 @@
     <name>OpenBAS model</name>
     <description>OpenBAS model</description>
 
-    <properties>
-        <elasticsearch.version>8.18.3</elasticsearch.version>
-        <opensearch.version>3.1.0</opensearch.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

openbas-model/src/main/java/io/openbas/driver/ElasticDriver.java

@@ -13,7 +13,9 @@
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.ElasticsearchTransport;
-import co.elastic.clients.transport.rest_client.RestClientTransport;
+import co.elastic.clients.transport.rest5_client.Rest5ClientTransport;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
+import co.elastic.clients.transport.rest5_client.low_level.Rest5ClientBuilder;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -25,22 +27,24 @@
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
+import java.net.URISyntaxException;
 import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.util.*;
 import javax.net.ssl.SSLContext;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.elasticsearch.client.RestClient;
-import org.elasticsearch.client.RestClientBuilder;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
+import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
+import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
+import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.ssl.DefaultClientTlsStrategy;
+import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.ssl.SSLContextBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -61,14 +65,15 @@ public void setSearchEngine(EngineContext searchEngine) {
     this.searchEngine = searchEngine;
   }
 
-  private ElasticsearchClient getElasticClient() {
-    RestClientBuilder restClientBuilder = RestClient.builder(HttpHost.create(config.getUrl()));
+  private ElasticsearchClient getElasticClient() throws URISyntaxException {
+    Rest5ClientBuilder restClientBuilder = Rest5Client.builder(HttpHost.create(config.getUrl()));
     HttpAsyncClientBuilder clientBuilder = HttpAsyncClientBuilder.create();
     if (config.getUsername() != null) {
       BasicCredentialsProvider credsProv = new BasicCredentialsProvider();
       credsProv.setCredentials(
-          AuthScope.ANY,
-          new UsernamePasswordCredentials(config.getUsername(), config.getPassword()));
+          new AuthScope(null, -1),
+          new UsernamePasswordCredentials(
+              config.getUsername(), config.getPassword().toCharArray()));
       clientBuilder.setDefaultCredentialsProvider(credsProv);
     }
     if (!config.isRejectUnauthorized()) {
@@ -78,20 +83,24 @@ private ElasticsearchClient getElasticClient() {
             SSLContextBuilder.create()
                 .loadTrustMaterial(null, (X509Certificate[] chain, String authType) -> true)
                 .build();
-        clientBuilder
-            .setSSLContext(sslContext)
-            .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
+        PoolingAsyncClientConnectionManager connectionManager =
+            PoolingAsyncClientConnectionManagerBuilder.create()
+                .setTlsStrategy(
+                    new DefaultClientTlsStrategy(sslContext, NoopHostnameVerifier.INSTANCE))
+                .build();
+
+        clientBuilder.setConnectionManager(connectionManager);
       } catch (Exception e) {
         throw new RuntimeException(e);
       }
     }
-    restClientBuilder.setHttpClientConfigCallback(hc -> clientBuilder);
-    RestClient restClient = restClientBuilder.build();
+    restClientBuilder.setHttpClient(clientBuilder.build());
+    Rest5Client restClient = restClientBuilder.build();
     JacksonJsonpMapper jsonpMapper = new JacksonJsonpMapper();
     jsonpMapper.objectMapper().registerModule(new JavaTimeModule());
     jsonpMapper.objectMapper().configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
     jsonpMapper.objectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-    ElasticsearchTransport transport = new RestClientTransport(restClient, jsonpMapper);
+    ElasticsearchTransport transport = new Rest5ClientTransport(restClient, jsonpMapper);
     return new ElasticsearchClient(transport);
   }
 

pom.xml

@@ -29,6 +29,8 @@
         <jacoco-plugin.version>0.8.13</jacoco-plugin.version>
         <pyroscope.version>2.1.2</pyroscope.version>
         <spring-security-crypto.version>6.5.2</spring-security-crypto.version>
+        <elasticsearch.version>9.0.4</elasticsearch.version>
+        <opensearch.version>3.1.0</opensearch.version>
     </properties>
 
     <distributionManagement>