@abtnode/router-provider 1.4.12 → 1.5.1

package/lib/nginx/index.js

@@ -16,6 +16,7 @@ const {
   ROUTING_RULE_TYPES,
   CONFIG_FOLDER_NAME,
   DEFAULT_ADMIN_PATH,
+  SLOT_FOR_IP_DNS_SITE,
 } = require('@abtnode/constant');
 const md5 = require('@abtnode/util/lib/md5');
 
@@ -48,6 +49,23 @@ const REQUIRED_MODULES = [{ configName: 'with-stream', moduleBinaryName: 'ngx_st
 // TODO: move the did-auth-path-prefix to a constant
 const DID_AUTH_PATH_PREFIX = `${DEFAULT_ADMIN_PATH}/api/did`;
 
+// convert wildcard domain and ipDnsDomain template to regex
+const parseServerName = (serverName) => {
+  // ipDnsDomain template
+  if (serverName.includes(SLOT_FOR_IP_DNS_SITE)) {
+    const name = serverName.replace(/\./g, '\\.').replace(SLOT_FOR_IP_DNS_SITE, '\\d+-\\d+-\\d+-\\d+');
+    return `~^${name}$`;
+  }
+
+  // wildcard domain
+  if (serverName.startsWith('*.')) {
+    const name = serverName.replace('*', '').replace(/\./g, '\\.');
+    return `~.+${name}$`;
+  }
+
+  return serverName;
+};
+
 class NginxProvider extends BaseProvider {
   /**
    * @param {string} configDirectory
@@ -204,6 +222,7 @@ class NginxProvider extends BaseProvider {
           const certificate = findCertificate(certificates, serverName);
           const isHttps = !!certificate;
 
+          const parsedServerName = parseServerName(serverName);
           const sortedLocations = this._sortLocations(locations);
           if (isHttps) {
             // HTTPS configurations
@@ -220,7 +239,7 @@ class NginxProvider extends BaseProvider {
               conf,
               locations: sortedLocations,
               certificateFileName: certificate.domain,
-              serverName,
+              serverName: parsedServerName,
               corsAllowedOrigins,
               daemonPort: nodeInfo.port,
             });
@@ -228,7 +247,7 @@ class NginxProvider extends BaseProvider {
             this._addHttpServer({
               conf,
               locations: sortedLocations,
-              serverName,
+              serverName: parsedServerName,
               corsAllowedOrigins,
               port,
               daemonPort: nodeInfo.port,
@@ -540,7 +559,9 @@ class NginxProvider extends BaseProvider {
 
   _addCommonHeader(location) {
     location._add('set', '$abt_proto $scheme');
-    location._add('set', '$abt_host $host');
+    // use $http_host to keep port when redirecting
+    // https://stackoverflow.com/questions/43397365/nginx-keep-port-number-when-301-redirecting
+    location._add('set', '$abt_host $http_host');
     location._add('set', '$abt_query_string ""');
     location._addVerbatimBlock('if ($http_x_forwarded_proto)', 'set $abt_proto $http_x_forwarded_proto;');
     location._addVerbatimBlock('if ($http_x_forwarded_host)', 'set $abt_host $http_x_forwarded_host;');
@@ -758,16 +779,17 @@ class NginxProvider extends BaseProvider {
     siteCorsConfigs.forEach((corsConfig) => {
       if (Array.isArray(corsConfig.corsAllowedOrigins) && corsConfig.corsAllowedOrigins.length > 0) {
         const allowedOrigins = corsConfig.corsAllowedOrigins.map((x) => {
-          if (x.startsWith('~')) {
-            return `${x} $http_origin;`;
+          const y = parseServerName(x);
+          if (y.startsWith('~')) {
+            return `${y} $http_origin;`;
           }
 
-          return `~${x} $http_origin;`;
+          return `~${y} $http_origin;`;
         });
 
         allowedOrigins.push('default "";');
         conf.nginx.http._addVerbatimBlock(
-          `map $http_origin $allow_origin_${md5(corsConfig.serverName)}`,
+          `map $http_origin $allow_origin_${md5(parseServerName(corsConfig.serverName))}`,
           allowedOrigins.join(' ')
         );
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.4.12",
+  "version": "1.5.1",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/abt-node#readme",
@@ -32,9 +32,9 @@
     "url": "https://github.com/ArcBlock/abt-node/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.4.12",
-    "@abtnode/logger": "1.4.12",
-    "@abtnode/util": "1.4.12",
+    "@abtnode/constant": "1.5.1",
+    "@abtnode/logger": "1.5.1",
+    "@abtnode/util": "1.5.1",
     "axios": "^0.21.4",
     "debug": "^4.3.2",
     "find-process": "^1.4.3",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "fs-extra": "^10.0.0"
   },
-  "gitHead": "677dcef3be9130feeca3334d475202a5e11a7323"
+  "gitHead": "8219f2128aaa199a52c100e6c90ea4a90d15ad15"
 }