policy: increase tests via permutation matrix

PR-URL: #34404 Reviewed-By: James M Snell <[email protected]>

Author: bmeck

lib/internal/modules/cjs/loader.js

@@ -262,18 +262,13 @@ function readPackage(requestPath){
 constexisting=packageJsonCache.get(jsonPath);
 if(existing!==undefined)returnexisting;
 
-constresult=packageJsonReader.read(path.toNamespacedPath(jsonPath));
+constresult=packageJsonReader.read(jsonPath);
 constjson=result.containsKeys===false ? '{}' : result.string;
 if(json===undefined){
 packageJsonCache.set(jsonPath,false);
 returnfalse;
 }
 
-if(manifest){
-constjsonURL=pathToFileURL(jsonPath);
-manifest.assertIntegrity(jsonURL,json);
-}
-
 try{
 constparsed=JSONParse(json);
 constfiltered={

lib/internal/modules/esm/get_source.js

@@ -1,5 +1,10 @@
 'use strict';
 
+const{ getOptionValue }=require('internal/options');
+constmanifest=getOptionValue('--experimental-policy') ?
+require('internal/process/policy').manifest :
+null;
+
 const{ Buffer }=require('buffer');
 
 constfs=require('fs');
@@ -15,20 +20,22 @@ const DATA_URL_PATTERN = /^[^/]+\/[^,;]+(?:[^,]*?)(;base64)?,([\s\S]*)$/;
 
 asyncfunctiondefaultGetSource(url,{ format }={},defaultGetSource){
 constparsed=newURL(url);
+letsource;
 if(parsed.protocol==='file:'){
-return{
-source: awaitreadFileAsync(parsed)
-};
+source=awaitreadFileAsync(parsed);
 }elseif(parsed.protocol==='data:'){
 constmatch=DATA_URL_PATTERN.exec(parsed.pathname);
 if(!match){
 thrownewERR_INVALID_URL(url);
 }
 const[,base64,body]=match;
-return{
-source: Buffer.from(body,base64 ? 'base64' : 'utf8')
-};
+source=Buffer.from(body,base64 ? 'base64' : 'utf8');
+}else{
+thrownewERR_INVALID_URL_SCHEME(['file','data']);
+}
+if(manifest){
+manifest.assertIntegrity(parsed,source);
 }
-thrownewERR_INVALID_URL_SCHEME(['file','data']);
+return{ source };
 }
 exports.defaultGetSource=defaultGetSource;

lib/internal/modules/package_json_reader.js

@@ -2,21 +2,35 @@
 
 const{ SafeMap }=primordials;
 const{ internalModuleReadJSON }=internalBinding('fs');
+const{ pathToFileURL }=require('url');
+const{ toNamespacedPath }=require('path');
 
 constcache=newSafeMap();
 
 /**
  *
- * @param{string} path
+ * @param{string} jsonPath
  */
-functionread(path){
-if(cache.has(path)){
-returncache.get(path);
+functionread(jsonPath){
+if(cache.has(jsonPath)){
+returncache.get(jsonPath);
 }
 
-const[string,containsKeys]=internalModuleReadJSON(path);
+const[string,containsKeys]=internalModuleReadJSON(
+toNamespacedPath(jsonPath)
+);
 constresult={ string, containsKeys };
-cache.set(path,result);
+const{ getOptionValue }=require('internal/options');
+if(string!==undefined){
+constmanifest=getOptionValue('--experimental-policy') ?
+require('internal/process/policy').manifest :
+null;
+if(manifest){
+constjsonURL=pathToFileURL(jsonPath);
+manifest.assertIntegrity(jsonURL,string);
+}
+}
+cache.set(jsonPath,result);
 returnresult;
 }
 

lib/internal/worker.js

@@ -205,6 +205,9 @@ class Worker extends EventEmitter{
 cwdCounter: cwdCounter||workerIo.sharedCwdCounter,
 workerData: options.workerData,
 publicPort: port2,
+manifestURL: getOptionValue('--experimental-policy') ?
+require('internal/process/policy').url :
+null,
 manifestSrc: getOptionValue('--experimental-policy') ?
 require('internal/process/policy').src :
 null,