Merge pull request #810 from wazuh/merge-4.14.0-into-main

Merge 4.14.0 into main

Author: Tostti

.github/workflows/cypress_workflow.yml

@@ -156,7 +156,8 @@ jobs:
         matrix.config == 'dashboard' &&
         'node scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --opensearchDashboards.branding.useExpandedHeader=true'||
         'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --savedObjects.maxImportPayloadBytes=10485760 --server.maxPayloadBytes=1759977 --logging.json=false --data.search.aggs.shardDelay.enabled=true --csp.warnLegacyBrowsers=false --uiSettings.overrides["query:enhancements:enabled"]=false --opensearchDashboards.branding.useExpandedHeader=true' }}
-      OPENSEARCH_SNAPSHOT_CMD: ${{ (matrix.config == 'query_enhanced' || matrix.config == 'explore') &&
+      OPENSEARCH_SNAPSHOT_CMD:
+        ${{ (matrix.config == 'query_enhanced' || matrix.config == 'explore') &&
         '/bin/bash -c "./opensearch-${{ env.LATEST_VERSION }}/opensearch-tar-install.sh &"' ||
         matrix.config == 'dashboard' &&
         'node scripts/opensearch snapshot -E cluster.routing.allocation.disk.threshold_enabled=false -E search.concurrent_segment_search.mode=none' ||

CHANGELOG.md

@@ -24,12 +24,20 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Fixed a problem with the service file that was marked world-inaccessible [#740](https://github.com/wazuh/wazuh-dashboard/pull/740)
 
-## Wazuh dashboard v4.13.0 - OpenSearch Dashboards 2.19.2 - Revision 01
+### Changed
+
+- Reduced default session and cookie expiration to 15 minutes for the Wazuh security plugin [#749](https://github.com/wazuh/wazuh-dashboard/issues/749)[#321](https://github.com/wazuh/wazuh-security-dashboards-plugin/pull/321)
+
+## Wazuh dashboard v4.13.0 - OpenSearch Dashboards 2.19.2 - Revision 04
 
 ### Added
 
 - Support for Wazuh 4.13.0
 
+### Fixed
+
+- Fixed a problem that caused configuration files to be duplicated [#790](https://github.com/wazuh/wazuh-dashboard/issues/790)
+
 ## Wazuh dashboard v4.12.0 - OpenSearch Dashboards 2.19.1 - Revision 03
 
 ### Added
@@ -126,3 +134,4 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Changed default logos and main menu app categories [141](https://github.com/wazuh/wazuh-dashboard/pull/141)
 - Changed default value of useExpandedHeader to false [#247](https://github.com/wazuh/wazuh-dashboard/pull/247)
 - Changed build number to match the Wazuh standard [#284](https://github.com/wazuh/wazuh-dashboard/pull/284)
+ 

config/opensearch_dashboards.prod.yml

@@ -12,3 +12,7 @@ server.ssl.key: "/etc/wazuh-dashboard/certs/dashboard-key.pem"
 server.ssl.certificate: "/etc/wazuh-dashboard/certs/dashboard.pem"
 opensearch.ssl.certificateAuthorities: ["/etc/wazuh-dashboard/certs/root-ca.pem"]
 uiSettings.overrides.defaultRoute: /app/wz-home
+# Session expiration settings
+opensearch_security.cookie.ttl: 900000
+opensearch_security.session.ttl: 900000
+opensearch_security.session.keepalive: true

dev-tools/build-packages/base-packages-to-base/README.md

@@ -36,4 +36,4 @@ bash run-docker-compose.sh \
     --node-version 20.18.3
 ```
 
-This example will create a packages folder that inside will have the packages divided by repository of the main branch of each one.
+This example will create a packages folder that inside will have the packages divided by repository of the main branch of each one.

dev-tools/build-packages/deb/debian/rules

@@ -67,8 +67,8 @@ override_dh_install:
 	mkdir -p $(TARGET_DIR)/etc/systemd/system
 	mkdir -p $(TARGET_DIR)/etc/default
 
-	cp wazuh-dashboard-base/config/node.options $(TARGET_DIR)$(CONFIG_DIR)
-	cp wazuh-dashboard-base/config/opensearch_dashboards.yml $(TARGET_DIR)$(CONFIG_DIR)
+	mv wazuh-dashboard-base/config/node.options $(TARGET_DIR)$(CONFIG_DIR)
+	mv wazuh-dashboard-base/config/opensearch_dashboards.yml $(TARGET_DIR)$(CONFIG_DIR)
 	mv wazuh-dashboard-base/* $(TARGET_DIR)$(INSTALLATION_DIR)
 
 	mkdir -p $(TARGET_DIR)$(INSTALLATION_DIR)/config

dev-tools/build-packages/rpm/wazuh-dashboard.spec

@@ -66,8 +66,8 @@ mkdir -p %{buildroot}/etc/systemd/system
 mkdir -p %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}/etc/default
 
-cp wazuh-dashboard-base/config/node.options %{buildroot}%{CONFIG_DIR}
-cp wazuh-dashboard-base/config/opensearch_dashboards.yml %{buildroot}%{CONFIG_DIR}
+mv wazuh-dashboard-base/config/node.options %{buildroot}%{CONFIG_DIR}
+mv wazuh-dashboard-base/config/opensearch_dashboards.yml %{buildroot}%{CONFIG_DIR}
 cp wazuh-dashboard-base/VERSION.json %{buildroot}%{INSTALL_DIR}
 
 mv wazuh-dashboard-base/* %{buildroot}%{INSTALL_DIR}
@@ -205,8 +205,6 @@ rm -fr %{buildroot}
 
 %config(noreplace) %attr(0750, %{USER}, %{GROUP}) "/etc/default/wazuh-dashboard"
 %config(noreplace) %attr(0640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"
-%config(noreplace) %attr(0640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/config/opensearch_dashboards.yml"
-%config(noreplace) %attr(0640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/config/node.options"
 
 %attr(440, %{USER}, %{GROUP}) %{INSTALL_DIR}/VERSION.json
 %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}

docker/config/opensearch_dashboards.dev.security.yml

@@ -8,6 +8,10 @@ opensearch.requestHeadersWhitelist: [ authorization,securitytenant ]
 opensearch_security.multitenancy.enabled: true
 opensearch_security.multitenancy.tenants.preferred: ["Private", "Global"]
 opensearch_security.readonly_mode.roles: ["kibana_read_only"]
+# Session expiration settings
+opensearch_security.cookie.ttl: 900000
+opensearch_security.session.ttl: 900000
+opensearch_security.session.keepalive: true
 
 # Use this setting if you are running opensearch-dashboards without https
 opensearch_security.cookie.secure: false