Skip to content

fix(common): make Location.normalize() return the correct path when the base path contains characters that interfere with regex syntax. #49181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wartab wants to merge 2 commits into from
Closed

fix(common): make Location.normalize() return the correct path when the base path contains characters that interfere with regex syntax. #49181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be1ff4d
fix(common): make Location.normalize() return the correct path when t…
wartab Feb 23, 2023
61eb153
fixup! fix(common): make Location.normalize() return the correct path…
atscott Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions packages/common/src/location/location.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,15 @@ export function createLocation() {
}

function _stripBasePath(basePath: string, url: string): string {
return basePath && new RegExp(`^${basePath}([/;?#]|$)`).test(url) ?
url.substring(basePath.length) :
url;
if (!basePath || !url.startsWith(basePath)) {
return url;
}
if (url.length === basePath.length) {
return '';
}
return ['/', ';', '?', '#'].includes(url[basePath.length]) ?
url.substring(basePath.length) :
url;
}

function _stripIndexHtml(url: string): string {
Expand Down
13 changes: 13 additions & 0 deletions packages/common/test/location/location_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,5 +286,18 @@ describe('Location Class', () => {
expect(location.normalize(baseHref + matrixParams)).toBe(matrixParams);
expect(location.normalize(baseHref + fragment)).toBe(fragment);
});

it('in case APP_BASE_HREF contains characters that have special meaning in a regex', () => {
const baseHref = 'c:/users/name(test)/en';
const path = '/test-path';

TestBed.configureTestingModule({providers: [{provide: APP_BASE_HREF, useValue: baseHref}]});

const location = TestBed.inject(Location);

expect(location.normalize(path)).toBe(path);
expect(location.normalize(baseHref)).toBe('');
expect(location.normalize(baseHref + path)).toBe(path);
});
});
});