Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/vs/platform/url/common/trustedDomains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ export function normalizeURL(url: string | URI): string {

const rLocalhost = /^(.+\.)?localhost(:\d+)?$/i;
const r127 = /^127.0.0.1(:\d+)?$/;
const rIPv6Localhost = /^\[::1\](:\d+)?$/;

export function isLocalhostAuthority(authority: string) {
return rLocalhost.test(authority) || r127.test(authority);
return rLocalhost.test(authority) || r127.test(authority) || rIPv6Localhost.test(authority);
}
11 changes: 11 additions & 0 deletions src/vs/platform/url/test/common/trustedDomains.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ suite('trustedDomains', () => {
assert.strictEqual(isURLDomainTrusted(URI.parse('http://localhost:3000'), []), true);
assert.strictEqual(isURLDomainTrusted(URI.parse('http://127.0.0.1:3000'), []), true);
assert.strictEqual(isURLDomainTrusted(URI.parse('http://subdomain.localhost'), []), true);
assert.strictEqual(isURLDomainTrusted(URI.parse('https://[::1]'), []), true);
assert.strictEqual(isURLDomainTrusted(URI.parse('http://[::1]:3000'), []), true);
});

test('wildcard (*) matches everything', () => {
Expand Down Expand Up @@ -116,11 +118,20 @@ suite('trustedDomains', () => {
assert.strictEqual(isLocalhostAuthority('SUB.LOCALHOST'), true);
});

test('recognizes IPv6 localhost [::1]', () => {
assert.strictEqual(isLocalhostAuthority('[::1]'), true);
assert.strictEqual(isLocalhostAuthority('[::1]:3000'), true);
assert.strictEqual(isLocalhostAuthority('[::1]:8080'), true);
});

test('does not match non-localhost authorities', () => {
assert.strictEqual(isLocalhostAuthority('example.com'), false);
assert.strictEqual(isLocalhostAuthority('notlocalhost.com'), false);
assert.strictEqual(isLocalhostAuthority('127.0.0.2'), false);
assert.strictEqual(isLocalhostAuthority('192.168.1.1'), false);
assert.strictEqual(isLocalhostAuthority('[::]'), false);
assert.strictEqual(isLocalhostAuthority('[::2]'), false);
assert.strictEqual(isLocalhostAuthority('[::1'), false);
});
});
});
Loading