Skip to content

[ Backport 2.3 ] 1054, 1058 and 1088#1132

Merged
peternied merged 3 commits intoopensearch-project:2.3from
expani:backport/backport-1088-1058-1039-to-2.3
Oct 7, 2022
Merged

[ Backport 2.3 ] 1054, 1058 and 1088#1132
peternied merged 3 commits intoopensearch-project:2.3from
expani:backport/backport-1088-1058-1039-to-2.3

Conversation

@expani
Copy link
Contributor

@expani expani commented Oct 6, 2022

Description

This backport PR is for the following PRs :

Category

[Backport]

Why these changes are required?

Changes need to be backported

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

devardee and others added 3 commits October 6, 2022 19:27
* Preserve URL HASH after user logs via SAML IDP

Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
(cherry picked from commit a9d10d8)
Signed-off-by: Aniketh Jain <anijainc@amazon.com>
* Refactor + add support to run saml based integ tests via selenium web driver

Signed-off-by: Deepak Devarakonda <devardee@amazon.com>

* Add plugins.security.unsupported.restapi.allow_securityconfig_modification in developer guide

Signed-off-by: Deepak Devarakonda <devardee@amazon.com>

* Add one more test

Signed-off-by: Deepak Devarakonda <devardee@amazon.com>

* Added tests for checking tenancy retention after logout in SAML

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Lint formatting fixes

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Removed unused imports

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Add plugins.security.unsupported.restapi.allow_securityconfig_modification in developer guide

Signed-off-by: Deepak Devarakonda <devardee@amazon.com>

* Added License header

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added building the plugin bundles while running ITs

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Signed off the commit

Removed a comment no longer required

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added debug loggers for checking IT failures

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added debug loggers for checking IT failures

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added debug loggers for checking IT failures

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added debug loggers for checking IT failures

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added a new stage for debug loggers before cleanup

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added a new stage for debug loggers before cleanup

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added logger to print error recieved from auth info during saml login

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added Docker host N/W Config to allow connection to SAML IDP

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added discovery type config to be single node for passing bootstrap checks

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Debug loggers

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Debug loggers

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Debug loggers

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Reverted run command to see change in error

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Trying with full docker image of OS

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Refactored the integration test yaml to use OS Full Docker image

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Removed all debug loggers

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added selfSigned package for generating certs and integrated with saml-idp

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Deleted checked-in key and cert for saml-idp server

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Reverted use of docker image and testing again with manual build

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Reverted use of docker image and testing again with manual build

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Upgraded version from 2.3 to 2.4

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Removed debug pointers

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Commented out failing IT temporarily

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Lint formatting fix

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added the commented failing test back again

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Removed assertion from test again to make it pass

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Used a better XPath and improved error logging in tests

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Removed an unused XPath

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added back the assertion for failing IT

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Added steps to run Selenium based Integ Tests

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Commented out the test, will re-enable it again in the fix PR

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

* Parameterized the getDriver function

Signed-off-by: Aniketh Jain <anijainc@amazon.com>

Signed-off-by: Deepak Devarakonda <devardee@amazon.com>
Signed-off-by: Aniketh Jain <anijainc@amazon.com>
Co-authored-by: Deepak Devarakonda <devardee@amazon.com>
(cherry picked from commit a4fa35d)
Signed-off-by: Aniketh Jain <anijainc@amazon.com>
…flow (opensearch-project#1058)

* Fix for picking up tenancy from local storage in SAML AuthN flow

Signed-off-by: Aniketh Jain <anijainc@amazon.com>
(cherry picked from commit 05649d6)
Signed-off-by: Aniketh Jain <anijainc@amazon.com>
@expani expani force-pushed the backport/backport-1088-1058-1039-to-2.3 branch from a839f64 to 5c314f8 Compare October 6, 2022 13:58
@codecov-commenter
Copy link

Codecov Report

Merging #1132 (5c314f8) into 2.3 (741702d) will decrease coverage by 0.13%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##              2.3    #1132      +/-   ##
==========================================
- Coverage   74.56%   74.43%   -0.14%     
==========================================
  Files          85       85              
  Lines        1856     1862       +6     
  Branches      236      237       +1     
==========================================
+ Hits         1384     1386       +2     
- Misses        419      423       +4     
  Partials       53       53              
Impacted Files Coverage Δ
...ards-plugin/public/apps/account/log-out-button.tsx 90.00% <0.00%> (-10.00%) ⬇️
...ty-dashboards-plugin/public/apps/account/utils.tsx 5.88% <0.00%> (-1.27%) ⬇️
...-plugin/public/apps/account/account-nav-button.tsx 71.42% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@expani expani marked this pull request as ready for review October 6, 2022 14:15
@expani expani requested a review from a team October 6, 2022 14:15
@peternied peternied merged commit 417ecbf into opensearch-project:2.3 Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants