-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
honor redirect to SAML SSO path if user is already authenticated #50436
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
8ccda2b
redirect if path is saml idp sso path
flyinghermit e3dce6f
fix test and add more tests
flyinghermit 7920b09
add login component tests
flyinghermit 2631020
update test url path value
flyinghermit 76ece1f
Merge branch 'master' into sshah/redirect-on-saml-sso-path
flyinghermit 73dd035
update test var name
flyinghermit bb0407b
rename non-base to base
flyinghermit 572eb1e
Merge branch 'master' into sshah/redirect-on-saml-sso-path
flyinghermit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
/** | ||
* Teleport | ||
* Copyright (C) 2024 Gravitational, Inc. | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
import history from 'teleport/services/history'; | ||
import session from 'teleport/services/websession'; | ||
import cfg from 'teleport/config'; | ||
|
||
import { renderHook } from '@testing-library/react'; | ||
|
||
import useLogin from './useLogin'; | ||
|
||
beforeEach(() => { | ||
jest.restoreAllMocks(); | ||
jest.spyOn(session, 'isValid').mockImplementation(() => true); | ||
jest.spyOn(history, 'push').mockImplementation(); | ||
jest.spyOn(history, 'replace').mockImplementation(); | ||
jest.mock('shared/hooks', () => ({ | ||
useAttempt: () => { | ||
return [ | ||
{ status: 'success', statusText: 'Success Text' }, | ||
{ | ||
clear: jest.fn(), | ||
}, | ||
]; | ||
}, | ||
})); | ||
}); | ||
|
||
afterEach(() => { | ||
jest.resetAllMocks(); | ||
}); | ||
|
||
it('redirect to root on path not matching "/enterprise/saml-idp/sso"', () => { | ||
jest.spyOn(history, 'getRedirectParam').mockReturnValue('http://localhost'); | ||
renderHook(() => useLogin()); | ||
expect(history.replace).toHaveBeenCalledWith('/web'); | ||
|
||
jest | ||
.spyOn(history, 'getRedirectParam') | ||
.mockReturnValue('http://localhost/web/cluster/name/resources'); | ||
renderHook(() => useLogin()); | ||
expect(history.replace).toHaveBeenCalledWith('/web'); | ||
}); | ||
|
||
it('redirect to SAML SSO path on matching "/enterprise/saml-idp/sso"', () => { | ||
const samlIdpPath = new URL('http://localhost' + cfg.routes.samlIdpSso); | ||
cfg.baseUrl = 'http://localhost'; | ||
jest | ||
.spyOn(history, 'getRedirectParam') | ||
.mockReturnValue(samlIdpPath.toString()); | ||
renderHook(() => useLogin()); | ||
expect(history.push).toHaveBeenCalledWith(samlIdpPath, true); | ||
}); | ||
|
||
it('non-base domain redirects with base domain for a matching "/enterprise/saml-idp/sso"', async () => { | ||
const samlIdpPath = new URL('http://different-base' + cfg.routes.samlIdpSso); | ||
jest | ||
.spyOn(history, 'getRedirectParam') | ||
.mockReturnValue(samlIdpPath.toString()); | ||
renderHook(() => useLogin()); | ||
const expectedPath = new URL('http://localhost' + cfg.routes.samlIdpSso); | ||
expect(history.push).toHaveBeenCalledWith(expectedPath, true); | ||
}); | ||
|
||
it('base domain with different path is redirected to root', async () => { | ||
const nonSamlIdpPath = new URL('http://localhost/web/cluster/name/resources'); | ||
flyinghermit marked this conversation as resolved.
Show resolved
Hide resolved
|
||
jest | ||
.spyOn(history, 'getRedirectParam') | ||
.mockReturnValue(nonSamlIdpPath.toString()); | ||
renderHook(() => useLogin()); | ||
expect(history.replace).toHaveBeenCalledWith('/web'); | ||
}); | ||
|
||
it('invalid session does nothing', async () => { | ||
const samlIdpPathWithDifferentBase = new URL( | ||
'http://different-base' + cfg.routes.samlIdpSso | ||
); | ||
jest | ||
.spyOn(history, 'getRedirectParam') | ||
.mockReturnValue(samlIdpPathWithDifferentBase.toString()); | ||
jest.spyOn(session, 'isValid').mockImplementation(() => false); | ||
renderHook(() => useLogin()); | ||
expect(history.replace).not.toHaveBeenCalled(); | ||
expect(history.push).not.toHaveBeenCalled(); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We update any other domain to base domain. This test covers that scenario.
Though, this behavior does not sit well with me and I plan to do a followup on idea of rejecting non-base URL instead of replacing it with base URL.