Skip to content

Re-encode the URI for the SAML redirect link #3406

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

Merged
david-crespo merged 1 commit into from
Oct 10, 2026
Merged

Re-encode the URI for the SAML redirect link #3406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/pages/LoginPageSaml.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function LoginPageSaml() {
const { silo, provider } = useIdpSelector()

const redirect_uri = searchParams.get('redirect_uri')?.trim()
const query = redirect_uri ? `?redirect_uri=${redirect_uri}` : ''
const query = redirect_uri ? `?redirect_uri=${encodeURIComponent(redirect_uri)}` : ''

return (
<>
Expand Down
14 changes: 13 additions & 1 deletion test/e2e/login-saml.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,19 @@ test.describe('SAML login', () => {
const button = page.getByRole('link', { name: 'Sign in with mock-idp' })
await expect(button).toHaveAttribute(
'href',
'/login/default-silo/saml/mock-idp/redirect?redirect_uri=/projects/mock-project/instances'
'/login/default-silo/saml/mock-idp/redirect?redirect_uri=%2Fprojects%2Fmock-project%2Finstances'
)
})

test('redirect_uri with a query string stays encoded', async ({ page }) => {
const target = '/system/metrics?query=get vm:cpu | filter state == "run"'
await page.goto(
`/login/default-silo/saml/mock-idp?redirect_uri=${encodeURIComponent(target)}`
)
const button = page.getByRole('link', { name: 'Sign in with mock-idp' })
const href = new URL((await button.getAttribute('href'))!, page.url()) // link always has href
expect(href.pathname).toBe('/login/default-silo/saml/mock-idp/redirect')
expect(href.searchParams.get('redirect_uri')).toBe(target)
expect(href.search).not.toMatch(/[ |"]/)
})
})
Loading