http2: omit server name when HTTP2 host is IP address

Fixes: #56189 PR-URL: #56530 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Yongsheng Zhang <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>

Author: islandryu

lib/internal/http2/core.js

@@ -645,15 +645,21 @@ function initOriginSet(session){
 if(originSet===undefined){
 constsocket=session[kSocket];
 session[kState].originSet=originSet=newSafeSet();
-if(socket.servername!=null){
-letoriginString=`https://${socket.servername}`;
-if(socket.remotePort!=null)
-originString+=`:${socket.remotePort}`;
-// We have to ensure that it is a properly serialized
-// ASCII origin string. The socket.servername might not
-// be properly ASCII encoded.
-originSet.add(getURLOrigin(originString));
+lethostName=socket.servername;
+if(hostName===null||hostName===false){
+if(socket.remoteFamily==='IPv6'){
+hostName=`[${socket.remoteAddress}]`;
+}else{
+hostName=socket.remoteAddress;
+}
 }
+letoriginString=`https://${hostName}`;
+if(socket.remotePort!=null)
+originString+=`:${socket.remotePort}`;
+// We have to ensure that it is a properly serialized
+// ASCII origin string. The socket.servername might not
+// be properly ASCII encoded.
+originSet.add(getURLOrigin(originString));
 }
 returnoriginSet;
 }
@@ -3352,7 +3358,7 @@ function connect(authority, options, listener){
 socket=net.connect({ port, host, ...options});
 break;
 case'https:':
-socket=tls.connect(port,host,initializeTLSOptions(options,host));
+socket=tls.connect(port,host,initializeTLSOptions(options,net.isIP(host) ? undefined : host));
 break;
 default:
 thrownewERR_HTTP2_UNSUPPORTED_PROTOCOL(protocol);

test/parallel/test-http2-ip-address-host.js

@@ -0,0 +1,53 @@
+'use strict';
+
+constcommon=require('../common');
+if(!common.hasCrypto){common.skip('missing crypto');}
+constassert=require('assert');
+constfixtures=require('../common/fixtures');
+consth2=require('http2');
+
+functionloadKey(keyname){
+returnfixtures.readKey(keyname,'binary');
+}
+
+constkey=loadKey('agent8-key.pem');
+constcert=fixtures.readKey('agent8-cert.pem');
+
+constserver=h2.createSecureServer({ key, cert });
+consthasIPv6=common.hasIPv6;
+consttestCount=hasIPv6 ? 2 : 1;
+
+server.on('stream',common.mustCall((stream)=>{
+constsession=stream.session;
+assert.strictEqual(session.servername,undefined);
+stream.respond({'content-type': 'application/json'});
+stream.end(JSON.stringify({
+servername: session.servername,
+originSet: session.originSet
+})
+);
+},testCount));
+
+letdone=0;
+
+server.listen(0,common.mustCall(()=>{
+functionhandleRequest(url){
+constclient=h2.connect(url,
+{rejectUnauthorized: false});
+constreq=client.request();
+letdata='';
+req.setEncoding('utf8');
+req.on('data',(d)=>data+=d);
+req.on('end',common.mustCall(()=>{
+constoriginSet=req.session.originSet;
+assert.strictEqual(originSet[0],url);
+client.close();
+if(++done===testCount)server.close();
+}));
+}
+
+constipv4Url=`https://127.0.0.1:${server.address().port}`;
+constipv6Url=`https://[::1]:${server.address().port}`;
+handleRequest(ipv4Url);
+if(hasIPv6)handleRequest(ipv6Url);
+}));