Skip to content

[Backport 2.x] Fix for Tenancy info getting lost on re-login in SAML Authentication flow #1134

Merged
peternied merged 2 commits intoopensearch-project:2.xfrom
expani:backport/backport-1058-1088-to-2.x
Oct 7, 2022
Merged

[Backport 2.x] Fix for Tenancy info getting lost on re-login in SAML Authentication flow #1134
peternied merged 2 commits intoopensearch-project:2.xfrom
expani:backport/backport-1058-1088-to-2.x

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 back-ported

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.

expani and others added 2 commits October 6, 2022 21:02
* 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)
…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)
@expani expani changed the base branch from main to 2.x October 6, 2022 16:55
@expani expani changed the title [Backport 2.x] 1058 and 1088 [Backport 2.x] 1058 Oct 6, 2022
@expani expani marked this pull request as ready for review October 6, 2022 16:56
@expani expani requested a review from a team October 6, 2022 16:56
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anijain-Amazon If you wouldn't mind, could you provide what broke down in the backporting process? I don't have an issue merging this change, but am curious if there is an underlying issues that needs to be addressed.

@expani
Copy link
Contributor Author

expani commented Oct 7, 2022

@peternied Not sure about the exact cause of the issue. But, the backport bot failed to create the PRs.

Here is the comment on backport 2.x failing by the bot.

@cwperks cwperks changed the title [Backport 2.x] 1058 [Backport 2.x] Fix for Tenancy info getting lost on re-login in SAML Authentication flow Oct 7, 2022
@peternied peternied merged commit a616b0a into opensearch-project:2.x 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.

3 participants