Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Fix issue when using OpenID Authentication with serverBasePath #1946

Merged
merged 1 commit into from
May 10, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 9662025 from #1899

* Test OIDC with basePath

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Run OIDC tests with basePath

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Run all tests with basePath

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix kibana url

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove requirement on nextUrl

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove duplicate

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add basePath to acs endpoint

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update snapshot

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Start IdP where acs contains the basePath

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* es:lint --fix

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Generalize SAML tests to include basePath

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add default

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use -z

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Cypress env

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Cypress env

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Handle undefined

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Always pass basePath

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove ampersand

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Pass basePath in yarn_command

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* re-add osd_base_path

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Try ternary

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Start with basePath

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Use separate steps

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update shortenUrl

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove basePath in acs endpoint and fix shorten URL

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Comma-separated env

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* update oidc_auth_test.spec.js

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Check cookie after login

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* failOnStatusCode false

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* mimic SAML

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* mimic SAML

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove cy.origin

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add cy.origin back

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Try wrapping in cy.url

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Visit directly

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Try localhost

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Comment out test for now

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add another request after logout

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Wait for logout

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Small update

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add base_redirect_url

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Explicitly add minimist as dev dependency

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Co-authored-by: Darshit Chanpura <dchanp@amazon.com>
Co-authored-by: Jialiang Liang <ryanleeang@gmail.com>
(cherry picked from commit 9662025)
Copy link

codecov bot commented May 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.62%. Comparing base (f45a0fd) to head (3d2ba72).

Additional details and impacted files
@@           Coverage Diff           @@
##              2.x    #1946   +/-   ##
=======================================
  Coverage   69.62%   69.62%           
=======================================
  Files          96       96           
  Lines        2453     2453           
  Branches      329      329           
=======================================
  Hits         1708     1708           
  Misses        665      665           
  Partials       80       80           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DarshitChanpura DarshitChanpura merged commit 7a8e83e into 2.x May 10, 2024
36 checks passed
@github-actions github-actions bot deleted the backport/backport-1899-to-2.x branch May 10, 2024 03:29
@ericsmalling
Copy link

ericsmalling commented Jun 10, 2024

Did this fix make it into the 2.14.0.0 release?

UPDATE: It looks like the original issue got labeled for 2.15

@ericsmalling
Copy link

.... I don't see the issue in opensearch-project/opensearch-build#4681 though :/

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