Merge 4.14.1 into main

.github/actions/run-cypress-tests/action.yml

@@ -17,7 +17,7 @@ inputs:
     default: ''
 
 runs:
-  using: "composite"
+  using: 'composite'
   steps:
     - name: Set env
       run: |
@@ -34,12 +34,12 @@ runs:
         plugin-name: ${{ env.PLUGIN_NAME }}
         plugin-version: ${{ env.PLUGIN_VERSION }}
         download-location: ${{ env.PLUGIN_NAME }}
-    
+
     - name: Run Opensearch with A Single Plugin
       uses: derek-ho/start-opensearch@v6
       with:
         opensearch-version: ${{ env.OPENSEARCH_VERSION }}
-        plugins: "file:$(pwd)/opensearch-security.zip"
+        plugins: 'file:$(pwd)/opensearch-security.zip'
         security-enabled: true
         admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }}
         security_config_file: ${{ inputs.security_config_file }}
@@ -81,7 +81,7 @@ runs:
       shell: bash
 
     # Check if OSD is ready with a max timeout of 600 seconds
-    - name : Check If OpenSearch Dashboards Is Ready
+    - name: Check If OpenSearch Dashboards Is Ready
       if: ${{ runner.os == 'Linux' }}
       run: |
         cd ./OpenSearch-Dashboards
@@ -107,4 +107,4 @@ runs:
         command: |
           cd ./OpenSearch-Dashboards/plugins/security-dashboards-plugin
           yarn add cypress --save-dev
-          eval ${{ inputs.yarn_command }} 
+          eval ${{ inputs.yarn_command }}

.github/workflows/cypress-test-multiauth-e2e.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest ]
-        basePath: [ "", "/osd" ]
+        os: [ubuntu-latest]
+        basePath: ['', '/osd']
     runs-on: ${{ matrix.os }}
     if: github.event.pull_request.draft == false
 

.github/workflows/cypress-test-multidatasources-disabled-e2e.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     if: github.event.pull_request.draft == false
 

.github/workflows/cypress-test-multidatasources-enabled-e2e.yml

@@ -17,10 +17,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     if: github.event.pull_request.draft == false
-
     steps:
       - name: Checkout Branch
         uses: actions/checkout@v4
@@ -72,14 +71,15 @@ jobs:
         uses: derek-ho/start-opensearch@v6
         with:
           opensearch-version: ${{ env.OPENSEARCH_VERSION }}
-          plugins: "file:$(pwd)/opensearch-security.zip"
+          plugins: 'file:$(pwd)/opensearch-security.zip'
           security-enabled: true
           admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }}
           security_config_file: config_custom.yml
           port: 9202
           jdk-version: 21
 
-      - name: Check OpenSearch is running
+      - name:
+          Check OpenSearch is running
           # Verify that the server is operational
         run: |
           curl https://localhost:9202/_cat/plugins -v -u admin:${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }} -k

.github/workflows/cypress-test-oidc-e2e.yml

@@ -18,6 +18,7 @@ env:
 jobs:
   tests:
     name: Run Cypress E2E OIDC tests
+    if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:

.github/workflows/cypress-test-saml-e2e.yml

@@ -17,8 +17,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest ]
-        basePath: [ "", "/osd" ]
+        os: [ubuntu-latest]
+        basePath: ['', '/osd']
     runs-on: ${{ matrix.os }}
     if: github.event.pull_request.draft == false
 

.github/workflows/cypress-test.yml

@@ -18,13 +18,12 @@ env:
 jobs:
   cypress-tests:
     name: Run Cypress tests
+    if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
-    if: github.event.pull_request.draft == false
-
     steps:
       - name: Checkout Branch
         uses: actions/checkout@v4

.github/workflows/dev-environment.yml

@@ -43,7 +43,7 @@ jobs:
   # Deploy the plugin in a development environment and run a command
   # using a pre-built Docker image, hosted in Quay.io.
   deploy_and_run_command:
-    permissions: 
+    permissions:
       pull-requests: write
     name: Deploy and run command
     runs-on: ubuntu-24.04
@@ -70,7 +70,7 @@ jobs:
           # Get Wazuh version and concatenate with platform version
           wazuh_version=$(jq -r '.wazuh.version' wazuh-security-plugin/package.json);
           echo "Wazuh version: $wazuh_version";
-          
+
           # Concatenate versions in format: <Opensearch version>-<Wazuh version>
           combined_version="${platform_version}-${wazuh_version}";
           echo "Combined platform version: $combined_version";

.github/workflows/integration-test.yml

@@ -13,13 +13,12 @@ env:
 jobs:
   tests:
     name: Run integration tests
+    if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest] # Removed  windows-latest
     runs-on: ${{ matrix.os }}
-    if: github.event.pull_request.draft == false
-
     steps:
       - name: Checkout Branch
         uses: actions/checkout@v4
@@ -70,7 +69,7 @@ jobs:
         uses: derek-ho/start-opensearch@v6
         with:
           opensearch-version: ${{ env.OPENSEARCH_VERSION }}
-          plugins: "file:$(pwd)/opensearch-security-${{ env.OPENSEARCH_VERSION }}.zip"
+          plugins: 'file:$(pwd)/opensearch-security-${{ env.OPENSEARCH_VERSION }}.zip'
           security-enabled: true
           admin-password: ${{ env.OPENSEARCH_INITIAL_ADMIN_PASSWORD }}
           security_config_file: ${{ inputs.security_config_file }}

.github/workflows/manual-build.yml

@@ -26,7 +26,7 @@ jobs:
   build:
     name: Build app package
     uses: ./.github/workflows/dev-environment.yml
-    permissions: 
+    permissions:
       pull-requests: write
     with:
       reference: ${{ inputs.reference }}

.github/workflows/unit-test.yml

@@ -7,6 +7,7 @@ on:
 jobs:
   unit-tests:
     name: Run unit tests
+    if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:

.github/workflows/verify-binary-installation.yml

@@ -13,6 +13,7 @@ env:
 jobs:
   verify-binary-installation:
     name: Run binary installation
+    if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:

server/index.ts

@@ -62,7 +62,7 @@ export const configSchema = schema.object({
     secure: schema.boolean({ defaultValue: false }),
     name: schema.string({ defaultValue: 'security_authentication' }),
     password: schema.string({ defaultValue: 'security_cookie_default_password', minLength: 32 }),
-    ttl: schema.number({ defaultValue: 60 * 60 * 1000 }),
+    ttl: schema.number({ defaultValue: 15 * 60 * 1000 }),
     domain: schema.nullable(schema.string()),
     isSameSite: schema.oneOf(
       [
@@ -75,7 +75,7 @@ export const configSchema = schema.object({
     ),
   }),
   session: schema.object({
-    ttl: schema.number({ defaultValue: 60 * 60 * 1000 }),
+    ttl: schema.number({ defaultValue: 15 * 60 * 1000 }),
     keepalive: schema.boolean({ defaultValue: true }),
   }),
   auth: schema.object({