http: remove prototype primordials

Co-authored-by: Yagiz Nizipli <yagiz@nizipli.com>
PR-URL: #53698
Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>

Author: 2 people

doc/contributing/primordials.md

@@ -7,6 +7,7 @@ later look these up from the global proxy, which can be mutated by users.
 For some area of the codebase, performance and code readability are deemed more
 important than reliability against prototype pollution:
 
+*`node:http`
 *`node:http2`
 
 Usage of primordials should be preferred for new code in other areas, but

lib/_http_agent.js

@@ -22,23 +22,10 @@
 'use strict';
 
 const{
- ArrayPrototypeIncludes,
- ArrayPrototypeIndexOf,
- ArrayPrototypePop,
- ArrayPrototypePush,
- ArrayPrototypeShift,
- ArrayPrototypeSome,
- ArrayPrototypeSplice,
- FunctionPrototypeCall,
  NumberParseInt,
  ObjectKeys,
  ObjectSetPrototypeOf,
  ObjectValues,
- RegExpPrototypeExec,
- StringPrototypeIndexOf,
- StringPrototypeSplit,
- StringPrototypeStartsWith,
- StringPrototypeSubstring,
  Symbol,
 }=primordials;
 
@@ -92,7 +79,7 @@ function Agent(options) {
 if(!(thisinstanceofAgent))
 returnnewAgent(options);
 
-FunctionPrototypeCall(EventEmitter,this);
+EventEmitter.call(this);
 
 this.defaultPort=80;
 this.protocol='http:';
@@ -139,7 +126,7 @@ function Agent(options) {
 
 constrequests=this.requests[name];
 if(requests&&requests.length){
-constreq=ArrayPrototypeShift(requests);
+constreq=requests.shift();
 constreqAsyncRes=req[kRequestAsyncResource];
 if(reqAsyncRes){
 // Run request within the original async context.
@@ -185,7 +172,7 @@ function Agent(options) {
 this.removeSocket(socket,options);
 
 socket.once('error',freeSocketErrorListener);
-ArrayPrototypePush(freeSockets,socket);
+freeSockets.push(socket);
 });
 
 // Don't emit keylog events unless there is a listener for them.
@@ -264,11 +251,11 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
 letsocket;
 if(freeSockets){
 while(freeSockets.length&&freeSockets[0].destroyed){
-ArrayPrototypeShift(freeSockets);
+freeSockets.shift();
 }
 socket=this.scheduling==='fifo' ?
-ArrayPrototypeShift(freeSockets) :
-ArrayPrototypePop(freeSockets);
+freeSockets.shift() :
+freeSockets.pop();
 if(!freeSockets.length)
 deletethis.freeSockets[name];
 }
@@ -280,7 +267,7 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
 asyncResetHandle(socket);
 this.reuseSocket(socket,req);
 setRequestSocket(this,req,socket);
-ArrayPrototypePush(this.sockets[name],socket);
+this.sockets[name].push(socket);
 }elseif(sockLen<this.maxSockets&&
 this.totalSocketCount<this.maxTotalSockets){
 debug('call onSocket',sockLen,freeLen);
@@ -303,7 +290,7 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
 // Used to capture the original async context.
 req[kRequestAsyncResource]=newAsyncResource('QueuedRequest');
 
-ArrayPrototypePush(this.requests[name],req);
+this.requests[name].push(req);
 }
 };
 
@@ -326,7 +313,7 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {
 if(!this.sockets[name]){
 this.sockets[name]=[];
 }
-ArrayPrototypePush(this.sockets[name],s);
+this.sockets[name].push(s);
 this.totalSocketCount++;
 debug('sockets',name,this.sockets[name].length,this.totalSocketCount);
 installListeners(this,s,options);
@@ -357,16 +344,16 @@ function calculateServerName(options, req) {
 // abc:123 => abc
 // [::1] => ::1
 // [::1]:123 => ::1
-if(StringPrototypeStartsWith(hostHeader,'[')){
-constindex=StringPrototypeIndexOf(hostHeader,']');
+if(hostHeader.startsWith('[')){
+constindex=hostHeader.indexOf(']');
 if(index===-1){
 // Leading '[', but no ']'. Need to do something...
 servername=hostHeader;
 }else{
-servername=StringPrototypeSubstring(hostHeader,1,index);
+servername=hostHeader.substring(1,index);
 }
 }else{
-servername=StringPrototypeSplit(hostHeader,':',1)[0];
+servername=hostHeader.split(':',1)[0];
 }
 }
 // Don't implicitly set invalid (IP) servernames.
@@ -398,9 +385,7 @@ function installListeners(agent, s, options) {
 // Destroy if in free list.
 // TODO(ronag): Always destroy, even if not in free list.
 constsockets=agent.freeSockets;
-if(ArrayPrototypeSome(ObjectKeys(sockets),(name)=>
-ArrayPrototypeIncludes(sockets[name],s),
-)){
+if(ObjectKeys(sockets).some((name)=>sockets[name].includes(s))){
 returns.destroy();
 }
 }
@@ -432,15 +417,15 @@ Agent.prototype.removeSocket = function removeSocket(s, options) {
 
 // If the socket was destroyed, remove it from the free buffers too.
 if(!s.writable)
-ArrayPrototypePush(sets,this.freeSockets);
+sets.push(this.freeSockets);
 
 for(letsk=0;sk<sets.length;sk++){
 constsockets=sets[sk];
 
 if(sockets[name]){
-constindex=ArrayPrototypeIndexOf(sockets[name],s);
+constindex=sockets[name].indexOf(s);
 if(index!==-1){
-ArrayPrototypeSplice(sockets[name],index,1);
+sockets[name].splice(index,1);
 // Don't leak
 if(sockets[name].length===0)
 deletesockets[name];
@@ -493,7 +478,7 @@ Agent.prototype.keepSocketAlive = function keepSocketAlive(socket) {
 constkeepAliveHint=socket._httpMessage.res.headers['keep-alive'];
 
 if(keepAliveHint){
-consthint=RegExpPrototypeExec(/^timeout=(\d+)/,keepAliveHint)?.[1];
+consthint=/^timeout=(\d+)/.exec(keepAliveHint)?.[1];
 
 if(hint){
 constserverHintTimeout=NumberParseInt(hint)*1000;

lib/_http_client.js

@@ -25,20 +25,13 @@ const {
  ArrayIsArray,
  Boolean,
  Error,
- FunctionPrototypeCall,
  NumberIsFinite,
  ObjectAssign,
  ObjectKeys,
  ObjectSetPrototypeOf,
  ReflectApply,
- RegExpPrototypeExec,
  String,
- StringPrototypeCharCodeAt,
- StringPrototypeIncludes,
- StringPrototypeIndexOf,
- StringPrototypeToUpperCase,
  Symbol,
- TypedArrayPrototypeSlice,
 }=primordials;
 
 constnet=require('net');
@@ -139,7 +132,7 @@ class HTTPClientAsyncResource {
 }
 
 functionClientRequest(input,options,cb){
-FunctionPrototypeCall(OutgoingMessage,this);
+OutgoingMessage.call(this);
 
 if(typeofinput==='string'){
 consturlStr=input;
@@ -184,7 +177,7 @@ function ClientRequest(input, options, cb) {
 
 if(options.path){
 constpath=String(options.path);
-if(RegExpPrototypeExec(INVALID_PATH_REGEX,path)!==null){
+if(INVALID_PATH_REGEX.test(path)){
 debug('Path contains unescaped characters: "%s"',path);
 thrownewERR_UNESCAPED_CHARACTERS('Request path');
 }
@@ -225,7 +218,7 @@ function ClientRequest(input, options, cb) {
 if(!checkIsHttpToken(method)){
 thrownewERR_INVALID_HTTP_TOKEN('Method',method);
 }
-method=this.method=StringPrototypeToUpperCase(method);
+method=this.method=method.toUpperCase();
 }else{
 method=this.method='GET';
 }
@@ -307,10 +300,10 @@ function ClientRequest(input, options, cb) {
 // For the Host header, ensure that IPv6 addresses are enclosed
 // in square brackets, as defined by URI formatting
 // https://tools.ietf.org/html/rfc3986#section-3.2.2
-constposColon=StringPrototypeIndexOf(hostHeader,':');
+constposColon=hostHeader.indexOf(':');
 if(posColon!==-1&&
-StringPrototypeIncludes(hostHeader,':',posColon+1)&&
-StringPrototypeCharCodeAt(hostHeader,0)!==91/* '[' */){
+hostHeader.includes(':',posColon+1)&&
+hostHeader.charCodeAt(0)!==91/* '[' */){
 hostHeader=`[${hostHeader}]`;
 }
 
@@ -383,7 +376,7 @@ ObjectSetPrototypeOf(ClientRequest.prototype, OutgoingMessage.prototype);
 ObjectSetPrototypeOf(ClientRequest,OutgoingMessage);
 
 ClientRequest.prototype._finish=function_finish(){
-FunctionPrototypeCall(OutgoingMessage.prototype._finish,this);
+OutgoingMessage.prototype._finish.call(this);
 if(hasObserver('http')){
 startPerf(this,kClientRequestStatistics,{
 type: 'http',
@@ -574,7 +567,7 @@ function socketOnData(d) {
 parser.finish();
 freeParser(parser,req,socket);
 
-constbodyHead=TypedArrayPrototypeSlice(d,bytesParsed,d.length);
+constbodyHead=d.slice(bytesParsed,d.length);
 
 consteventName=req.method==='CONNECT' ? 'connect' : 'upgrade';
 if(req.listenerCount(eventName)>0){

lib/_http_common.js

@@ -24,7 +24,6 @@
 const{
  MathMin,
  Symbol,
- RegExpPrototypeExec,
 }=primordials;
 const{ setImmediate }=require('timers');
 
@@ -210,7 +209,7 @@ const tokenRegExp = /^[\^_`a-zA-Z\-0-9!#$%&'*+.|~]+$/;
  * See https://tools.ietf.org/html/rfc7230#section-3.2.6
  */
 functioncheckIsHttpToken(val){
-returnRegExpPrototypeExec(tokenRegExp,val)!==null;
+returntokenRegExp.test(val);
 }
 
 constheaderCharRegex=/[^\t\x20-\x7e\x80-\xff]/;
@@ -221,7 +220,7 @@ const headerCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
  * field-vchar = VCHAR / obs-text
  */
 functioncheckInvalidHeaderChar(val){
-returnRegExpPrototypeExec(headerCharRegex,val)!==null;
+returnheaderCharRegex.test(val);
 }
 
 functioncleanParser(parser){

lib/_http_incoming.js

@@ -24,9 +24,6 @@
 const{
  ObjectDefineProperty,
  ObjectSetPrototypeOf,
- StringPrototypeCharCodeAt,
- StringPrototypeSlice,
- StringPrototypeToLowerCase,
  Symbol,
 }=primordials;
 
@@ -370,7 +367,7 @@ function matchKnownFields(field, lowercased) {
 if(lowercased){
 return'\u0000'+field;
 }
-returnmatchKnownFields(StringPrototypeToLowerCase(field),true);
+returnmatchKnownFields(field.toLowerCase(),true);
 }
 // Add the given (field, value) pair to the message
 //
@@ -384,9 +381,9 @@ function matchKnownFields(field, lowercased) {
 IncomingMessage.prototype._addHeaderLine=_addHeaderLine;
 function_addHeaderLine(field,value,dest){
 field=matchKnownFields(field);
-constflag=StringPrototypeCharCodeAt(field,0);
+constflag=field.charCodeAt(0);
 if(flag===0||flag===2){
-field=StringPrototypeSlice(field,1);
+field=field.slice(1);
 // Make a delimited list
 if(typeofdest[field]==='string'){
 dest[field]+=(flag===0 ? ', ' : '; ')+value;
@@ -418,7 +415,7 @@ function _addHeaderLine(field, value, dest) {
 
 IncomingMessage.prototype._addHeaderLineDistinct=_addHeaderLineDistinct;
 function_addHeaderLineDistinct(field,value,dest){
-field=StringPrototypeToLowerCase(field);
+field=field.toLowerCase();
 if(!dest[field]){
 dest[field]=[value];
 }else{