Skip to content

Commit d8014c9

Browse files
TosttiyenienserranoAlexRuiz7asteriscosDesvelao
authored
Merge 4.13.0 into main (#233)
* Compatibility with opensearch 2.19.0 (#191) (#205) * 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 version 4.10.0 revision 00 (#53) * Merge 4.9.1 into 4.10.0 (#102) * 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) --------- * chore(bump): 4.10.0 rev01 (#103) * chore(bump): 4.10.1 rev 00 (#105) * Bump 4.10.2 00 (#109) * Merge 4.10.0 into 4.10.1 (#143) (#144) * 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) --------- * 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/[email protected] 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 --------- * chore: bump 4.10.0 rev 05 (#137) * Apply reference name change (#138) * chore(bump): 4.10.0 rev 06 (#141) * fix: conflict * fix: typo --------- * Bump version to 4.10.3 revision 00 (#149) * Support Wazuh 4.12.0 rev 00 (#159) * Bump version 4.12.0 * Bump version 4.12.0 * Merge 4.11.0 into 4.12.0 (#177) * Merge 4.10.0 into 4.10.1 (#143) * 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) --------- * 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/[email protected] 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 --------- * chore: bump 4.10.0 rev 05 (#137) * Apply reference name change (#138) * chore(bump): 4.10.0 rev 06 (#141) * fix: conflict * fix: typo --------- * Bump version 4.11.0 (#158) * Bump revision to 4.11.0-01 (#174) * Merge 4.10.2 into 4.11.0 (#176) * 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) --------- * 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/[email protected] 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 --------- * 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 --------- --------- * Change the version of cypress to opensearch dashboard version * Fix saml_aut_test.spec.js * Update dev-environment.yml * Update manual-build.yml * Add VERSION.json (#192) --------- Signed-off-by: Ian Yenien Serrano <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Signed-off-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Stephen Crawford <[email protected]> Co-authored-by: Sicheng Song <[email protected]> Co-authored-by: Guido Modarelli <[email protected]> Co-authored-by: Tostti <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> * Bump version 4.13.0 (#213) * Merge 4.11.2 into 4.12.0 (#224) (#225) * chore(bump): 4.11.1 rev 01 (#203) * Bump revision to 02 (#209) * Bump version 4.11.2 (#217) * Bump version 4.11.2 * Bump version 4.11.2 * chore(bump): 4.11.2 rev 01 (#219) * chore(bump): 4.11.2 rev 02 (#221) --------- Co-authored-by: Antonio <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Nicolas Agustin Guevara Pihen <[email protected]> * Remove unused workflows --------- Signed-off-by: Ian Yenien Serrano <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Signed-off-by: Nicolas Agustin Guevara Pihen <[email protected]> Co-authored-by: Ian Yenien Serrano <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Stephen Crawford <[email protected]> Co-authored-by: Sicheng Song <[email protected]> Co-authored-by: Guido Modarelli <[email protected]> Co-authored-by: JuanGarriuz <[email protected]>
1 parent 45c6c2e commit d8014c9

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

‎.github/workflows/cypress-test-tenancy-disabled.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
cd ./OpenSearch-Dashboards
8383
nohup yarn start --no-base-path --no-watch &
8484
sleep 500
85-
git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
85+
git clone https://github.com/opensearch-project/opensearch-dashboards-functional-test.git -b ${{ env.OPENSEARCH_VERSION }}
8686
cd opensearch-dashboards-functional-test
8787
npm install cypress --save-dev
8888
yarn cypress:run-with-security --browser chrome --spec "cypress/integration/plugins/security/inaccessible_tenancy_features.js"

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@elastic/eslint-import-resolver-kibana": "link:../../packages/osd-eslint-import-resolver-opensearch-dashboards",
3333
"@testing-library/react-hooks": "^7.0.2",
3434
"@types/hapi__wreck": "^15.0.1",
35-
"cypress": "^13.5.1",
35+
"cypress": "12.17.4",
3636
"cypress-mochawesome-reporter": "^3.3.0",
3737
"eslint-plugin-cypress": "^2.8.1",
3838
"eslint-plugin-unused-imports": "3.1.0",
@@ -63,4 +63,4 @@
6363
"micromatch": "^4.0.8",
6464
"cross-spawn": "7.0.5"
6565
}
66-
}
66+
}

‎server/auth/types/saml/routes.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class SamlAuthRoutes {
7171
if (request.auth.isAuthenticated) {
7272
return response.redirected({
7373
headers: {
74-
location: `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`,
74+
location: `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`,
7575
},
7676
});
7777
}
@@ -118,8 +118,7 @@ export class SamlAuthRoutes {
118118
if (cookie) {
119119
requestId = cookie.saml?.requestId || '';
120120
nextUrl =
121-
cookie.saml?.nextUrl ||
122-
`${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`;
121+
cookie.saml?.nextUrl || `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`;
123122
redirectHash = cookie.saml?.redirectHash || false;
124123
}
125124
if (!requestId) {
@@ -251,7 +250,7 @@ export class SamlAuthRoutes {
251250
this.sessionStorageFactory.asScoped(request).set(cookie);
252251
return response.redirected({
253252
headers: {
254-
location: `${this.coreSetup.http.basePath.serverBasePath}/app/opensearch-dashboards`,
253+
location: `${this.coreSetup.http.basePath.serverBasePath}/app/wz-home`,
255254
},
256255
});
257256
} catch (error) {

‎server/auth/types/saml/saml_auth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export class SamlAuthentication extends AuthenticationType {
6363
let path = getRedirectUrl({
6464
request,
6565
basePath: this.coreSetup.http.basePath.serverBasePath,
66-
nextUrl: request.url.pathname || '/app/opensearch-dashboards',
66+
nextUrl: request.url.pathname || '/app/wz-home',
6767
});
6868
if (request.url.search) {
6969
path += request.url.search;

‎test/cypress/e2e/oidc/oidc_auth_test.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ describe('Log in via OIDC', () => {
141141
cy.get('button[data-test-subj^="switch-tenants"]').click();
142142

143143
cy.get('#private').should('be.enabled');
144-
cy.get('#private').click({ force: true });
144+
cy.get('#private').click();
145145

146146
cy.get('button[data-test-subj="confirm"]').click();
147147

‎test/cypress/e2e/saml/saml_auth_test.spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ describe('Log in via SAML', () => {
167167
cy.get('#user-icon-btn').should('be.visible');
168168
cy.get('#user-icon-btn').click();
169169
cy.get('button[data-test-subj^="switch-tenants"]').click();
170-
171170
cy.get('#private').should('be.enabled');
172-
cy.get('#private').click({ force: true });
171+
cy.get('#private').click();
173172

174173
cy.get('button[data-test-subj="confirm"]').click();
175174

0 commit comments

Comments
 (0)