Fix special characters encoding in query string (cloudflare#95)

G4brym · web-flow · commit 93eb416811ac · 2023-09-07T16:37:47.000+01:00
diff --git a/.github/workflows/create-pullrequest-prerelease.yml b/.github/workflows/create-pullrequest-prerelease.yml
@@ -14,10 +14,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Use Node.js 16.13
+      - name: Use Node.js 20.6
         uses: actions/setup-node@v3
         with:
-          node-version: 16.13
+          node-version: 20.6
           cache: 'npm' # cache ~/.npm in case 'npm ci' needs to run
 
       - name: Set RELEASE_VERSION
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup .npmrc file to publish to npm
         uses: actions/setup-node@v1
         with:
-          node-version: '16.x'
+          node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'
       - name: Set RELEASE_VERSION
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        node: [14.x, 16.x, 18.x]
+        node: [18.x, 20.x]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
   },
   "dependencies": {
     "@asteasolutions/zod-to-openapi": "^5.3.1",
-    "itty-router": "^4.0.14",
+    "itty-router": "^4.0.22",
     "openapi3-ts": "^4.1.2",
     "zod": "^3.21.4"
   }
diff --git a/src/parameters.ts b/src/parameters.ts
@@ -293,25 +293,14 @@ export function extractQueryParameters(
   request: Request,
   schema?: ZodObject<any>
 ): Record<string, any> | null {
-  const url = decodeURIComponent(request.url).split('?')
+  const { searchParams } = new URL(request.url)
 
-  if (url.length === 1) {
+  if (searchParams.size === 0) {
     return null
   }
 
-  let query = url.slice(1).join('?')
-
-  // RFC 3986 allows query string to start with &
-  if (query.startsWith('&')) {
-    query = query.substring(1)
-  }
-
   const params: Record<string, any> = {}
-  for (const param of query.split('&')) {
-    const paramSplit = param.split('=')
-    const key = paramSplit[0]
-    const value = paramSplit[1]
-
+  for (const [key, value] of searchParams.entries()) {
     if (params[key] === undefined) {
       params[key] = value
     } else if (!Array.isArray(params[key])) {
diff --git a/tests/integration/parameters.test.ts b/tests/integration/parameters.test.ts
@@ -258,7 +258,7 @@ describe('queryParametersValidation', () => {
   })
 
   test('checkRegexValid', async () => {
-    const qs = '?p_regex=+919367788755'
+    const qs = '?p_regex=%2B919367788755'
     const request = await todoRouter.handle(
       buildRequest({ method: 'GET', path: `/todos${qs}` })
     )

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@`
`92`	`92`	`},`
`93`	`93`	`"dependencies": {`
`94`	`94`	`"@asteasolutions/zod-to-openapi": "^5.3.1",`
`95`		`- "itty-router": "^4.0.14",`
	`95`	`+ "itty-router": "^4.0.22",`
`96`	`96`	`"openapi3-ts": "^4.1.2",`
`97`	`97`	`"zod": "^3.21.4"`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ describe('queryParametersValidation', () => {`
`258`	`258`	`})`
`259`	`259`
`260`	`260`	`test('checkRegexValid', async () => {`
`261`		`- const qs = '?p_regex=+919367788755'`
	`261`	`+ const qs = '?p_regex=%2B919367788755'`
`262`	`262`	`const request = await todoRouter.handle(`
`263`	`263`	buildRequest({ method: 'GET', path: `/todos${qs}` })
`264`	`264`	`)`