fix: make urls ending in /* also match the base path

Fixes #834
microsoft · Nov 9, 2020 · 0f0ae54 · 0f0ae54
1 parent 7657cdf
commit 0f0ae54
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ This changelog records changes to stable releases since 1.50.2. "TBA" changes he
 - fix: support chrome dev and beta builds ([ref](https://github.com/OmniSharp/omnisharp-vscode/issues/4108))
 - fix: race causing potentially corrupted log files ([#825](https://github.com/microsoft/vscode-js-debug/issues/825))
 - fix: extension host debugging pausing in internals ([ref](https://github.com/microsoft/vscode/issues/105047))
+- fix: make urls ending in `/*` also match the base path ([#834](https://github.com/microsoft/vscode-js-debug/issues/834))
 
 ## v1.51.0 - 2020-10-26
 

diff --git a/src/test/common/urlUtils.test.ts → src/common/urlUtils.test.ts b/src/test/common/urlUtils.test.ts → src/common/urlUtils.test.ts
@@ -2,17 +2,17 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 import { expect } from 'chai';
-import { SinonStub, stub } from 'sinon';
 import { promises as dns } from 'dns';
 import * as os from 'os';
+import { SinonStub, stub } from 'sinon';
 import {
-  fileUrlToAbsolutePath,
   createTargetFilter,
-  urlToRegex,
-  setCaseSensitivePaths,
-  resetCaseSensitivePaths,
+  fileUrlToAbsolutePath,
   isLoopback,
-} from '../../common/urlUtils';
+  resetCaseSensitivePaths,
+  setCaseSensitivePaths,
+  urlToRegex,
+} from './urlUtils';
 
 describe('urlUtils', () => {
   describe('fileUrlToPath()', () => {
@@ -173,11 +173,19 @@ describe('urlUtils', () => {
     it('respects one wildcard', () => {
       testAll('localhost/site/*', [
         ['http://localhost/site/app', true],
-        ['http://localhost/site/', false],
+        ['http://localhost/site/', true],
         ['http://localhost/', false],
       ]);
     });
 
+    it('makes wildcard optional (#834)', () => {
+      testAll('localhost/*', [
+        ['http://localhost/site/', true],
+        ['http://localhost/', true],
+        ['http://localhost', true],
+      ]);
+    });
+
     it('respects wildcards with query params', () => {
       testAll('localhost:3000/site/?*', [
         ['http://localhost:3000/site/?blah=1', true],

diff --git a/src/common/urlUtils.ts b/src/common/urlUtils.ts
@@ -479,7 +479,7 @@ export const createTargetFilter = (
   };
 
   const escaped = targetUrls.map(url =>
-    escapeRegexSpecialChars(standardizeMatch(url), '/*').replace(/\*/g, '.*'),
+    escapeRegexSpecialChars(standardizeMatch(url), '/*').replace(/(\/\*$)|\*/g, '.*'),
   );
   const targetUrlRegex = new RegExp('^(' + escaped.join('|') + ')$', 'g');