development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ipv6 support for simple browser (#163374)

Browse source 
Fixes #158599

This correctly handles ipv6 uris, such as `http://[::]:3000`. In these cases, the brackets are required
This commit is contained in:
Matt Bierner 2022-10-12 11:04:56 -07:00 committed by GitHub
parent c56e49670e
commit b2d129c4e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
extensions/simple-browser/src/extension.ts
View file

@ -23,18 +23,15 @@ const enabledHosts = new Set<string>([
// localhost IPv4
'127.0.0.1',
// localhost IPv6
'0:0:0:0:0:0:0:1',
'::1',
'[0:0:0:0:0:0:0:1]',
'[::1]',
// all interfaces IPv4
'0.0.0.0',
// all interfaces IPv6
'0:0:0:0:0:0:0:0',
'::'
'[0:0:0:0:0:0:0:0]',
'[::]'
]);
const IPv6Localhost = /0\:0\:0\:0\:0\:0\:0\:1|\:\:1/;
const IPv6AllInterfaces = /0\:0\:0\:0\:0\:0\:0\:0|\:\:/;
const openerId = 'simpleBrowser.open';
export function activate(context: vscode.ExtensionContext) {
@ -65,13 +62,13 @@ export function activate(context: vscode.ExtensionContext) {
preserveFocus?: boolean;
viewColumn: vscode.ViewColumn;
}) => {
manager.show(url.toString(), showOptions);
manager.show(url, showOptions);
}));
context.subscriptions.push(vscode.window.registerExternalUriOpener(openerId, {
canOpenExternalUri(uri: vscode.Uri) {
// We have to replace the IPv6 hosts with IPv4 because URL can't handle IPv6.
const originalUri = new URL(uri.toString().replace(IPv6Localhost, '127.0.0.1').replace(IPv6AllInterfaces, '0.0.0.0'));
const originalUri = new URL(uri.toString(true));
if (enabledHosts.has(originalUri.hostname)) {
return isWeb()
? vscode.ExternalUriOpenerPriority.Default
@ -81,7 +78,7 @@ export function activate(context: vscode.ExtensionContext) {
return vscode.ExternalUriOpenerPriority.None;
},
openExternalUri(resolveUri: vscode.Uri) {
return manager.show(resolveUri.toString(), {
return manager.show(resolveUri, {
viewColumn: vscode.window.activeTextEditor ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active
});
}

3
extensions/simple-browser/src/simpleBrowserManager.ts
View file

@ -19,7 +19,8 @@ export class SimpleBrowserManager {
this._activeView = undefined;
}
public show(url: string, options?: ShowOptions): void {
public show(inputUri: string | vscode.Uri, options?: ShowOptions): void {
const url = typeof inputUri === 'string' ? inputUri : inputUri.toString(true);
if (this._activeView) {
this._activeView.show(url, options);
} else {