Merge remote-tracking branch 'origin/release/current'

# Conflicts:
#	openbas-front/package.json
#	openbas-front/yarn.lock

Author: guillaumejparis

.drone.yml

@@ -9,6 +9,7 @@ steps:
       SPRING_DATASOURCE_URL: jdbc:postgresql://pgsql:5432/openbas
       MINIO_ENDPOINT: minio
       MINIO_PORT: 9000
+      ENGINE_URL: http://elastic:9200
     commands:
       - mvn clean install -q -DskipTests
       - mvn spotless:check
@@ -18,7 +19,7 @@ steps:
       - mvn test -q
 
   - name: frontend-tests
-    image: node:22.14.0-alpine
+    image: node:22.15.0-alpine
     volumes:
       - name: cache-node-frontend
         path: /drone/src/openbas-front/node_modules
@@ -40,6 +41,7 @@ steps:
       SPRING_DATASOURCE_PASSWORD: openbas
       MINIO_ENDPOINT: minio-e2e
       MINIO_PORT: 9000
+      ENGINE_URL: http://elastic:9200
       MINIO_ACCESS_KEY: minioadmin
       MINIO_ACCESS_SECRET: minioadmin
       OPENBAS_ADMIN_EMAIL: [email protected]
@@ -66,7 +68,7 @@ steps:
       - frontend-tests
 
   - name: frontend-e2e-tests
-    image: node:22.14.0
+    image: node:22.15.0
     volumes:
       - name: cache-node-frontend-e2e
         path: /drone/src/openbas-front/node_modules
@@ -81,6 +83,25 @@ steps:
     depends_on:
       - app-e2e
 
+  - name: frontend-api-types
+    image: node:22.15.0
+    volumes:
+      - name: cache-node-frontend-api-types
+        path: /drone/src/openbas-front/node_modules
+    commands:
+      - apt update
+      - apt -y install netcat-traditional
+      - while ! nc -z app-e2e 8080 ; do sleep 1 ; done
+      - cd openbas-front
+      - yarn install
+      - API_URL=http://app-e2e:8080 yarn generate-types-from-api
+      - |
+        if git diff --name-only | grep -q './src/utils/api-types.d.ts'; then
+          echo "⚠️ Forgot to generate types! Please run 'yarn run generate-types-from-api' before committing."; exit 1;
+        fi
+    depends_on:
+      - app-e2e
+
   - name: codecov
     image: robertstettner/drone-codecov
     settings:
@@ -166,6 +187,12 @@ services:
       POSTGRES_USER: openbas
       POSTGRES_PASSWORD: openbas
       POSTGRES_DB: openbas
+  - name: elastic
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.18.0
+    environment:
+      discovery.type: single-node
+      xpack.security.enabled: false
+      ES_JAVA_OPTS: -Xms2g -Xmx2g
 
 volumes:
   - name: cache-node-frontend

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,6 +10,11 @@ Thus already a BIG THANK YOU upfront to you for choosing to help with your PR.
 *
 *
 
+### Testing Instructions
+
+1. Step-by-step how to test
+2. Environment or config notes
+
 ### Related issues
 
 * Closes #ISSUE-NUMBER

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.14.0-alpine3.20 AS front-builder
+FROM node:22.15.0-alpine3.20 AS front-builder
 
 WORKDIR /opt/openbas-build/openbas-front
 COPY openbas-front/packages ./packages

openbas-api/pom.xml

@@ -15,15 +15,16 @@
 
     <properties>
         <bcpg-jdk18on.version>1.80</bcpg-jdk18on.version>
-        <commons-collections4.version>4.4</commons-collections4.version>
+        <commons-collections4.version>4.5.0</commons-collections4.version>
         <commons-email.version>1.5</commons-email.version>
         <opensaml.version>4.3.2</opensaml.version>
         <springdoc.version>2.6.0</springdoc.version>
         <springdoc-plugin.version>1.4</springdoc-plugin.version>
         <cron-utils.version>9.2.1</cron-utils.version>
-        <apache-poi.version>5.4.0</apache-poi.version>
-        <opentelemetry.version>1.48.0</opentelemetry.version>
-        <opentelemetry-semconv.version>1.30.0</opentelemetry-semconv.version>
+        <apache-poi.version>5.4.1</apache-poi.version>
+        <opentelemetry.version>1.49.0</opentelemetry.version>
+        <opentelemetry-semconv.version>1.32.0</opentelemetry-semconv.version>
+        <elasticsearch.version>8.18.0</elasticsearch.version>
     </properties>
 
     <profiles>
@@ -50,6 +51,11 @@
             <artifactId>openbas-framework</artifactId>
             <version>1.15.2</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>
@@ -85,6 +91,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-webflux</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>

openbas-api/src/main/java/io/openbas/App.java

@@ -1,12 +1,14 @@
 package io.openbas;
 
+import io.openbas.tools.FlywayMigrationValidator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class App {
 
   public static void main(String[] args) {
+    FlywayMigrationValidator.validateFlywayMigrationNames();
     SpringApplication.run(App.class, args);
   }
 }

openbas-api/src/main/java/io/openbas/config/CachingConfig.java

@@ -0,0 +1,24 @@
+package io.openbas.config;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import java.time.Duration;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableCaching
+public class CachingConfig {
+
+  @Bean
+  public CacheManager cacheManager() {
+    CaffeineCacheManager cacheManager = new CaffeineCacheManager("license");
+
+    cacheManager.setCaffeine(
+        Caffeine.newBuilder().expireAfterWrite(Duration.ofDays(1)).maximumSize(100));
+
+    return cacheManager;
+  }
+}

openbas-api/src/main/java/io/openbas/config/SessionHelper.java

@@ -7,6 +7,9 @@ public class SessionHelper {
   public static final String ANONYMOUS_USER = "anonymousUser";
 
   public static OpenBASPrincipal currentUser() {
+    if (SecurityContextHolder.getContext().getAuthentication() == null) {
+      return new OpenBASAnonymous();
+    }
     Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
     if (ANONYMOUS_USER.equals(principal)) {
       return new OpenBASAnonymous();

openbas-api/src/main/java/io/openbas/config/cache/LicenseCacheManager.java

@@ -0,0 +1,26 @@
+package io.openbas.config.cache;
+
+import io.openbas.ee.Ee;
+import io.openbas.ee.License;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LicenseCacheManager {
+  private final Ee eeService;
+
+  public LicenseCacheManager(Ee eeService) {
+    this.eeService = eeService;
+  }
+
+  @Cacheable("license")
+  public License getEnterpriseEditionInfo() {
+    return eeService.getEnterpriseEditionInfo();
+  }
+
+  @CacheEvict(value = "license", allEntries = true)
+  public void refreshLicense() {
+    eeService.getEnterpriseEditionInfo();
+  }
+}