@abtnode/router-provider 1.8.61 → 1.8.63-beta-c51e554d

package/lib/nginx/index.js

@@ -131,6 +131,10 @@ class NginxProvider extends BaseProvider {
     this.initialize();
   }
 
+  static isDidAuthPrefix(prefix) {
+    return prefix === ADMIN_DID_AUTH_PATH_PREFIX;
+  }
+
   getRelativeConfigDir(dir) {
     return path.relative(this.configDir, dir);
   }
@@ -202,7 +206,7 @@ class NginxProvider extends BaseProvider {
 
         // eslint-disable-next-line no-restricted-syntax
         for (const site of sites) {
-          const { domain, port, rules, corsAllowedOrigins } = site;
+          const { domain, port, rules, corsAllowedOrigins, blockletDid } = site;
           const certificate = findCertificate(certificates, domain);
 
           const parsedServerName = parseServerName(domain);
@@ -225,6 +229,7 @@ class NginxProvider extends BaseProvider {
               corsAllowedOrigins,
               daemonPort: nodeInfo.port,
               commonHeaders,
+              blockletDid,
             });
           } else {
             this._addHttpServer({
@@ -235,6 +240,7 @@ class NginxProvider extends BaseProvider {
               port,
               daemonPort: nodeInfo.port,
               commonHeaders,
+              blockletDid,
             });
           }
         }
@@ -449,23 +455,10 @@ class NginxProvider extends BaseProvider {
     server._add('location', concatPath(prefix, suffix));
 
     const location = this._getLastLocation(server);
-    const isDidAuthPath = prefix === ADMIN_DID_AUTH_PATH_PREFIX;
+    const isDidAuthPath = NginxProvider.isDidAuthPrefix(prefix);
 
     // Note: 下面这段代码比较 tricky，不要在这段代码之前添加任何 add_header, proxy_set_header, proxy_hide_header 的语句，否则 nginx 配置可能无法按预期工作
-    if (!isEmpty(corsAllowedOrigins)) {
-      if (corsAllowedOrigins.includes(DOMAIN_FOR_DEFAULT_SITE) || isDidAuthPath) {
-        location._add('include', 'includes/cors-loose');
-        location._add('include', 'includes/security');
-      } else {
-        location._add('add_header', `Access-Control-Allow-Origin $allow_origin_${md5(serverName)} always`);
-        location._add('include', 'includes/cors-strict');
-        location._add('include', 'includes/security');
-      }
-
-      location._addVerbatimBlock('if ($request_method = "OPTIONS")', 'return 204;');
-    } else {
-      location._add('include', 'includes/security');
-    }
+    this._addCors({ location, corsAllowedOrigins, serverName, isDidAuthPath });
 
     this._addCommonResHeaders(location, commonHeaders);
     this._addTailSlashRedirection(location, prefix); // Note: 末尾 "/" 的重定向要放在 CORS(OPTIONS) 响应之后, 这样不会影响 OPTIONS 的响应
@@ -522,11 +515,15 @@ class NginxProvider extends BaseProvider {
     location._add('proxy_pass', `http://${getUpstreamName(port)}`);
   }
 
-  _addRedirectTypeLocation({ server, url, redirectCode, prefix, suffix }) {
+  _addRedirectTypeLocation({ server, url, redirectCode, prefix, suffix, corsAllowedOrigins, serverName }) {
     const cleanUrl = trimEndSlash(url);
-
     server._add('location', `${concatPath(prefix, suffix)}`);
     const location = this._getLastLocation(server);
+
+    const isDidAuthPath = NginxProvider.isDidAuthPrefix(prefix);
+
+    this._addCors({ location, corsAllowedOrigins, serverName, isDidAuthPath });
+
     location._add('set $abt_query_string', '""');
     location._addVerbatimBlock('if ($query_string)', 'set $abt_query_string "?$query_string";');
 
@@ -551,10 +548,14 @@ class NginxProvider extends BaseProvider {
     location._add('try_files', '$uri /404.html break');
   }
 
-  _addGeneralProxyLocation({ server, port, prefix, suffix }) {
+  _addGeneralProxyLocation({ server, port, prefix, suffix, blockletDid }) {
     server._add('location', concatPath(prefix, suffix));
     const location = this._getLastLocation(server);
     this._addCommonHeader(location);
+    location._add('include', 'includes/proxy');
+    if (blockletDid) {
+      location._add('proxy_set_header', `X-Blocklet-Did ${blockletDid}`);
+    }
 
     location._add('proxy_pass', `http://${getUpstreamName(port)}`);
   }
@@ -724,14 +725,32 @@ class NginxProvider extends BaseProvider {
       : conf.nginx.stream.server;
   }
 
-  _addHttpServer({ locations = [], serverName, conf, corsAllowedOrigins, port, daemonPort, commonHeaders }) {
+  _addHttpServer({
+    locations = [],
+    serverName,
+    conf,
+    corsAllowedOrigins,
+    port,
+    daemonPort,
+    commonHeaders,
+    blockletDid,
+  }) {
     const httpServerUnit = this._addHttpServerUnit({ conf, serverName, port });
     this._addDefaultLocations(httpServerUnit, daemonPort);
     // eslint-disable-next-line max-len
-    locations.forEach((x) => this._addReverseProxy({ server: httpServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders })); // prettier-ignore
+    locations.forEach((x) => this._addReverseProxy({ server: httpServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders, blockletDid })); // prettier-ignore
   }
 
-  _addHttpsServer({ conf, locations, certificateFileName, serverName, corsAllowedOrigins, daemonPort, commonHeaders }) {
+  _addHttpsServer({
+    conf,
+    locations,
+    certificateFileName,
+    serverName,
+    corsAllowedOrigins,
+    daemonPort,
+    commonHeaders,
+    blockletDid,
+  }) {
     const httpsServerUnit = this._addHttpsServerUnit({ conf, serverName, certificateFileName });
 
     const httpServerUnit = this._addHttpServerUnit({ conf, serverName });
@@ -739,7 +758,7 @@ class NginxProvider extends BaseProvider {
 
     this._addDefaultLocations(httpsServerUnit, daemonPort);
     // eslint-disable-next-line max-len
-    locations.forEach((x) => this._addReverseProxy({ server: httpsServerUnit, ...x, serverName, corsAllowedOrigins,commonHeaders })); // prettier-ignore
+    locations.forEach((x) => this._addReverseProxy({ server: httpsServerUnit, ...x, serverName, corsAllowedOrigins, commonHeaders, blockletDid })); // prettier-ignore
   }
 
   _addHttpServerUnit({ conf, serverName, port }) {
@@ -832,6 +851,23 @@ class NginxProvider extends BaseProvider {
     });
   }
 
+  _addCors({ location, corsAllowedOrigins, serverName, isDidAuthPath }) {
+    if (!isEmpty(corsAllowedOrigins)) {
+      if (corsAllowedOrigins.includes(DOMAIN_FOR_DEFAULT_SITE) || isDidAuthPath) {
+        location._add('include', 'includes/cors-loose');
+        location._add('include', 'includes/security');
+      } else {
+        location._add('add_header', `Access-Control-Allow-Origin $allow_origin_${md5(serverName)} always`);
+        location._add('include', 'includes/cors-strict');
+        location._add('include', 'includes/security');
+      }
+
+      location._addVerbatimBlock('if ($request_method = "OPTIONS")', 'return 204;');
+    } else {
+      location._add('include', 'includes/security');
+    }
+  }
+
   addGlobalReqLimit(block, limit) {
     const key = limit.ipHeader ? `$http_${limit.ipHeader}` : '$binary_remote_addr';
     block._add('limit_req_zone', `${key} zone=ip_limit:20m rate=${limit.rate || 5}r/s`);

package/lib/util.js

@@ -60,6 +60,7 @@ const formatRoutingTable = (routingTable, onRule) => {
     if (!sites[domain]) {
       sites[domain] = {
         domain,
+        blockletDid: site.blockletDid,
         rules: [],
         port: site.port,
         corsAllowedOrigins: site.corsAllowedOrigins,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.8.61",
+  "version": "1.8.63-beta-c51e554d",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,10 +32,10 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.8.61",
-    "@abtnode/logger": "1.8.61",
-    "@abtnode/router-templates": "1.8.61",
-    "@abtnode/util": "1.8.61",
+    "@abtnode/constant": "1.8.63-beta-c51e554d",
+    "@abtnode/logger": "1.8.63-beta-c51e554d",
+    "@abtnode/router-templates": "1.8.63-beta-c51e554d",
+    "@abtnode/util": "1.8.63-beta-c51e554d",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
     "find-process": "^1.4.7",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.1.0",
     "needle": "^3.1.0"
   },
-  "gitHead": "f68ac14c2074400d392e2171d328f12dbd2e64cb"
+  "gitHead": "9913ed7968dfab63d6549201a5a98f9819fcfac6"
 }