Unverified Commit 1c8234eb authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

backport: [i18n] Routing fix #70761 (#70976)

Backports:
- #70761
Co-authored-by: 's avatarWyatt Johnson <accounts+github@wyattjoh.ca>
parent bb3f5801
...@@ -908,6 +908,14 @@ export default abstract class Server<ServerOptions extends Options = Options> { ...@@ -908,6 +908,14 @@ export default abstract class Server<ServerOptions extends Options = Options> {
req.headers['x-forwarded-proto'] ??= isHttps ? 'https' : 'http' req.headers['x-forwarded-proto'] ??= isHttps ? 'https' : 'http'
req.headers['x-forwarded-for'] ??= originalRequest.socket?.remoteAddress req.headers['x-forwarded-for'] ??= originalRequest.socket?.remoteAddress
// Validate that if i18n isn't configured or the passed parameters are not
// valid it should be removed from the query.
if (!this.i18nProvider?.validateQuery(parsedUrl.query)) {
delete parsedUrl.query.__nextLocale
delete parsedUrl.query.__nextDefaultLocale
delete parsedUrl.query.__nextInferredLocaleFromDefault
}
// This should be done before any normalization of the pathname happens as // This should be done before any normalization of the pathname happens as
// it captures the initial URL. // it captures the initial URL.
this.attachRequestMeta(req, parsedUrl) this.attachRequestMeta(req, parsedUrl)
......
...@@ -134,6 +134,37 @@ export class I18NProvider { ...@@ -134,6 +134,37 @@ export class I18NProvider {
} }
} }
/**
* Validates that the locale is valid.
*
* @param locale The locale to validate.
* @returns `true` if the locale is valid, `false` otherwise.
*/
private validate(locale: string): boolean {
return this.lowerCaseLocales.includes(locale.toLowerCase())
}
/**
* Validates that the locales in the query object are valid.
*
* @param query The query object to validate.
* @returns `true` if the locale is valid, `false` otherwise.
*/
public validateQuery(query: NextParsedUrlQuery) {
if (query.__nextLocale && !this.validate(query.__nextLocale)) {
return false
}
if (
query.__nextDefaultLocale &&
!this.validate(query.__nextDefaultLocale)
) {
return false
}
return true
}
/** /**
* Analyzes the pathname for a locale and returns the pathname without it. * Analyzes the pathname for a locale and returns the pathname without it.
* *
......
...@@ -214,6 +214,11 @@ export function getResolveRoutes( ...@@ -214,6 +214,11 @@ export function getResolveRoutes(
parsedUrl.pathname = maybeAddTrailingSlash(parsedUrl.pathname) parsedUrl.pathname = maybeAddTrailingSlash(parsedUrl.pathname)
} }
} }
} else {
// As i18n isn't configured we remove the locale related query params.
delete parsedUrl.query.__nextLocale
delete parsedUrl.query.__nextDefaultLocale
delete parsedUrl.query.__nextInferredLocaleFromDefault
} }
const checkLocaleApi = (pathname: string) => { const checkLocaleApi = (pathname: string) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment