Merge pull request microsoft#141572 from microsoft/sandy081/extensionResourceHandler

Handle extension resources on server

Author: sandy081

src/vs/base/common/network.ts

@@ -130,6 +130,10 @@ class RemoteAuthoritiesImpl {
 		this._connectionTokens[authority] = connectionToken;
 	}
 
+	getPreferredWebSchema(): 'http' | 'https' {
+		return this._preferredWebSchema;
+	}
+
 	rewrite(uri: URI): URI {
 		if (this._delegate) {
 			return this._delegate(uri);

src/vs/server/node/webClientServer.ts

@@ -19,6 +19,13 @@ import { FileAccess, connectionTokenCookieName, connectionTokenQueryName } from
 import { generateUuid } from 'vs/base/common/uuid';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { ServerConnectionToken, ServerConnectionTokenType } from 'vs/server/node/serverConnectionToken';
+import { asText, IRequestService } from 'vs/platform/request/common/request';
+import { IHeaders } from 'vs/base/parts/request/common/request';
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { URI } from 'vs/base/common/uri';
+import { streamToBuffer } from 'vs/base/common/buffer';
+import { IProductConfiguration } from 'vs/base/common/product';
+import { isString } from 'vs/base/common/types';
 
 const textMimeType = {
 	'.html': 'text/html',
@@ -73,12 +80,17 @@ const APP_ROOT = dirname(FileAccess.asFileUri('', require).fsPath);
 
 export class WebClientServer {
 
+	private readonly _webExtensionResourceUrlTemplate: URI | undefined;
+
 	constructor(
 		private readonly _connectionToken: ServerConnectionToken,
 		@IServerEnvironmentService private readonly _environmentService: IServerEnvironmentService,
 		@ILogService private readonly _logService: ILogService,
-		@IProductService private readonly _productService: IProductService
-	) { }
+		@IRequestService private readonly _requestService: IRequestService,
+		@IProductService private readonly _productService: IProductService,
+	) {
+		this._webExtensionResourceUrlTemplate = this._productService.extensionsGallery?.resourceUrlTemplate ? URI.parse(this._productService.extensionsGallery.resourceUrlTemplate) : undefined;
+	}
 
 	/**
 	 * Handle web resources (i.e. only needed by the web client).
@@ -102,6 +114,10 @@ export class WebClientServer {
 				// callback support
 				return this._handleCallback(res);
 			}
+			if (/^\/web-extension-resource\//.test(pathname)) {
+				// extension resource support
+				return this._handleWebExtensionResource(req, res, parsedUrl);
+			}
 
 			return serveError(req, res, 404, 'Not found.');
 		} catch (error) {
@@ -130,6 +146,77 @@ export class WebClientServer {
 		return serveFile(this._logService, req, res, filePath, headers);
 	}
 
+	private _getResourceURLTemplateAuthority(uri: URI): string | undefined {
+		const index = uri.authority.indexOf('.');
+		return index !== -1 ? uri.authority.substring(index + 1) : undefined;
+	}
+
+	/**
+	 * Handle extension resources
+	 */
+	private async _handleWebExtensionResource(req: http.IncomingMessage, res: http.ServerResponse, parsedUrl: url.UrlWithParsedQuery): Promise<void> {
+		if (!this._webExtensionResourceUrlTemplate) {
+			return serveError(req, res, 500, 'No extension gallery service configured.');
+		}
+
+		// Strip `/web-extension-resource/` from the path
+		const normalizedPathname = decodeURIComponent(parsedUrl.pathname!); // support paths that are uri-encoded (e.g. spaces => %20)
+		const path = normalize(normalizedPathname.substr('/web-extension-resource/'.length));
+		const uri = URI.parse(path).with({
+			scheme: this._webExtensionResourceUrlTemplate.scheme,
+			authority: path.substring(0, path.indexOf('/')),
+			path: path.substring(path.indexOf('/') + 1)
+		});
+
+		if (this._getResourceURLTemplateAuthority(this._webExtensionResourceUrlTemplate) !== this._getResourceURLTemplateAuthority(uri)) {
+			return serveError(req, res, 403, 'Request Forbidden');
+		}
+
+		const headers: IHeaders = {};
+		const setRequestHeader = (header: string) => {
+			const value = req.headers[header];
+			if (value && (isString(value) || value[0])) {
+				headers[header] = isString(value) ? value : value[0];
+			} else if (header !== header.toLowerCase()) {
+				setRequestHeader(header.toLowerCase());
+			}
+		};
+		setRequestHeader('X-Client-Name');
+		setRequestHeader('X-Client-Version');
+		setRequestHeader('X-Machine-Id');
+		setRequestHeader('X-Client-Commit');
+
+		const context = await this._requestService.request({
+			type: 'GET',
+			url: uri.toString(true),
+			headers
+		}, CancellationToken.None);
+
+		const status = context.res.statusCode || 500;
+		if (status !== 200) {
+			let text: string | null = null;
+			try {
+				text = await asText(context);
+			} catch (error) {/* Ignore */ }
+			return serveError(req, res, status, text || `Request failed with status ${status}`);
+		}
+
+		const responseHeaders: Record<string, string> = Object.create(null);
+		const setResponseHeader = (header: string) => {
+			const value = context.res.headers[header];
+			if (value) {
+				responseHeaders[header] = value;
+			} else if (header !== header.toLowerCase()) {
+				setResponseHeader(header.toLowerCase());
+			}
+		};
+		setResponseHeader('Cache-Control');
+		setResponseHeader('Content-Type');
+		res.writeHead(200, responseHeaders);
+		const buffer = await streamToBuffer(context.stream);
+		return res.end(buffer.buffer);
+	}
+
 	/**
 	 * Handle HTTP requests for /
 	 */
@@ -191,6 +278,16 @@ export class WebClientServer {
 				_wrapWebWorkerExtHostInIframe,
 				developmentOptions: { enableSmokeTestDriver: this._environmentService.driverHandle === 'web' ? true : undefined },
 				settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
+				productConfiguration: <Partial<IProductConfiguration>>{
+					extensionsGallery: this._webExtensionResourceUrlTemplate ? {
+						...this._productService.extensionsGallery,
+						'resourceUrlTemplate': this._webExtensionResourceUrlTemplate.with({
+							scheme: 'http',
+							authority: remoteAuthority,
+							path: `web-extension-resource/${this._webExtensionResourceUrlTemplate.authority}${this._webExtensionResourceUrlTemplate.path}`
+						}).toString(true)
+					} : undefined
+				}
 			})))
 			.replace('{{WORKBENCH_AUTH_SESSION}}', () => authSessionInfo ? escapeAttribute(JSON.stringify(authSessionInfo)) : '');
 

src/vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader.ts

@@ -16,6 +16,9 @@ import { getServiceMachineId } from 'vs/platform/externalServices/common/service
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { TelemetryLevel } from 'vs/platform/telemetry/common/telemetry';
 import { getTelemetryLevel, supportsTelemetry } from 'vs/platform/telemetry/common/telemetryUtils';
+import { RemoteAuthorities } from 'vs/base/common/network';
+
+export const WEB_EXTENSION_RESOURCE_END_POINT = 'web-extension-resource';
 
 export const IExtensionResourceLoaderService = createDecorator<IExtensionResourceLoaderService>('extensionResourceLoaderService');
 
@@ -68,7 +71,8 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
 
 	public getExtensionGalleryResourceURL(galleryExtension: { publisher: string, name: string, version: string }, path?: string): URI | undefined {
 		if (this._extensionGalleryResourceUrlTemplate) {
-			return URI.parse(format2(this._extensionGalleryResourceUrlTemplate, { publisher: galleryExtension.publisher, name: galleryExtension.name, version: galleryExtension.version, path: 'extension' }));
+			const uri = URI.parse(format2(this._extensionGalleryResourceUrlTemplate, { publisher: galleryExtension.publisher, name: galleryExtension.name, version: galleryExtension.version, path: 'extension' }));
+			return this._isWebExtensionResourceEndPoint(uri) ? uri.with({ scheme: RemoteAuthorities.getPreferredWebSchema() }) : uri;
 		}
 		return undefined;
 	}
@@ -103,8 +107,15 @@ export abstract class AbstractExtensionResourceLoaderService implements IExtensi
 	}
 
 	private _getExtensionGalleryAuthority(uri: URI): string | undefined {
+		if (this._isWebExtensionResourceEndPoint(uri)) {
+			return uri.authority;
+		}
 		const index = uri.authority.indexOf('.');
 		return index !== -1 ? uri.authority.substring(index + 1) : undefined;
 	}
 
+	protected _isWebExtensionResourceEndPoint(uri: URI): boolean {
+		return uri.path.startsWith(`/${WEB_EXTENSION_RESOURCE_END_POINT}/`);
+	}
+
 }