Unverified Commit 56118439 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Update to make sure to respond with 400 for invalid URLs (#11561)

* Update to make sure to respond with 400 for invalid URLs

* Update response text for 400 API error
parent 139da5ad
...@@ -151,6 +151,7 @@ const nextServerlessLoader: loader.Loader = function() { ...@@ -151,6 +151,7 @@ const nextServerlessLoader: loader.Loader = function() {
${rewriteImports} ${rewriteImports}
${dynamicRouteMatcher} ${dynamicRouteMatcher}
${handleRewrites} ${handleRewrites}
export default async (req, res) => { export default async (req, res) => {
...@@ -186,8 +187,14 @@ const nextServerlessLoader: loader.Loader = function() { ...@@ -186,8 +187,14 @@ const nextServerlessLoader: loader.Loader = function() {
} catch (err) { } catch (err) {
console.error(err) console.error(err)
await onError(err) await onError(err)
res.statusCode = 500
res.end('Internal Server Error') if (err.code === 'DECODE_FAILED') {
res.statusCode = 400
res.end('Bad Request')
} else {
res.statusCode = 500
res.end('Internal Server Error')
}
} }
} }
` `
...@@ -261,26 +268,37 @@ const nextServerlessLoader: loader.Loader = function() { ...@@ -261,26 +268,37 @@ const nextServerlessLoader: loader.Loader = function() {
..._renderOpts ..._renderOpts
} }
let _nextData = false let _nextData = false
let parsedUrl
const parsedUrl = handleRewrites(parse(req.url, true)) try {
parsedUrl = handleRewrites(parse(req.url, true))
if (parsedUrl.pathname.match(/_next\\/data/)) { if (parsedUrl.pathname.match(/_next\\/data/)) {
_nextData = true _nextData = true
parsedUrl.pathname = parsedUrl.pathname parsedUrl.pathname = parsedUrl.pathname
.replace(new RegExp('/_next/data/${escapedBuildId}/'), '/') .replace(new RegExp('/_next/data/${escapedBuildId}/'), '/')
.replace(/\\.json$/, '') .replace(/\\.json$/, '')
} }
const renderOpts = Object.assign(
{
Component,
pageConfig: config,
nextExport: fromExport
},
options,
)
${
page === '/_error'
? `
if (!res.statusCode) {
res.statusCode = 404
}
`
: ''
}
const renderOpts = Object.assign(
{
Component,
pageConfig: config,
nextExport: fromExport
},
options,
)
try {
${page === '/_error' ? `res.statusCode = 404` : ''}
${ ${
pageIsDynamicRoute pageIsDynamicRoute
? `const params = fromExport && !getStaticProps && !getServerSideProps ? {} : dynamicRouteMatcher(parsedUrl.pathname) || {};` ? `const params = fromExport && !getStaticProps && !getServerSideProps ? {} : dynamicRouteMatcher(parsedUrl.pathname) || {};`
...@@ -349,27 +367,27 @@ const nextServerlessLoader: loader.Loader = function() { ...@@ -349,27 +367,27 @@ const nextServerlessLoader: loader.Loader = function() {
if (renderMode) return { html: result, renderOpts } if (renderMode) return { html: result, renderOpts }
return result return result
} catch (err) { } catch (err) {
if (!parsedUrl) {
parsedUrl = parse(req.url, true)
}
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
res.statusCode = 404 res.statusCode = 404
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, Object.assign({}, options, { } else if (err.code === 'DECODE_FAILED') {
getStaticProps: undefined, res.statusCode = 400
getStaticPaths: undefined,
getServerSideProps: undefined,
Component: Error
}))
return result
} else { } else {
console.error(err) console.error(err)
res.statusCode = 500 res.statusCode = 500
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, Object.assign({}, options, {
getStaticProps: undefined,
getStaticPaths: undefined,
getServerSideProps: undefined,
Component: Error,
err
}))
return result
} }
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, Object.assign({}, options, {
getStaticProps: undefined,
getStaticPaths: undefined,
getServerSideProps: undefined,
Component: Error,
err: res.statusCode === 404 ? undefined : err
}))
return result
} }
} }
export async function render (req, res) { export async function render (req, res) {
......
...@@ -8,7 +8,17 @@ export function getRouteMatcher(routeRegex: ReturnType<typeof getRouteRegex>) { ...@@ -8,7 +8,17 @@ export function getRouteMatcher(routeRegex: ReturnType<typeof getRouteRegex>) {
return false return false
} }
const decode = decodeURIComponent const decode = (param: string) => {
try {
return decodeURIComponent(param)
} catch (_) {
const err: Error & { code?: string } = new Error(
'failed to decode param'
)
err.code = 'DECODE_FAILED'
throw err
}
}
const params: { [paramName: string]: string | string[] } = {} const params: { [paramName: string]: string | string[] } = {}
Object.keys(groups).forEach((slugName: string) => { Object.keys(groups).forEach((slugName: string) => {
......
...@@ -471,6 +471,11 @@ function runTests(dev) { ...@@ -471,6 +471,11 @@ function runTests(dev) {
expect(res.status).toBe(200) expect(res.status).toBe(200)
}) })
it('should respond with bad request with invalid encoding', async () => {
const res = await fetchViaHTTP(appPort, '/%')
expect(res.status).toBe(400)
})
if (dev) { if (dev) {
it('should work with HMR correctly', async () => { it('should work with HMR correctly', async () => {
const browser = await webdriver(appPort, '/post-1/comments') const browser = await webdriver(appPort, '/post-1/comments')
......
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