yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(route): handle escapes in the glob pattern (#23932)

Browse Source 
Fixes #23303.
This commit is contained in:
Dmitry Gozman 2023-06-28 16:33:04 -07:00 committed by GitHub
parent 1ab99fe1b8
commit 1d0b48f18b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/playwright-core/src/utils/glob.ts
View File

@ -14,15 +14,17 @@
* limitations under the License.
*/
const escapeGlobChars = new Set(['/', '$', '^', '+', '.', '(', ')', '=', '!', '|']);
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_expressions#escaping
const escapedChars = new Set(['$', '^', '+', '.', '*', '(', ')', '|', '\\', '?', '{', '}', '[', ']']);
export function globToRegex(glob: string): RegExp {
const tokens = ['^'];
let inGroup;
let inGroup = false;
for (let i = 0; i < glob.length; ++i) {
const c = glob[i];
if (escapeGlobChars.has(c)) {
tokens.push('\\' + c);
if (c === '\\' && i + 1 < glob.length) {
const char = glob[++i];
tokens.push(escapedChars.has(char) ? '\\' + char : char);
continue;
}
if (c === '*') {
@ -65,7 +67,7 @@ export function globToRegex(glob: string): RegExp {
tokens.push('\\' + c);
break;
default:
tokens.push(c);
tokens.push(escapedChars.has(c) ? '\\' + c : c);
}
}
tokens.push('$');

7
tests/page/interception.spec.ts
View File

@ -90,6 +90,13 @@ it('should work with glob', async () => {
expect(globToRegex('foo*').test('foo/bar.js')).toBeFalsy();
expect(globToRegex('http://localhost:3000/signin-oidc*').test('http://localhost:3000/signin-oidc/foo')).toBeFalsy();
expect(globToRegex('http://localhost:3000/signin-oidc*').test('http://localhost:3000/signin-oidcnice')).toBeTruthy();
expect(globToRegex('\\?')).toEqual(/^\?$/);
expect(globToRegex('\\')).toEqual(/^\\$/);
expect(globToRegex('\\\\')).toEqual(/^\\$/);
expect(globToRegex('\\[')).toEqual(/^\[$/);
expect(globToRegex('[')).toEqual(/^\[$/);
expect(globToRegex('$^+.\\*()|\\?\\{\\}[]')).toEqual(/^\$\^\+\.\*\(\)\|\?\{\}\[\]$/);
});
it('should intercept network activity from worker', async function({ page, server, isAndroid, browserName, browserMajorVersion }) {

26
tests/page/page-route.spec.ts
View File

@ -72,6 +72,32 @@ it('should unroute', async ({ page, server }) => {
expect(intercepted).toEqual([1]);
});
it('should support ? in glob pattern', async ({ page, server }) => {
server.setRoute('/index', (req, res) => res.end('index-no-hello'));
server.setRoute('/index123hello', (req, res) => res.end('index123hello'));
server.setRoute('/index?hello', (req, res) => res.end('index?hello'));
await page.route('**/index?hello', async (route, request) => {
await route.fulfill({ body: 'intercepted any character' });
});
await page.route('**/index\\?hello', async (route, request) => {
await route.fulfill({ body: 'intercepted question mark' });
});
await page.goto(server.PREFIX + '/index?hello');
expect(await page.content()).toContain('intercepted question mark');
await page.goto(server.PREFIX + '/index');
expect(await page.content()).toContain('index-no-hello');
await page.goto(server.PREFIX + '/index1hello');
expect(await page.content()).toContain('intercepted any character');
await page.goto(server.PREFIX + '/index123hello');
expect(await page.content()).toContain('index123hello');
});
it('should work when POST is redirected with 302', async ({ page, server }) => {
server.setRedirect('/rredirect', '/empty.html');
await page.goto(server.EMPTY_PAGE);