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

🚑 disallow redirecting landing page #3843

Merged
merged 1 commit into from
Aug 5, 2024
Merged

🚑 disallow redirecting landing page #3843

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
4 changes: 4 additions & 0 deletions adminSiteClient/SiteRedirectsIndexPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ export default function SiteRedirectsIndexPage() {
if (value === source) {
return "Source and target cannot be the same."
}
const sourceUrl = new URL(source, "https://ourworldindata.org")
if (sourceUrl.pathname === "/") {
return "Source cannot be the root."
}
return undefined
}

Expand Down
3 changes: 3 additions & 0 deletions adminSiteServer/apiRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1555,6 +1555,9 @@ postRouteWithRWTransaction(
"/site-redirects/new",
async (req: Request, res, trx) => {
const { source, target } = req.body
const sourceAsUrl = new URL(source, "https://ourworldindata.org")
if (sourceAsUrl.pathname === "/")
throw new JsonError("Cannot redirect from /", 400)
if (await redirectWithSourceExists(trx, source)) {
throw new JsonError(
`Redirect with source ${source} already exists`,
Expand Down