Skip to content

fix(utils): regex match port to stop accidental replace #9676

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

Merged
merged 3 commits into from
Nov 28, 2023
Merged

fix(utils): regex match port to stop accidental replace #9676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3222e4c
fix(utils): regex match port to stop accidental replace
AbhiPrasad Nov 27, 2023
d3d70cf
add comment about adding new URL
AbhiPrasad Nov 28, 2023
13de08e
Merge branch 'develop' into abhi-fix-port-replace
AbhiPrasad Nov 28, 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
5 changes: 3 additions & 2 deletions packages/utils/src/url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ export function getSanitizedUrlString(url: PartialURL): string {
// Always filter out authority
.replace(/^.*@/, '[filtered]:[filtered]@')
// Don't show standard :80 (http) and :443 (https) ports to reduce the noise
.replace(':80', '')
.replace(':443', '')) ||
// TODO: Use new URL global if it exists
.replace(/(:80)$/, '')
.replace(/(:443)$/, '')) ||
'';

return `${protocol ? `${protocol}://` : ''}${filteredHost}${path}`;
Expand Down
4 changes: 4 additions & 0 deletions packages/utils/test/url.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ describe('getSanitizedUrlString', () => {
['same-origin url', '/api/v4/users?id=123', '/api/v4/users'],
['url without a protocol', 'example.com', 'example.com'],
['url without a protocol with a path', 'example.com/sub/path?id=123', 'example.com/sub/path'],
['url with port 8080', 'http://172.31.12.144:8080/test', 'http://172.31.12.144:8080/test'],
['url with port 4433', 'http://172.31.12.144:4433/test', 'http://172.31.12.144:4433/test'],
['url with port 443', 'http://172.31.12.144:443/test', 'http://172.31.12.144/test'],
['url with IP and port 80', 'http://172.31.12.144:80/test', 'http://172.31.12.144/test'],
])('returns a sanitized URL for a %s', (_, rawUrl: string, sanitizedURL: string) => {
const urlObject = parseUrl(rawUrl);
expect(getSanitizedUrlString(urlObject)).toEqual(sanitizedURL);
Expand Down