Fixes escaping port number in absolute urls

mswjs · Dec 13, 2021 · 1c8d1c4 · 1c8d1c4
1 parent d8bd81a
commit 1c8d1c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/utils/matching/matchRequestUrl.test.ts b/src/utils/matching/matchRequestUrl.test.ts
@@ -93,7 +93,16 @@ describe('coercePath', () => {
       'https\\://example.com/:userId',
     )
     expect(coercePath('http://localhost:3000')).toEqual(
-      'http\\://localhost:3000',
+      'http\\://localhost\\:3000',
+    )
+  })
+
+  test('escapes the semicolon in port', () => {
+    expect(coercePath('https://example.com:1234')).toEqual(
+      'https\\://example.com\\:1234',
+    )
+    expect(coercePath('https://example.com:1234/:userId')).toEqual(
+      'https\\://example.com\\:1234/:userId',
     )
   })
 })
diff --git a/src/utils/matching/matchRequestUrl.ts b/src/utils/matching/matchRequestUrl.ts
@@ -42,6 +42,11 @@ export function coercePath(path: string): string {
        * @see https://github.com/pillarjs/path-to-regexp/issues/259
        */
       .replace(/^([^\/]+)(:)(?=\/\/)/g, '$1\\$2')
+      /**
+       * Escape the port so that "path-to-regexp" can match
+       * absolute URLs including port numbers.
+       */
+      .replace(/((?::)(?:[0-9]+))/g, '\\$1')
   )
 }