fix(gatsby): Don't throw when a path with special character is visited (

#36414) (#36757) Co-authored-by: Jude Agboola <marvinjudehk@gmail.com>
gatsbyjs · Oct 7, 2022 · 87140c9 · 87140c9
1 parent b264d17
commit 87140c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/packages/gatsby/src/commands/develop-process.ts b/packages/gatsby/src/commands/develop-process.ts
@@ -152,6 +152,16 @@ module.exports = async (program: IDevelopArgs): Promise<void> => {
   const app = express()
   const parentSpan = tracer.startSpan(`bootstrap`)
 
+  app.use((req, res, next) => {
+    try {
+      decodeURIComponent(req.path)
+    } catch (e) {
+      return res.status(500).send(`URI malformatted`)
+    }
+
+    return next()
+  })
+
   const machine = developMachine.withContext({
     program,
     parentSpan,

diff --git a/packages/gatsby/src/utils/find-page-by-path.ts b/packages/gatsby/src/utils/find-page-by-path.ts
@@ -47,7 +47,11 @@ export function findPageByPath(
 ): IGatsbyPage | undefined {
   const { pages } = state
 
-  path = decodeURIComponent(path)
+  try {
+    path = decodeURIComponent(path)
+  } catch {
+    // no handling, just continue using path as-is
+  }
 
   // first check by exact path
   let page = pages.get(path)