@vscode/test-web 0.0.44 → 0.0.46

package/SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

package/fs-provider/dist/fsExtensionMain.js

@@ -475,21 +475,22 @@ const fsProvider_1 = __webpack_require__(3);
 const SCHEME = 'vscode-test-web';
 function activate(context) {
     const serverUri = context.extensionUri.with({ path: '/static/mount', query: undefined });
-    const serverBackedRootDirectory = new ServerBackedDirectory(serverUri, '');
+    const serverBackedRootDirectory = new ServerBackedDirectory(serverUri, [], '');
     const disposable = vscode_1.workspace.registerFileSystemProvider(SCHEME, new fsProvider_1.MemFileSystemProvider(SCHEME, serverBackedRootDirectory));
     context.subscriptions.push(disposable);
     console.log(`vscode-test-web-support fs provider registers for ${SCHEME}, initial content from ${serverUri.toString(/*skipEncoding*/ true)}`);
 }
 exports.activate = activate;
 class ServerBackedFile {
-    constructor(_serverUri, name) {
-        this._serverUri = _serverUri;
+    constructor(_serverRoot, pathSegments, name) {
+        this._serverRoot = _serverRoot;
+        this.pathSegments = pathSegments;
         this.name = name;
         this.type = vscode_1.FileType.File;
     }
     get stats() {
         if (this._stats === undefined) {
-            this._stats = getStats(this._serverUri);
+            this._stats = getStats(this._serverRoot, this.pathSegments);
         }
         return this._stats;
     }
@@ -498,7 +499,7 @@ class ServerBackedFile {
     }
     get content() {
         if (this._content === undefined) {
-            this._content = getContent(this._serverUri);
+            this._content = getContent(this._serverRoot, this.pathSegments);
         }
         return this._content;
     }
@@ -507,14 +508,15 @@ class ServerBackedFile {
     }
 }
 class ServerBackedDirectory {
-    constructor(_serverUri, name) {
-        this._serverUri = _serverUri;
+    constructor(_serverRoot, pathSegments, name) {
+        this._serverRoot = _serverRoot;
+        this.pathSegments = pathSegments;
         this.name = name;
         this.type = vscode_1.FileType.Directory;
     }
     get stats() {
         if (this._stats === undefined) {
-            this._stats = getStats(this._serverUri);
+            this._stats = getStats(this._serverRoot, this.pathSegments);
         }
         return this._stats;
     }
@@ -523,7 +525,7 @@ class ServerBackedDirectory {
     }
     get entries() {
         if (this._entries === undefined) {
-            this._entries = getEntries(this._serverUri);
+            this._entries = getEntries(this._serverRoot, this.pathSegments);
         }
         return this._entries;
     }
@@ -539,8 +541,11 @@ function isEntry(e) {
 function isStat(e) {
     return e && (e.type === vscode_1.FileType.Directory || e.type === vscode_1.FileType.File) && typeof e.ctime === 'number' && typeof e.mtime === 'number' && typeof e.size === 'number';
 }
-async function getEntries(serverUri) {
-    const url = serverUri.with({ query: 'readdir' }).toString(/*skipEncoding*/ true);
+function getServerUri(serverRoot, pathSegments) {
+    return vscode_1.Uri.joinPath(serverRoot, ...pathSegments);
+}
+async function getEntries(serverRoot, pathSegments) {
+    const url = getServerUri(serverRoot, pathSegments).with({ query: 'readdir' }).toString(/*skipEncoding*/ true);
     const response = await (0, request_light_1.xhr)({ url });
     if (response.status === 200 && response.status <= 204) {
         try {
@@ -549,8 +554,8 @@ async function getEntries(serverUri) {
                 const entries = new Map();
                 for (const r of res) {
                     if (isEntry(r)) {
-                        const childPath = vscode_1.Uri.joinPath(serverUri, r.name);
-                        const newEntry = r.type === vscode_1.FileType.Directory ? new ServerBackedDirectory(childPath, r.name) : new ServerBackedFile(childPath, r.name);
+                        const newPathSegments = [...pathSegments, encodeURIComponent(r.name)];
+                        const newEntry = r.type === vscode_1.FileType.Directory ? new ServerBackedDirectory(serverRoot, newPathSegments, r.name) : new ServerBackedFile(serverRoot, newPathSegments, r.name);
                         entries.set(newEntry.name, newEntry);
                     }
                 }
@@ -567,7 +572,8 @@ async function getEntries(serverUri) {
     }
     return new Map();
 }
-async function getStats(serverUri) {
+async function getStats(serverRoot, pathSegments) {
+    const serverUri = getServerUri(serverRoot, pathSegments);
     const url = serverUri.with({ query: 'stat' }).toString(/*skipEncoding*/ true);
     const response = await (0, request_light_1.xhr)({ url });
     if (response.status === 200 && response.status <= 204) {
@@ -579,7 +585,8 @@ async function getStats(serverUri) {
     }
     throw vscode_1.FileSystemError.FileNotFound(`Invalid server response for ${serverUri.toString(/*skipEncoding*/ true)}. Status ${response.status}.`);
 }
-async function getContent(serverUri) {
+async function getContent(serverRoot, pathSegments) {
+    const serverUri = getServerUri(serverRoot, pathSegments);
     const response = await (0, request_light_1.xhr)({ url: serverUri.toString(/*skipEncoding*/ true) });
     if (response.status >= 200 && response.status <= 204) {
         return response.body;

package/fs-provider/package.json

@@ -35,11 +35,11 @@
 		"package-web": "webpack --mode production --devtool hidden-source-map"
 	},
 	"devDependencies": {
-		"@types/vscode": "^1.72.0",
-		"@types/webpack-env": "^1.18.1",
-		"ts-loader": "^9.4.3",
-		"webpack": "^5.85.0",
-		"webpack-cli": "^5.1.1",
+		"@types/vscode": "^1.81.0",
+		"@types/webpack-env": "^1.18.2",
+		"ts-loader": "^9.4.4",
+		"webpack": "^5.88.2",
+		"webpack-cli": "^5.1.4",
 		"process": "^0.11.10",
 		"path-browserify": "^1.0.1",
 		"request-light": "^0.7.0",

package/out/index.js

@@ -28,7 +28,7 @@ async function runTests(options) {
         extensionPaths: options.extensionPaths,
         extensionIds: options.extensionIds,
         coi: !!options.coi,
-        esm: !!options.esm
+        esm: !!options.esm,
     };
     const host = options.host ?? 'localhost';
     const port = options.port ?? 3000;
@@ -76,7 +76,7 @@ async function getBuild(options) {
     if (options.vsCodeDevPath) {
         return {
             type: 'sources',
-            location: options.vsCodeDevPath
+            location: options.vsCodeDevPath,
         };
     }
     const quality = options.quality || options.version;
@@ -94,7 +94,7 @@ async function open(options) {
         extensionPaths: options.extensionPaths,
         extensionIds: options.extensionIds,
         coi: !!options.coi,
-        esm: !!options.esm
+        esm: !!options.esm,
     };
     const host = options.host ?? 'localhost';
     const port = options.port ?? 3000;
@@ -106,7 +106,7 @@ async function open(options) {
         dispose: () => {
             server.close();
             context?.browser()?.close();
-        }
+        },
     };
 }
 exports.open = open;
@@ -143,7 +143,7 @@ async function openBrowser(endpoint, options, configPage) {
             }
         });
     });
-    const page = context.pages()[0] ?? await context.newPage();
+    const page = context.pages()[0] ?? (await context.newPage());
     if (configPage) {
         await configPage(page, browser);
     }
@@ -160,7 +160,7 @@ async function openBrowser(endpoint, options, configPage) {
 }
 function validateStringOrUndefined(options, name) {
     const value = options[name];
-    if (value === undefined || (typeof value === 'string')) {
+    if (value === undefined || typeof value === 'string') {
         return value;
     }
     console.log(`'${name}' needs to be a string value.`);
@@ -173,7 +173,7 @@ async function validatePathOrUndefined(options, name, isFile) {
 }
 function validateBooleanOrUndefined(options, name) {
     const value = options[name];
-    if (value === undefined || (typeof value === 'boolean')) {
+    if (value === undefined || typeof value === 'boolean') {
         return value;
     }
     console.log(`'${name}' needs to be a boolean value.`);
@@ -199,7 +199,7 @@ function validateBrowserType(options) {
     if (options.browserType && options.browser) {
         console.log(`Ignoring browserType option '${options.browserType}' as browser option '${options.browser}' is set.`);
     }
-    if ((typeof browserType === 'string') && ['chromium', 'firefox', 'webkit', 'none'].includes(browserType)) {
+    if (typeof browserType === 'string' && ['chromium', 'firefox', 'webkit', 'none'].includes(browserType)) {
         return browserType;
     }
     console.log(`Invalid browser option ${browserType}.`);
@@ -257,7 +257,7 @@ async function validateExtensionIds(extensionIds) {
     if (Array.isArray(extensionIds)) {
         const res = [];
         for (const extensionId of extensionIds) {
-            const m = (typeof extensionId === 'string' && extensionId.match(EXTENSION_IDENTIFIER_PATTERN));
+            const m = typeof extensionId === 'string' && extensionId.match(EXTENSION_IDENTIFIER_PATTERN);
             if (m) {
                 if (m[2]) {
                     res.push({ id: m[1], preRelease: true });
@@ -282,13 +282,13 @@ async function validateExtensionIds(extensionIds) {
 async function validatePath(loc, isFile) {
     loc = path.resolve(loc);
     if (isFile) {
-        if (!await (0, download_1.fileExists)(loc)) {
+        if (!(await (0, download_1.fileExists)(loc))) {
             console.log(`'${loc}' must be an existing file.`);
             process.exit(-1);
         }
     }
     else {
-        if (!await (0, download_1.directoryExists)(loc)) {
+        if (!(await (0, download_1.directoryExists)(loc))) {
             console.log(`'${loc}' must be an existing folder.`);
             process.exit(-1);
         }
@@ -304,7 +304,7 @@ function validateQuality(quality, version, vsCodeDevPath) {
         console.log(`Sources folder is provided as input, quality is ignored.`);
         return undefined;
     }
-    if (quality === undefined || ((typeof quality === 'string') && ['insiders', 'stable'].includes(quality))) {
+    if (quality === undefined || (typeof quality === 'string' && ['insiders', 'stable'].includes(quality))) {
         return quality;
     }
     if (version === 'sources') {
@@ -368,7 +368,7 @@ async function cliMain() {
                 process.exit();
             }
             return true;
-        }
+        },
     };
     const args = minimist(process.argv.slice(2), options);
     if (args.help) {
@@ -427,7 +427,7 @@ async function cliMain() {
             coi,
             host,
             port,
-            testRunnerDataDir
+            testRunnerDataDir,
         }).catch(e => {
             console.log('Error running tests:', e);
             process.exit(1);
@@ -453,7 +453,7 @@ async function cliMain() {
             coi,
             host,
             port,
-            testRunnerDataDir
+            testRunnerDataDir,
         });
     }
 }

package/out/server/app.js

@@ -79,7 +79,7 @@ async function createApp(config) {
         console.log('Serving VS Code sources from ' + config.build.location);
         app.use(kmount('/static/sources', kstatic(config.build.location, serveOptions)));
         app.use(kmount('/static/sources', kstatic((0, path_1.join)(config.build.location, 'resources', 'server'), serveOptions))); // for manifest.json, favicon and code icons.
-        // built-in extension are at 'extensions` as well as prebuilt extensions dowloaded from the marketplace
+        // built-in extension are at 'extensions` as well as prebuilt extensions downloaded from the marketplace
         app.use(kmount(`/static/sources/extensions`, kstatic((0, path_1.join)(config.build.location, extensions_1.prebuiltExtensionsLocation), serveOptions)));
     }
     (0, mounts_1.configureMounts)(config, app);

package/out/server/extensions.js

@@ -57,7 +57,7 @@ async function getScannedBuiltinExtensions(vsCodeDevLocation) {
                 browserMain = browserMain + '.js';
             }
             const browserMainLocation = path.join(vsCodeDevLocation, 'extensions', ext.extensionPath, browserMain);
-            if (!await (0, download_1.fileExists)(browserMainLocation)) {
+            if (!(await (0, download_1.fileExists)(browserMainLocation))) {
                 console.log(`${browserMainLocation} not found. Make sure all extensions are compiled (use 'yarn watch-web').`);
             }
         }

package/out/server/mounts.js

@@ -27,14 +27,14 @@ function fileOps(mountPrefix, folderMountPath) {
     const router = new Router();
     router.get(`${mountPrefix}(/.*)?`, async (ctx, next) => {
         if (ctx.query.stat !== undefined) {
-            const p = path.join(folderMountPath, ctx.path.substring(mountPrefix.length));
+            const p = path.join(folderMountPath, decodeURIComponent(ctx.path.substring(mountPrefix.length)));
             try {
                 const stats = await fs_1.promises.stat(p);
                 ctx.body = {
                     type: getFileType(stats),
                     ctime: stats.ctime.getTime(),
                     mtime: stats.mtime.getTime(),
-                    size: stats.size
+                    size: stats.size,
                 };
             }
             catch (e) {
@@ -42,10 +42,10 @@ function fileOps(mountPrefix, folderMountPath) {
             }
         }
         else if (ctx.query.readdir !== undefined) {
-            const p = path.join(folderMountPath, ctx.path.substring(mountPrefix.length));
+            const p = path.join(folderMountPath, decodeURIComponent(ctx.path.substring(mountPrefix.length)));
             try {
                 const entries = await fs_1.promises.readdir(p, { withFileTypes: true });
-                ctx.body = entries.map(d => ({ name: d.name, type: getFileType(d) }));
+                ctx.body = entries.map((d) => ({ name: d.name, type: getFileType(d) }));
             }
             catch (e) {
                 ctx.body = { error: e.code };

package/out/server/workbench.js

@@ -31,7 +31,7 @@ class Workbench {
             WORKBENCH_AUTH_SESSION: '',
             WORKBENCH_WEB_BASE_URL: this.baseUrl,
             WORKBENCH_BUILTIN_EXTENSIONS: asJSON(this.builtInExtensions),
-            WORKBENCH_MAIN: this.getMain()
+            WORKBENCH_MAIN: this.getMain(),
         };
         try {
             const workbenchTemplate = (await fs_1.promises.readFile(path.resolve(__dirname, `../../views/workbench${this.esm ? '-esm' : ''}.html`))).toString();
@@ -75,7 +75,7 @@ async function getWorkbenchOptions(ctx, config) {
         options.additionalBuiltinExtensions.push(...config.extensionIds);
     }
     if (config.extensionDevelopmentPath) {
-        const developmentOptions = options.developmentOptions = {};
+        const developmentOptions = (options.developmentOptions = {});
         developmentOptions.extensions = await (0, extensions_1.scanForExtensions)(config.extensionDevelopmentPath, { scheme: ctx.protocol, authority: ctx.host, path: '/static/devextensions' });
         if (config.extensionTestsPath) {
             let relativePath = path.relative(config.extensionDevelopmentPath, config.extensionTestsPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-web",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "scripts": {
     "install-extensions": "yarn --cwd=fs-provider && yarn --cwd=sample",
     "compile": "tsc -p ./ && yarn compile-fs-provider",
@@ -30,28 +30,29 @@
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
     "minimist": "^1.2.8",
-    "playwright": "^1.34.3",
+    "playwright": "^1.38.1",
+    "@playwright/browser-chromium": "^1.38.1",
     "vscode-uri": "^3.0.7",
     "http-proxy-agent": "^7.0.0",
-    "https-proxy-agent": "^7.0.0",
-    "tar-fs": "^2.1.1",
+    "https-proxy-agent": "^7.0.2",
+    "tar-fs": "^3.0.4",
     "gunzip-maybe": "^1.4.2"
   },
   "devDependencies": {
-    "@types/koa": "^2.13.6",
-    "@types/koa-morgan": "^1.0.5",
-    "@types/koa-mount": "^4.0.2",
+    "@types/koa": "^2.13.9",
+    "@types/koa-morgan": "^1.0.6",
+    "@types/koa-mount": "^4.0.3",
     "@types/koa-static": "^4.0.2",
-    "@types/koa__router": "^12.0.0",
-    "@types/minimist": "^1.2.2",
+    "@types/koa__router": "^12.0.1",
+    "@types/minimist": "^1.2.3",
     "@types/node": "16.x",
     "@types/gunzip-maybe": "^1.4.0",
-    "@types/tar-fs": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.8",
-    "@typescript-eslint/parser": "^5.59.8",
-    "eslint": "^8.41.0",
+    "@types/tar-fs": "^2.0.2",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
+    "eslint": "^8.50.0",
     "eslint-plugin-header": "^3.1.1",
-    "typescript": "^5.1.3"
+    "typescript": "^5.2.2"
   },
   "license": "MIT",
   "author": "Visual Studio Code Team",