policy: refactor to use more primordials

aduh95 · targos · commit bf9aa425c0f9 · 2021-06-11T09:29:16.000+02:00
PR-URL: #36210 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Bradley Farias <bradley.meck@gmail.com>
diff --git a/lib/internal/policy/manifest.js b/lib/internal/policy/manifest.js
@@ -2,8 +2,6 @@
 
 const {
 ArrayIsArray,
- Map,
- MapPrototypeSet,
 ObjectCreate,
 ObjectEntries,
 ObjectFreeze,
@@ -12,6 +10,8 @@ const {
 RegExpPrototypeTest,
 SafeMap,
 SafeSet,
+ StringPrototypeEndsWith,
+ StringPrototypeReplace,
 Symbol,
 uncurryThis,
 } = primordials;
@@ -334,14 +334,15 @@ class Manifest {
 * @returns {string}
 */
 const protocolOrResolve = (resourceHREF) => {
- if (resourceHREF.endsWith(':')) {
+ if (StringPrototypeEndsWith(resourceHREF, ':')) {
 // URL parse will trim these anyway, save the compute
- resourceHREF = resourceHREF.replace(
+ resourceHREF = StringPrototypeReplace(
+ resourceHREF,
 // eslint-disable-next-line
 /^[\x00-\x1F\x20]|\x09\x0A\x0D|[\x00-\x1F\x20]$/g,
 ''
 );
- if (/^[a-zA-Z][a-zA-Z+\-.]*:$/.test(resourceHREF)) {
+ if (RegExpPrototypeTest(/^[a-zA-Z][a-zA-Z+\-.]*:$/, resourceHREF)) {
 return resourceHREF;
 }
 }
@@ -424,7 +425,7 @@ class Manifest {
 // Only a few schemes are hierarchical
 if (kSpecialSchemes.has(currentURL.protocol)) {
 // Make first '..' act like '.'
- if (currentURL.pathname.slice(-1) !== '/') {
+ if (!StringPrototypeEndsWith(currentURL.pathname, '/')) {
 currentURL.pathname += '/';
 }
 let lastHREF;
@@ -476,7 +477,7 @@ class Manifest {
 assertIntegrity(url, content) {
 const href = `${url}`;
 debug('Checking integrity of %s', href);
- const realIntegrities = new Map();
+ const realIntegrities = new SafeMap();
 const integrities = this.#resourceIntegrities;
 function processEntry(href) {
 let integrityEntries = integrities.get(href);
@@ -505,8 +506,7 @@ class Manifest {
 timingSafeEqual(digest, expected)) {
 return true;
 }
- MapPrototypeSet(
- realIntegrities,
+ realIntegrities.set(
 algorithm,
 BufferToString(digest, 'base64')
 );
diff --git a/lib/internal/policy/sri.js b/lib/internal/policy/sri.js
@@ -3,9 +3,9 @@
 // https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
 
 const {
+ ArrayPrototype,
 ObjectDefineProperty,
 ObjectFreeze,
- ObjectGetPrototypeOf,
 ObjectSeal,
 ObjectSetPrototypeOf,
 RegExp,
@@ -32,7 +32,6 @@ const kAllWSP = RegExp(`^${kWSP}*$`);
 ObjectSeal(kAllWSP);
 
 const BufferFrom = require('buffer').Buffer.from;
-const RealArrayPrototype = ObjectGetPrototypeOf([]);
 
 // Returns {algorithm, value (in base64 string), options,}[]
 const parse = (str) => {
@@ -41,10 +40,10 @@ const parse = (str) => {
 const entries = [];
 while (match = RegExpPrototypeExec(kSRIPattern, str)) {
 if (match.index !== prevIndex) {
- throw new ERR_SRI_PARSE(str, str.charAt(prevIndex), prevIndex);
+ throw new ERR_SRI_PARSE(str, str[prevIndex], prevIndex);
 }
 if (entries.length > 0 && match[1] === '') {
- throw new ERR_SRI_PARSE(str, str.charAt(prevIndex), prevIndex);
+ throw new ERR_SRI_PARSE(str, str[prevIndex], prevIndex);
 }
 
 // Avoid setters being fired
@@ -63,10 +62,10 @@ const parse = (str) => {
 
 if (prevIndex !== str.length) {
 if (!RegExpPrototypeTest(kAllWSP, StringPrototypeSlice(str, prevIndex))) {
- throw new ERR_SRI_PARSE(str, str.charAt(prevIndex), prevIndex);
+ throw new ERR_SRI_PARSE(str, str[prevIndex], prevIndex);
 }
 }
- return ObjectSetPrototypeOf(entries, RealArrayPrototype);
+ return ObjectSetPrototypeOf(entries, ArrayPrototype);
 };
 
 module.exports = {

-Original file line number
+Diff line change
 const{
  ArrayIsArray,
 - Map,
 - MapPrototypeSet,
  ObjectCreate,
  ObjectEntries,
  ObjectFreeze,
  RegExpPrototypeTest,
  SafeMap,
  SafeSet,
 + StringPrototypeEndsWith,
 + StringPrototypeReplace,
  Symbol,
  uncurryThis,
 }=primordials;
  * @returns {string}
  */
 constprotocolOrResolve=(resourceHREF)=>{
 -if(resourceHREF.endsWith(':')){
 +if(StringPrototypeEndsWith(resourceHREF,':')){
 // URL parse will trim these anyway, save the compute
 -resourceHREF=resourceHREF.replace(
 +resourceHREF=StringPrototypeReplace(
 +resourceHREF,
 // eslint-disable-next-line
 /^[\x00-\x1F\x20]|\x09\x0A\x0D|[\x00-\x1F\x20]$/g,
 ''
 );
 -if(/^[a-zA-Z][a-zA-Z+\-.]*:$/.test(resourceHREF)){
 +if(RegExpPrototypeTest(/^[a-zA-Z][a-zA-Z+\-.]*:$/,resourceHREF)){
 returnresourceHREF;
+}
+}
 // Only a few schemes are hierarchical
 if(kSpecialSchemes.has(currentURL.protocol)){
 // Make first '..' act like '.'
 -if(currentURL.pathname.slice(-1)!=='/'){
 +if(!StringPrototypeEndsWith(currentURL.pathname,'/')){
 currentURL.pathname+='/';
+}
 letlastHREF;
 assertIntegrity(url,content){
 consthref=`${url}`;
 debug('Checking integrity of %s',href);
 -constrealIntegrities=newMap();
 +constrealIntegrities=newSafeMap();
 constintegrities=this.#resourceIntegrities;
 functionprocessEntry(href){
 letintegrityEntries=integrities.get(href);
 timingSafeEqual(digest,expected)){
 returntrue;
+}
 -MapPrototypeSet(
 -realIntegrities,
 +realIntegrities.set(
 algorithm,
 BufferToString(digest,'base64')
 );
-Original file line number
+Diff line change
 // https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
 const{
 + ArrayPrototype,
  ObjectDefineProperty,
  ObjectFreeze,
 - ObjectGetPrototypeOf,
  ObjectSeal,
  ObjectSetPrototypeOf,
  RegExp,
 ObjectSeal(kAllWSP);
 constBufferFrom=require('buffer').Buffer.from;
 -constRealArrayPrototype=ObjectGetPrototypeOf([]);
 // Returns {algorithm, value (in base64 string), options,}[]
 constparse=(str)=>{
 constentries=[];
 while(match=RegExpPrototypeExec(kSRIPattern,str)){
 if(match.index!==prevIndex){
 -thrownewERR_SRI_PARSE(str,str.charAt(prevIndex),prevIndex);
 +thrownewERR_SRI_PARSE(str,str[prevIndex],prevIndex);
+}
 if(entries.length>0&&match[1]===''){
 -thrownewERR_SRI_PARSE(str,str.charAt(prevIndex),prevIndex);
 +thrownewERR_SRI_PARSE(str,str[prevIndex],prevIndex);
+}
 // Avoid setters being fired
 if(prevIndex!==str.length){
 if(!RegExpPrototypeTest(kAllWSP,StringPrototypeSlice(str,prevIndex))){
 -thrownewERR_SRI_PARSE(str,str.charAt(prevIndex),prevIndex);
 +thrownewERR_SRI_PARSE(str,str[prevIndex],prevIndex);
+}
+}
 -returnObjectSetPrototypeOf(entries,RealArrayPrototype);
 +returnObjectSetPrototypeOf(entries,ArrayPrototype);
 };
 module.exports={