Merge 4.10.2 into 4.11.0 (#176)

Tostti · asteriscos · Desvelao · web-flow · commit 6fa0a132d91a · 2025-02-04T09:01:58.000-03:00
* Bump revision (#116) * chore: bump 4.10.0 rev 03 (#123) * Bump revision 04 (#133) * Update the actions' version (#131) * Support Wazuh 5.0.0 * Merge 4.9.1 into 4.10.0 (#102) (#121) * 2.13 release notes (opensearch-project#1832) (opensearch-project#1837) * 2.13 release notes * Fix style and package * Fix style and package * Fix link --------- (cherry picked from commit 7c8058f) * Add required ml permissions to support new roles (opensearch-project#1838) (opensearch-project#1844) * Add required ml permissions to support new roles * Add ml permissions * Remove internal ml action permissions * Add back internal ml action permissions --------- (cherry picked from commit f0cd1cf) * Add compatibility with OpenSearch 2.11.0 (#31) * Bump version Security Dashboards Plugin 2.9.0.0 (#21) * Upgrade to version 2.8.0 of Security Dashboards Plugin (#20) * Patch actions and workflows. Skip integration tests that fail (#4) * Change plugin name in actions and workflows * Patch install-dashboards action * Change jest config path * Skip tests --------- * Change Wazuh logo and titles (#3) * Change Wazuh logo and titles * Don't force custom logo to have 100% width * Add comment * Fix lint * Fix prettier * Update snapshots --------- * Disable tenant popup (#5) * Replace readme (#16) * Replace readme * Replace Opensearch to Wazuh * Update README.md --------- * Add GitHub workflow for automated build (#15) * Manual build * Workflow for automated build * Update .github/workflows/dev-environment.yml --------- * Create codeql.yml * Revert changes in cypress-test.yml * Revert changes in integration-test.yml * Fix integration test * Fix cypress test tenancy disabled --------- * Skip overview page test * Skip test for issue * Skip test for issue --------- * Fix home image and lint * Fix lint * Fix snapshot * Fix integration test * Revert selector --------- * Update of the GitHub actions to create the packages (#33) * Update Build manual Github action * Add wazuh version in package.json * Update package.json --------- * Change order of security in left menu (#36) * Change order of security in left menu * Fix cypress test * Fix repository tests (#46) * Initial commit * Removed Windows and Mac tests * Fix oidc test * Fix SAML test * Bump 4.9.0 to revision 01 (#56) * chore: bump 4.9.0 revision 02 (#64) * Bump revision 03 (#74) * chore: bump to 4.9.1 revision 00 (#76) * Update the security policy (#95) * change: update the security policy * fix: security policy * Update repository security policy (#97) * chore(bump): revision 4.9.1 01 (#99) --------- Signed-off-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Co-authored-by: Sicheng Song <sicheng.song@outlook.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com> Co-authored-by: yenienserrano <ian.serrano@wazuh.com> * Update all workflows to use actions/checkout@v4 for improved compatibility and performance * Update GitHub workflows to use actions/setup-java@v4 with Temurin distribution for better support and performance * Update workflows to use derek-ho/start-opensearch@v6 for enhanced features and compatibility across all GitHub actions * Update workflows to use derek-ho/setup-opensearch-dashboards@v3 for better features and compatibility across all GitHub actions * Update workflows to use tibdex/github-app-token@v2.1.0 for improved installation retrieval method and enhanced functionality * Update workflows to use actions/upload-artifact@v4 for improved artifact upload and added overwrite functionality * Update run-cypress-tests action to use Wandalen/wretry.action@v3 for improved reliability in test retries * Update backport workflow to use VachaShah/backport@v2 for enhanced features and improved functionality in backporting changes * Update Wazuh version to 4.10.0 with revision 03 * Update Wazuh revision to "00" in package.json * Fix missing newline at end of package.json file * Update SECURITY.md to redirect vulnerability reports to OpenSearch Security via email * Revise SECURITY.md to establish Wazuh's formal security policy and guidelines for reporting vulnerabilities --------- Signed-off-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Tostti <nicolas.guevara.pihen@gmail.com> Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Co-authored-by: Sicheng Song <sicheng.song@outlook.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com> Co-authored-by: yenienserrano <ian.serrano@wazuh.com> * chore: bump 4.10.0 rev 05 (#137) * Apply reference name change (#138) * chore(bump): 4.10.0 rev 06 (#141) * Bump revision to 07 (#147) * Bump version 4.10.1 (#157) * chore(bump): 4.10.1 rev 01 (#165) * Bump version to 4.10.2-00 (#169) * Replace the SAML default embedded route redirects with a new default route redirect. (#171) * Saml url default path changes to wz-home * Added pretier * Resolve test * Repair tests --------- Signed-off-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Signed-off-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Signed-off-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com> Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com> Co-authored-by: Guido Modarelli <38738725+guidomodarelli@users.noreply.github.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Stephen Crawford <65832608+scrawfor99@users.noreply.github.com> Co-authored-by: Sicheng Song <sicheng.song@outlook.com> Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com> Co-authored-by: yenienserrano <ian.serrano@wazuh.com> Co-authored-by: JuanGarriuz <juangarriuz@gmail.com>
diff --git a/server/auth/types/saml/routes.ts b/server/auth/types/saml/routes.ts
@@ -71,7 +71,7 @@ export class SamlAuthRoutes {
         if (request.auth.isAuthenticated) {
           return response.redirected({
             headers: {
-              location: `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`,
+              location: `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`,
             },
           });
         }
@@ -118,8 +118,7 @@ export class SamlAuthRoutes {
           if (cookie) {
             requestId = cookie.saml?.requestId || '';
             nextUrl =
-              cookie.saml?.nextUrl ||
-              `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`;
+              cookie.saml?.nextUrl || `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`;
             redirectHash = cookie.saml?.redirectHash || false;
           }
           if (!requestId) {
@@ -251,7 +250,7 @@ export class SamlAuthRoutes {
           this.sessionStorageFactory.asScoped(request).set(cookie);
           return response.redirected({
             headers: {
-              location: `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`,
+              location: `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`,
             },
           });
         } catch (error) {
diff --git a/server/auth/types/saml/saml_auth.ts b/server/auth/types/saml/saml_auth.ts
@@ -60,8 +60,7 @@ export class SamlAuthentication extends AuthenticationType {
 
   private generateNextUrl(request: OpenSearchDashboardsRequest): string {
     let path =
-      this.coreSetup.http.basePath.serverBasePath +
-      (request.url.pathname || '/app/opensearch-dashboards');
+      this.coreSetup.http.basePath.serverBasePath + (request.url.pathname || '/app/wz-home');
     if (request.url.search) {
       path += request.url.search;
     }
diff --git a/test/cypress/e2e/saml/saml_auth_test.spec.js b/test/cypress/e2e/saml/saml_auth_test.spec.js
@@ -29,7 +29,7 @@ before(() => {
 
   // Avoid Cypress lock onto the ipv4 range, so fake `visit()` before `request()`.
   // See: https://github.com/cypress-io/cypress/issues/25397#issuecomment-1402556488
-  cy.visit(`http://localhost:5601${basePath}`);
+  cy.visit(`http://localhost:7000${basePath}`);
 
   cy.createRoleMapping(ALL_ACCESS_ROLE, samlUserRoleMapping);
   cy.clearCookies();
@@ -50,11 +50,11 @@ describe('Log in via SAML', () => {
     }
   };
 
-  it('Login to app/opensearch_dashboards_overview#/ when SAML is enabled', () => {
+  it('Login to app/wz-home_overview#/ when SAML is enabled', () => {
     localStorage.setItem('opendistro::security::tenant::saved', '"__user__"');
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    cy.visit(`http://localhost:5601${basePath}/app/opensearch_dashboards_overview`, {
+    cy.visit(`http://localhost:7000${basePath}/app/wz-home_overview`, {
       failOnStatusCode: false,
     });
 
@@ -68,7 +68,7 @@ describe('Log in via SAML', () => {
     localStorage.setItem('opendistro::security::tenant::saved', '"__user__"');
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    cy.visit(`http://localhost:5601${basePath}/app/dev_tools#/console`, {
+    cy.visit(`http://localhost:7000${basePath}/app/dev_tools#/console`, {
       failOnStatusCode: false,
     });
 
@@ -82,7 +82,7 @@ describe('Log in via SAML', () => {
     localStorage.setItem('opendistro::security::tenant::saved', '"__user__"');
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    const urlWithHash = `http://localhost:5601${basePath}/app/security-dashboards-plugin#/getstarted`;
+    const urlWithHash = `http://localhost:7000${basePath}/app/security-dashboards-plugin#/getstarted`;
 
     cy.visit(urlWithHash, {
       failOnStatusCode: false,
@@ -97,7 +97,7 @@ describe('Log in via SAML', () => {
   it('Tenancy persisted after logout in SAML', () => {
     localStorage.setItem('home:newThemeModal:show', 'false');
 
-    cy.visit(`http://localhost:5601${basePath}/app/opensearch_dashboards_overview`, {
+    cy.visit(`http://localhost:7000${basePath}/app/wz-home_overview`, {
       failOnStatusCode: false,
     });
 
@@ -133,7 +133,7 @@ describe('Log in via SAML', () => {
       // We need to explicitly clear cookies,
       // since the Shorten URL api is return's set-cookie header for admin user.
       cy.clearCookies().then(() => {
-        const gotoUrl = `http://localhost:5601${basePath}/goto/${response.urlId}?security_tenant=global`;
+        const gotoUrl = `http://localhost:7000${basePath}/goto/${response.urlId}?security_tenant=global`;
         cy.visit(gotoUrl);
         samlLogin();
         cy.getCookie('security_authentication').should('exist');

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,7 @@ export class SamlAuthentication extends AuthenticationType {`
`60`	`60`
`61`	`61`	`private generateNextUrl(request: OpenSearchDashboardsRequest): string {`
`62`	`62`	`let path =`
`63`		`- this.coreSetup.http.basePath.serverBasePath +`
`64`		`- (request.url.pathname \|\| '/app/opensearch-dashboards');`
	`63`	`+ this.coreSetup.http.basePath.serverBasePath + (request.url.pathname \|\| '/app/wz-home');`
`65`	`64`	`if (request.url.search) {`
`66`	`65`	`path += request.url.search;`
`67`	`66`	`}`