Merge remote-tracking branch 'origin/master' into issue/1486

Dockerfile_ga

@@ -1,4 +1,4 @@
-FROM openjdk:21-jdk-slim AS app
+FROM openjdk:21-jdk-slim-bookworm AS app
 
 WORKDIR /opt
 RUN apt update && apt install -y tini git --no-install-recommends

openbas-api/pom.xml

@@ -14,7 +14,7 @@
     <description>OpenBAS api</description>
 
     <properties>
-        <bcpg-jdk15on.version>1.70</bcpg-jdk15on.version>
+        <bcpg-jdk18on.version>1.78.1</bcpg-jdk18on.version>
         <commons-collections4.version>4.4</commons-collections4.version>
         <commons-email.version>1.5</commons-email.version>
         <opensaml.version>4.3.2</opensaml.version>
@@ -70,10 +70,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
+            <version>3.2.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -82,6 +79,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
+            <version>3.2.11</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -104,8 +102,8 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpg-jdk15on</artifactId>
-            <version>${bcpg-jdk15on.version}</version>
+            <artifactId>bcpg-jdk18on</artifactId>
+            <version>${bcpg-jdk18on.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

openbas-api/src/main/java/io/openbas/rest/payload/form/PayloadUpsertInput.java

@@ -3,6 +3,7 @@
 import static io.openbas.config.AppConfig.MANDATORY_MESSAGE;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.openbas.database.model.Endpoint;
 import io.openbas.database.model.Payload;
 import io.openbas.database.model.PayloadArgument;
 import io.openbas.database.model.PayloadPrerequisite;
@@ -40,7 +41,7 @@ public class PayloadUpsertInput {
   private String collector;
 
   @JsonProperty("payload_platforms")
-  private String[] platforms;
+  private Endpoint.PLATFORM_TYPE[] platforms;
 
   @JsonProperty("payload_description")
   private String description;

openbas-front/package.json

@@ -25,7 +25,7 @@
     "@xyflow/react": "12.3.0",
     "apexcharts": "3.51.0",
     "axios": "1.7.7",
-    "ckeditor5": "43.2.0",
+    "ckeditor5": "43.3.0",
     "classcat": "5.0.5",
     "classnames": "2.5.1",
     "cronstrue": "2.51.0",

openbas-front/src/components/CKEditor.tsx

@@ -20,6 +20,7 @@ import {
   Heading,
   Highlight,
   HorizontalLine,
+  Image,
   ImageBlockEditing,
   ImageCaption,
   ImageEditing,
@@ -88,6 +89,7 @@ const CKEDITOR_DEFAULT_CONFIG: EditorConfig = {
     Heading,
     Highlight,
     HorizontalLine,
+    Image,
     ImageBlockEditing,
     ImageCaption,
     ImageEditing,
@@ -164,8 +166,11 @@ const CKEDITOR_DEFAULT_CONFIG: EditorConfig = {
     toolbar: [
       'imageTextAlternative',
       'toggleImageCaption',
-      'imageStyle:block',
-      'imageStyle:side',
+      'imageStyle:alignLeft',
+      'imageStyle:alignCenter',
+      'imageStyle:alignRight',
+      'imageStyle:alignBlockLeft',
+      'imageStyle:alignBlockRight',
       'linkImage',
     ],
   },

openbas-front/src/static/css/CKEditorDark.css

@@ -1,6 +1,7 @@
 html[data-theme="dark"],
 body[data-theme="dark"] {
   --ck-z-modal: 3000 !important;
+  --ck-z-panel: 3000 !important;
 
   /* Overrides the border radius setting in the theme. */
   --ck-border-radius: 4px !important;

openbas-front/src/static/css/CKEditorLight.css

@@ -1,6 +1,7 @@
 html[data-theme="light"],
 body[data-theme="light"] {
   --ck-z-modal: 3000 !important;
+  --ck-z-panel: 3000 !important;
 
   /* Overrides the border radius setting in the theme. */
   --ck-border-radius: 4px !important;