refactor: refine code

rontian · Nov 19, 2021 · 11f6e2f · 11f6e2f
1 parent e77c00b
commit 11f6e2f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/https/ca.js b/lib/https/ca.js
@@ -388,8 +388,12 @@ function getRootCAFile() {
 
 createRootCA();// 启动生成ca
 
+function getRemoteCert(servername) {
+  return remoteCerts.get(servername[0] === ':' ? servername.substring(1) : servername);
+}
+
 function getCert(servername) {
-  var options = remoteCerts.get(servername[0] === ':' ? servername.substring(1) : servername);
+  var options = getRemoteCert(servername);
   if (!options) {
     servername = getDomain(servername);
     options = createCertificate(servername);

diff --git a/lib/https/index.js b/lib/https/index.js
@@ -984,7 +984,7 @@ module.exports = function(socket, next, isWebPort) {
         return next(chunk);
       }
       var receiveData, authTimer;
-      var useSNI, serverKey;
+      var useSNI;
       var checkTimeout = function() {
         authTimer = setTimeout(function() {
           if (reqSocket) {
@@ -1055,6 +1055,7 @@ module.exports = function(socket, next, isWebPort) {
       };
       var useNoSNIServer = function() {
         checkTimeout();
+        var serverKey = requestCert ? ':' + domain : domain;
         serverAgent.createServer(serverKey, handlers, handleConnect);
       };
 
@@ -1085,9 +1086,8 @@ module.exports = function(socket, next, isWebPort) {
         return next(chunk);
       }
       domain = getDomain(domain);
-      var requestCert = (enable.clientCert || enable.requestCert) && !disable.clientCert && !disable.requestCert;
-      serverKey = requestCert ? ':' + domain : domain;
       var plugin, pluginName;
+      var requestCert = (enable.clientCert || enable.requestCert) && !disable.clientCert && !disable.requestCert;
       var servername = useSNI || domain;
       var curCert = remoteCerts.get(servername);
       if (!socket.isLocalUIUrl) {