Merge final PR 383 tip into safe ZIP validation

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: priyanshu92

plugins/power-pages/.mcp.json

@@ -4,7 +4,7 @@
             "command": "node",
             "args": [
                 "-e",
-                "const fs=require('node:fs'); const path=require('node:path'); const fail=(message)=>{throw new Error('[Power Pages Playwright MCP] '+message);}; const declaredRoot=process.env.PLUGIN_ROOT||process.env.CLAUDE_PLUGIN_ROOT; if(!declaredRoot) fail('PLUGIN_ROOT or CLAUDE_PLUGIN_ROOT must be set; refusing to resolve the launcher from the current working directory.'); if(!path.isAbsolute(declaredRoot)) fail('Declared plugin root must be an absolute path: '+declaredRoot+'.'); let root; try{root=fs.realpathSync(declaredRoot);}catch(error){fail('Declared plugin root is invalid: '+declaredRoot+' ('+(error.code||error.message)+').');} if(!fs.statSync(root).isDirectory()) fail('Declared plugin root is not a directory: '+declaredRoot+'.'); const candidate=path.resolve(root,'scripts','launch-playwright-mcp.js'); let entry; try{entry=fs.realpathSync(candidate);}catch(error){fail('Launcher was not found under the declared plugin root: '+candidate+'.');} const relative=path.relative(root,entry); if(relative.startsWith('..'+path.sep)||path.isAbsolute(relative)) fail('Resolved launcher escapes the declared plugin root: '+entry+'.'); if(!fs.statSync(entry).isFile()) fail('Resolved launcher is not a file: '+entry+'.'); const mod=require(entry); if(!mod||typeof mod.launch!=='function') fail('Launcher did not export launch(): '+entry+'.'); mod.launch();"
+                "const fs=require('node:fs'); const path=require('node:path'); const fail=(message)=>{throw new Error('[Power Pages Playwright MCP] '+message);}; const declaredRoot=process.env.PLUGIN_ROOT||process.env.CLAUDE_PLUGIN_ROOT; if(!declaredRoot) fail('PLUGIN_ROOT or CLAUDE_PLUGIN_ROOT must be set; refusing to resolve the launcher from the current working directory.'); if(!path.isAbsolute(declaredRoot)) fail('Declared plugin root must be an absolute path: '+declaredRoot+'.'); let root; try{root=fs.realpathSync(declaredRoot);}catch(error){fail('Declared plugin root is invalid: '+declaredRoot+' ('+(error.code||error.message)+').');} let rootStat; try{rootStat=fs.statSync(root);}catch(error){fail('Could not inspect declared plugin root: '+root+' ('+(error.code||error.message)+').');} if(!rootStat.isDirectory()) fail('Declared plugin root is not a directory: '+declaredRoot+'.'); const candidate=path.resolve(root,'scripts','launch-playwright-mcp.js'); let entry; try{entry=fs.realpathSync(candidate);}catch(error){fail('Launcher was not found under the declared plugin root: '+candidate+'.');} const relative=path.relative(root,entry); if(relative==='..'||relative.startsWith('..'+path.sep)||path.isAbsolute(relative)) fail('Resolved launcher escapes the declared plugin root: '+entry+'.'); let entryStat; try{entryStat=fs.statSync(entry);}catch(error){fail('Could not inspect resolved launcher: '+entry+' ('+(error.code||error.message)+').');} if(!entryStat.isFile()) fail('Resolved launcher is not a file: '+entry+'.'); const mod=require(entry); if(!mod||typeof mod.launch!=='function') fail('Launcher did not export launch(): '+entry+'.'); mod.launch();"
             ]
         },
         "microsoft-learn": {

plugins/power-pages/scripts/tests/mcp-config.test.js

@@ -32,8 +32,16 @@ require('node:child_process').spawn = (command, args, options) => {
   return preloadPath;
 }
 
-function runBootstrap({ cwd, pluginRoot: pluginRootValue, claudePluginRoot, preloadPath } = {}) {
+function runBootstrap({
+  cwd,
+  pluginRoot: pluginRootValue,
+  claudePluginRoot,
+  preloadPath,
+  realpathOverride,
+  statFailure,
+} = {}) {
   const env = { ...process.env };
+  let args = [...server.args];
   delete env.PLUGIN_ROOT;
   delete env.CLAUDE_PLUGIN_ROOT;
 
@@ -43,10 +51,34 @@ function runBootstrap({ cwd, pluginRoot: pluginRootValue, claudePluginRoot, prel
   if (claudePluginRoot !== undefined) {
     env.CLAUDE_PLUGIN_ROOT = claudePluginRoot;
   }
+  if (realpathOverride) {
+    // Patch only the launcher lookup so the canonical root still follows the real filesystem.
+    const bootstrapIndex = args.indexOf('-e') + 1;
+    const prelude = [
+      "const injectedFs=require('node:fs');",
+      'const originalRealpathSync=injectedFs.realpathSync;',
+      `const injectedRealpathTarget=${JSON.stringify(path.resolve(realpathOverride.target))};`,
+      `const injectedRealpathResult=${JSON.stringify(path.resolve(realpathOverride.result))};`,
+      "injectedFs.realpathSync=function(target,...options){if(require('node:path').resolve(String(target))===injectedRealpathTarget)return injectedRealpathResult;return originalRealpathSync.call(this,target,...options);};",
+    ].join(' ');
+    args[bootstrapIndex] = `${prelude} ${args[bootstrapIndex]}`;
+  }
+  if (statFailure) {
+    // Patch the child process's fs module so access errors are deterministic across platforms.
+    const bootstrapIndex = args.indexOf('-e') + 1;
+    const prelude = [
+      "const injectedFs=require('node:fs');",
+      'const originalStatSync=injectedFs.statSync;',
+      `const injectedStatTarget=${JSON.stringify(path.resolve(statFailure.target))};`,
+      `const injectedStatCode=${JSON.stringify(statFailure.code)};`,
+      "injectedFs.statSync=function(target,...options){if(require('node:path').resolve(String(target))===injectedStatTarget){const error=new Error('injected statSync failure');error.code=injectedStatCode;throw error;}return originalStatSync.call(this,target,...options);};",
+    ].join(' ');
+    args[bootstrapIndex] = `${prelude} ${args[bootstrapIndex]}`;
+  }
 
-  const args = preloadPath
-    ? ['--require', preloadPath, ...server.args]
-    : server.args;
+  if (preloadPath) {
+    args = ['--require', preloadPath, ...args];
+  }
 
   return spawnSync(server.command, args, {
     cwd,
@@ -56,6 +88,36 @@ function runBootstrap({ cwd, pluginRoot: pluginRootValue, claudePluginRoot, prel
   });
 }
 
+test('playwright MCP bootstrap wraps root stat errors with a clear diagnostic', () => {
+  const root = fs.realpathSync(pluginRoot);
+  const result = runBootstrap({
+    cwd: pluginRoot,
+    pluginRoot,
+    statFailure: { target: root, code: 'EACCES' },
+  });
+
+  assert.notEqual(result.status, 0);
+  assert.match(
+    result.stderr,
+    /\[Power Pages Playwright MCP\] Could not inspect declared plugin root: .+ \(EACCES\)\./,
+  );
+});
+
+test('playwright MCP bootstrap wraps launcher stat errors with a clear diagnostic', () => {
+  const launcher = fs.realpathSync(path.join(pluginRoot, 'scripts', 'launch-playwright-mcp.js'));
+  const result = runBootstrap({
+    cwd: pluginRoot,
+    pluginRoot,
+    statFailure: { target: launcher, code: 'EPERM' },
+  });
+
+  assert.notEqual(result.status, 0);
+  assert.match(
+    result.stderr,
+    /\[Power Pages Playwright MCP\] Could not inspect resolved launcher: .+ \(EPERM\)\./,
+  );
+});
+
 test('playwright MCP bootstrap requires a host-provided plugin root', () => {
   const result = runBootstrap({ cwd: pluginRoot });
 
@@ -149,6 +211,32 @@ test('playwright MCP bootstrap rejects a launcher that resolves outside the plug
   assert.equal(fs.existsSync(markerPath), false);
 });
 
+test('playwright MCP bootstrap rejects a launcher resolving to the exact parent directory', (t) => {
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'power-pages-mcp-parent-escape-'));
+  const declaredRoot = path.join(tempDir, 'plugin');
+  t.after(() => fs.rmSync(tempDir, { recursive: true, force: true }));
+  fs.mkdirSync(declaredRoot);
+  const canonicalRoot = fs.realpathSync(declaredRoot);
+  const candidate = path.join(canonicalRoot, 'scripts', 'launch-playwright-mcp.js');
+  const exactParent = path.dirname(canonicalRoot);
+
+  const result = runBootstrap({
+    cwd: tempDir,
+    pluginRoot: declaredRoot,
+    realpathOverride: { target: candidate, result: exactParent },
+  });
+
+  assert.notEqual(result.status, 0);
+  assert.match(
+    result.stderr,
+    /Error: \[Power Pages Playwright MCP\] Resolved launcher escapes the declared plugin root:/,
+  );
+  assert.doesNotMatch(
+    result.stderr,
+    /Error: \[Power Pages Playwright MCP\] Resolved launcher is not a file:/,
+  );
+});
+
 test('playwright MCP bootstrap supports installed-plugin root environment conventions', async (t) => {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'power-pages-mcp-'));
   t.after(() => fs.rmSync(tempDir, { recursive: true, force: true }));