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.

Sign up for GitHub

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

Jump to bottom

1203 Updated to add the tenant into the short URL once the short URL is resolved #1443

Closed
wants to merge 54 commits into from
Closed

1203 Updated to add the tenant into the short URL once the short URL is resolved #1443

wants to merge 54 commits into from

Conversation

leanneeliatra
Copy link
Contributor

@leanneeliatra leanneeliatra commented May 29, 2023 •
edited
Loading

Description

When the tenancy is being changed after copying a short URL, if the user then pastes this short URL into a new tab, the user will be redirected to the current selected tenant, not the tenant as specified in the copied short URL.
We need to retain this information in the URL and redirect so the user is brought to the correct link, with the correct user.

Category

[Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation]

Why these changes are required?

To enable sharing of a short URL with the tenant as specified in the URL remaining selected as the active tenant.

What is the old behavior before changes and new behavior after changes?

The old behaviour is:

  1. A short URL is copied (tenant is specified in the URL)
  2. The tenant is changed
  3. The link is loaded in a new tab
  4. The tenant remains as is specified in 2, not as we would want/expect it to be as per the URL
    The new behaviour is:
  5. A short URL is copied (tenant is specified in the URL)
  6. The tenant is changed
  7. The link is loaded in a new tab
  8. The link is loaded with tenant info retained.

Issues Resolved

[BUG] Shortlinks to other Tenants do not work #1203

Testing

Submitting the PR for an initial review of changes, tests will follow.

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.

opensearch-trigger-bot bot and others added 30 commits June 25, 2022 13:14
@opensearch-trigger-bot @downsrob
Adds snapshot management cluster permissions (opensearch-project#1016) (
2911722 
opensearch-project#1017)

Signed-off-by: Clay Downs <[email protected]>
(cherry picked from commit ccf0e1f)

Co-authored-by: Clay Downs <[email protected]>
@opensearch-trigger-bot @aoguan1990
Fix OIDC looping issue - too many redriects (opensearch-project#1014) (…
521d8a5 
…opensearch-project#1018)

Signed-off-by: Aozixuan Priscilla Guan <[email protected]>
(cherry picked from commit 015dc3f)

Co-authored-by: Aozixuan Priscilla Guan <[email protected]>
@opensearch-trigger-bot @DarshitChanpura
Adds release notes for 2.1.0 (opensearch-project#1015) (opensearch-pr…
c1404df 
…oject#1019)

Signed-off-by: Darshit Chanpura <[email protected]>
(cherry picked from commit bc61403)

Co-authored-by: Darshit Chanpura <[email protected]>
@opensearch-trigger-bot @cwperks
Add tests for account-nav-button when multitenancy is disabled (opens…
ee617d6 
…earch-project#1020) (opensearch-project#1022)

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 4527d1a)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @cliu123
Get security_tenant search param from URL (opensearch-project#1024) (o…
4a4416d 
…pensearch-project#1026)

Signed-off-by: cliu123 <[email protected]>
(cherry picked from commit 348c550)

Co-authored-by: Chang Liu <[email protected]>
@opensearch-trigger-bot @cwperks
Fix bug in support for jwt.url_param customization (opensearch-projec…
85e4a01 
…t#1025) (opensearch-project#1027)

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 5e4004f)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @DarshitChanpura
Revert "Replace _opendistro route with _plugins (opensearch-project#895…
89a8560 
…)" (opensearch-project#1035) (opensearch-project#1036)

This reverts commit e4e4032.

(cherry picked from commit cc5b763)

Co-authored-by: Darshit Chanpura <[email protected]>
@opensearch-trigger-bot @DarshitChanpura
Updates Dev guide (opensearch-project#897) (opensearch-project#1045)
5cbd26a 
Signed-off-by: Darshit Chanpura <[email protected]>
(cherry picked from commit b6fe0c0)

Co-authored-by: Darshit Chanpura <[email protected]>
@opensearch-trigger-bot @DarshitChanpura
Increment version to 2.2.0.0 (opensearch-project#1032) (opensearch-pr…
5ccf7c9 
…oject#1051)

Signed-off-by: Darshit Chanpura <[email protected]>
(cherry picked from commit 1065faa)

Co-authored-by: Darshit Chanpura <[email protected]>
@opensearch-trigger-bot @cwperks
Add release notes for 2.2.0.0 release (opensearch-project#1050) (open…
02a7505 
…search-project#1052)

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 7cb5ac5)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @cwperks
Update release notes for 2.2.0.0 release (opensearch-project#1060) (o…
c62f60c 
…pensearch-project#1061)

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit e87d0ec)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @cwperks
Increment version to 2.3.0.0 (opensearch-project#1068) (opensearch-pr…
fb34c21 
…oject#1075)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit e40699d)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @RyanL1997
Add the feature of showing useful error message during tests with ver…
3d43bdb 
…sion variable (opensearch-project#1083) (opensearch-project#1085)

Signed-off-by: Ryan Liang <[email protected]>
(cherry picked from commit 964e804)

Co-authored-by: Ryan Liang <[email protected]>
@opensearch-trigger-bot @spartan2015
Use expiration of tokens from the id token (opensearch-project#1091)
7212d19 
Use expiration of tokens from the id token

The like oidc token response from Gitlab expiresIn property is not the actual expiration of the idToken. idToken expires before the access_token does. This fix allows the security plugin used when integrating with Gitlab

Signed-off-by: Vasile Negru <[email protected]>
(cherry picked from commit 057cbe4)

Co-authored-by: Vasile Irimia <[email protected]>
@opensearch-trigger-bot @cwperks
Add release notes for 2.3.0.0 (opensearch-project#1093) (opensearch-p…
1d4ee91 
…roject#1094)

Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit d89d31b)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @cwperks
Increment version to 2.4.0.0 (opensearch-project#1096) (opensearch-pr…
b45eddc 
…oject#1097)

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 7e4b6c3)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @RyanL1997
Fixed the tenant switching after timeout (opensearch-project#1090) (o…
59b7566 
…pensearch-project#1103)

Signed-off-by: Ryan Liang <[email protected]>
(cherry picked from commit 5d018b0)

Co-authored-by: Ryan Liang <[email protected]>
@opensearch-trigger-bot @devardee
Preserve URL Hash for SAML based login (opensearch-project#1039) (ope…
3a04a68 
…nsearch-project#1105)

* Preserve URL HASH after user logs via SAML IDP

Co-authored-by: Darshit Chanpura <[email protected]>
(cherry picked from commit a9d10d8)

Co-authored-by: Deepak Devarakonda <[email protected]>
@cwperks
[Backport 2.x] SAML Integration Tests (opensearch-project#1104)
169790b 
* SAML Integration Tests (opensearch-project#1088)
(cherry picked from commit a4fa35d)

Signed-off-by: Deepak Devarakonda <[email protected]>
Signed-off-by: Aniketh Jain <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: anijain-Amazon <[email protected]>
@opensearch-trigger-bot @RyanL1997
Fix the UI user flow of selecting custom teanant on tenant switch pan…
e07e712 
…el (opensearch-project#1112) (opensearch-project#1117)

Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
(cherry picked from commit 3bfd7c5)

Co-authored-by: Ryan Liang <[email protected]>
@expani
[Backport 2.x] Fix for Tenancy info getting lost on re-login in SAML …
a616b0a 
…Authentication flow (opensearch-project#1134)

* SAML Integration Tests (opensearch-project#1088)

Signed-off-by: Deepak Devarakonda <[email protected]>
Signed-off-by: Aniketh Jain <[email protected]>
Signed-off-by: Aniketh Jain <[email protected]>
Co-authored-by: Deepak Devarakonda <[email protected]>

(cherry picked from commit a4fa35d)
(cherry picked from commit 05649d6)
@opensearch-trigger-bot @zengyan-amazon
Remove multi-tenant path check in auth handler (opensearch-project#1151…
d362be6 
…) (opensearch-project#1168)

Signed-off-by: Yan Zeng <[email protected]>

Co-authored-by: Chang Liu <[email protected]>
(cherry picked from commit 6236fe2)

Co-authored-by: Yan Zeng <[email protected]>
@peternied
[Backport 2.x] Support CI for Windows and MacOS (opensearch-project#1164
a8278c1 
) (opensearch-project#1167)

* Support CI for Windows and MacOS (opensearch-project#1164)

Creates a github action to install and configure Dashboards that is reused within the workflows of this repository, its multi-platform safe.

Signed-off-by: Peter Nied <[email protected]>
(cherry picked from commit a21c7be)

* Support checkout out #.X branch types

Signed-off-by: Peter Nied <[email protected]>
@cliu123 @RyanL1997
@cwperks @zengyan-amazon
[Backport 2.x] OSD Saved Object Aggregation View (opensearch-project#…
ccb3ccd 
…1186)

* Saved Object Aggregation View (opensearch-project#1146)
* Move tenant-related utils to common folder (opensearch-project#1184)
* [Saved Object Aggregation View] Use namespace registry to add tenant filter (opensearch-project#1169)

Signed-off-by: Chang Liu <[email protected]>
Signed-off-by: Ryan Liang <[email protected]>
Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: Yan Zeng <[email protected]>

Co-authored-by: Ryan Liang <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
Co-authored-by: Craig Perkins <[email protected]>
Co-authored-by: Yan Zeng <[email protected]>
@opensearch-trigger-bot
configure new ML plugin actions (opensearch-project#1182) (opensearch…
cd748d0 
…-project#1189)

Signed-off-by: Yaliang Wu <[email protected]>
Co-authored-by: Chang Liu <[email protected]>
(cherry picked from commit 1ae8e24)
@opensearch-trigger-bot
Initial commit for multiple authentication (opensearch-project#1110) (o…
c2fe92a 
…pensearch-project#1191)

Signed-off-by: Aozixuan Priscilla Guan <[email protected]>

Co-authored-by: Craig Perkins <[email protected]>
Co-authored-by: Ryan Liang <[email protected]>
Co-authored-by: anijain-Amazon <[email protected]>
Co-authored-by: Deepak Devarakonda <[email protected]>
Co-authored-by: Chang Liu <[email protected]>
(cherry picked from commit eee08a5)
@opensearch-trigger-bot @RyanL1997
Add release notes for 2.4.0.0 (opensearch-project#1197) (opensearch-p…
b90232e 
…roject#1198)

Signed-off-by: Ryan Liang <[email protected]>
(cherry picked from commit b451cb2)

Co-authored-by: Ryan Liang <[email protected]>
@opensearch-trigger-bot @cliu123
Disable UTs for Windows while stablizing it (opensearch-project#1202) (…
81ca648 
…opensearch-project#1213)

Signed-off-by: Chang Liu <[email protected]>
(cherry picked from commit b04271a)

Co-authored-by: Chang Liu <[email protected]>
@opensearch-trigger-bot @cwperks
Wait for tenant radio to be selected in flaky SAML integ test (opense…
4faf916 
…arch-project#1201) (opensearch-project#1214)

(cherry picked from commit 257325c)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @peternied
Add retry and enable UTs for Windows (opensearch-project#1215) (opens…
ff8e2b4 
…earch-project#1218)

Added a retry around the the bootstrap that previously failed due to network issues.  Ran the new version of this workflow 100 iterations on linux and windows, both passed at 100% [1].

Without the retry during a run of 100 iterations [2], the windows test failed once during the bootstrap.  If we see future issues, we could attempt to add retries to them following this same pattern.

[1] https://github.com/peternied/security-dashboards-plugin/actions/runs/3449518073
[2] https://github.com/peternied/security-dashboards-plugin/actions/runs/3449040181

Signed-off-by: Peter Nied <[email protected]>
(cherry picked from commit 3abb707)

Co-authored-by: Peter Nied <[email protected]>
opensearch-trigger-bot bot and others added 7 commits February 16, 2023 10:14
@opensearch-trigger-bot
Update URLs referencing old docs-beta site (opensearch-project#1231) (o…
41b6d37 
…pensearch-project#1330)
@opensearch-trigger-bot @peternied
Switch to maven to download plugin (opensearch-project#1331) (opensea…
5c9db2d 
…rch-project#1332)

Signed-off-by: Peter Nied <[email protected]>
(cherry picked from commit a039441)

Co-authored-by: Peter Nied <[email protected]>
@opensearch-trigger-bot @cwperks
Add indices:admin/close* to list of permissible index permissions (op…
1fb57f6 
…ensearch-project#1323) (opensearch-project#1340)

Signed-off-by: Craig Perkins <[email protected]>
Co-authored-by: Peter Nied <[email protected]>
(cherry picked from commit d5441b2)

Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot @smortex @cwperks
Fix plugin configuration path (opensearch-project#1304) (opensearch-p…
f159501 
…roject#1342)

The dashboard has references to an old path that does not exist anymore:
`plugins/opensearch-security/securityconfig/config.yml`.  It was
replaced by `config/opensearch-security/config.yml` in this commit:

opensearch-project/security@b44d7ea

Fix the last occurences of `plugins/opensearch-security/securityconfig`.

Signed-off-by: Romain Tartière <[email protected]>
Co-authored-by: Stephen Crawford <[email protected]>
(cherry picked from commit 82c27c7)

Co-authored-by: Romain Tartière <[email protected]>
Co-authored-by: Craig Perkins <[email protected]>
@opensearch-trigger-bot
Synchronize all permissions from latest OpenSearch (opensearch-projec…
8f08803 
…t#1333) (opensearch-project#1341)

We've noticed there are some permissions in OpenSearch that are not included in the UX dropdown of the security-dashboards-plugin

Signed-off-by: Peter Nied <[email protected]>
Co-authored-by: Craig Perkins <[email protected]>
(cherry picked from commit e5c0588)
@opensearch-trigger-bot @cwperks
Add release notes for 2.6.0.0 (opensearch-project#1343) (opensearch-p…
c4791f8 
…roject#1344)

Signed-off-by: Craig Perkins <[email protected]>
(cherry picked from commit 2506898)

Co-authored-by: Craig Perkins <[email protected]>
@leanneeliatra
updated to add the tenant into the short URL once resolved
b872d31 
Signed-off-by: leanneeliatra <[email protected]>
@davidlago
Copy link

Thanks for the contribution, @leanneeliatra! PRs need to be made into main, please switch the target branch.

@leanneeliatra leanneeliatra changed the base branch from 2.6 to main May 30, 2023 15:46
@leanneeliatra
Copy link
Contributor Author

Thanks for the contribution, @leanneeliatra! PRs need to be made into main, please switch the target branch.
Thank you @davidlago, done.

@DarshitChanpura
Copy link
Member

DarshitChanpura commented May 30, 2023 •
edited
Loading

Hello @leanneeliatra thank you for opening this PR. Would you please rebase your branch with latest changes from main?

You can use following command to rebase to main from your old base-branch.

git rebase --onto main <old-base-branch> 2.6

Suggestion, you can rename the branch to something like: short-url-tenant-fix

@leanneeliatra leanneeliatra changed the title Updated to add the tenant into the short URL once the short URL is resolved #1203 Updated to add the tenant into the short URL once the short URL is resolved May 30, 2023
@leanneeliatra leanneeliatra changed the title #1203 Updated to add the tenant into the short URL once the short URL is resolved 1203 Updated to add the tenant into the short URL once the short URL is resolved May 30, 2023
@leanneeliatra leanneeliatra mentioned this pull request Jun 1, 2023
Merged
3 tasks
@leanneeliatra
Copy link
Contributor Author

leanneeliatra commented Jun 1, 2023 •
edited
Loading

This PR has been moved to a branch that was created directly from main, and a new PR created.
#1462
The changes got a bit confusing and I thought that was a better solution & allowed for a cleaner copy of the changes. Thanks.
cc @DarshitChanpura @davidlago

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cliu123 cliu123 Awaiting requested review from cliu123

@cwperks cwperks Awaiting requested review from cwperks cwperks is a code owner

@DarshitChanpura DarshitChanpura Awaiting requested review from DarshitChanpura DarshitChanpura is a code owner

@davidlago davidlago Awaiting requested review from davidlago

@peternied peternied Awaiting requested review from peternied

@RyanL1997 RyanL1997 Awaiting requested review from RyanL1997 RyanL1997 is a code owner

@stephen-crawford stephen-crawford Awaiting requested review from stephen-crawford

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@leanneeliatra @davidlago @DarshitChanpura @cwperks @expani @peternied @cliu123 @RyanL1997