diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
index bccc2153602..9c83d42dc7c 100644
--- a/src/vs/base/common/network.ts
+++ b/src/vs/base/common/network.ts
@@ -49,6 +49,8 @@ export namespace Schemas {
export const vscodeRemote: string = 'vscode-remote';
+ export const vscodeRemoteResource: string = 'vscode-remote-resource';
+
export const userData: string = 'vscode-userdata';
}
@@ -64,7 +66,7 @@ class RemoteAuthoritiesImpl {
}
public set(authority: string, host: string, port: number): void {
- this._hosts[authority] = (host === 'localhost' ? '127.0.0.1' : host);
+ this._hosts[authority] = host;
this._ports[authority] = port;
}
@@ -76,9 +78,8 @@ class RemoteAuthoritiesImpl {
const host = this._hosts[authority];
const port = this._ports[authority];
const connectionToken = this._connectionTokens[authority];
- const scheme = (host === '127.0.0.1' ? Schemas.http : Schemas.vscodeRemote);
return URI.from({
- scheme: scheme,
+ scheme: Schemas.vscodeRemoteResource,
authority: `${host}:${port}`,
path: `/vscode-remote2`,
query: `path=${encodeURIComponent(path)}&tkn=${encodeURIComponent(connectionToken)}`
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index 45a9d6d13fe..8f8f45fb15f 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -10,7 +10,7 @@
+ content="default-src 'none'; img-src 'self' https: data: blob:; media-src 'none'; frame-src 'self' {{WEBVIEW_ENDPOINT}} https://*.vscode-webview-test.com; script-src 'self' https://az416426.vo.msecnd.net 'unsafe-eval' https:; style-src 'self' 'unsafe-inline'; connect-src 'self' ws: wss: https:; font-src 'self' blob:;">
diff --git a/src/vs/code/electron-browser/workbench/workbench.html b/src/vs/code/electron-browser/workbench/workbench.html
index bef3d951473..693082bb9ed 100644
--- a/src/vs/code/electron-browser/workbench/workbench.html
+++ b/src/vs/code/electron-browser/workbench/workbench.html
@@ -3,7 +3,7 @@
-
+
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index d269616e1b9..6d43b392dfb 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -688,9 +688,9 @@ export class CodeApplication extends Disposable {
}
private handleRemoteAuthorities(): void {
- protocol.registerHttpProtocol(Schemas.vscodeRemote, (request, callback) => {
+ protocol.registerHttpProtocol(Schemas.vscodeRemoteResource, (request, callback) => {
callback({
- url: request.url.replace(/^vscode-remote:/, 'http:'),
+ url: request.url.replace(/^vscode-remote-resource:/, 'http:'),
method: request.method
});
});