@abtnode/router-provider 1.16.13 → 1.16.14-beta-0c29907f

package/lib/default/daemon.js

@@ -175,6 +175,7 @@ const corsHandler = (host, req, res) => {
     if (allowedOrigins.includes('*')) {
       res.writeHead(204, {
         Vary: 'Origin',
+        // TODO: @zhanghan 需要优先读取应用代码透传的 header
         'Access-Control-Allow-Origin': '*',
         'Access-Control-Allow-Credentials': false,
         'Access-Control-Allow-Methods': 'POST, GET, HEAD, PUT, DELETE, OPTIONS',
@@ -189,6 +190,7 @@ const corsHandler = (host, req, res) => {
     if (allowedOrigins.some((x) => checkDomainMatch(x, currentOrigin))) {
       res.writeHead(204, {
         Vary: 'Origin',
+        // TODO: @zhanghan 需要优先读取应用代码透传的 header
         'Access-Control-Allow-Origin': currentOrigin,
         'Access-Control-Allow-Credentials': false,
         'Access-Control-Allow-Methods': 'POST, GET, HEAD, PUT, DELETE, OPTIONS',

package/lib/nginx/includes/cors-loose

@@ -1,6 +1,8 @@
-add_header Access-Control-Allow-Credentials false always;
+# TODO: 需要优先读取应用代码透传的 header
+# add_header Access-Control-Allow-Credentials false always;
 add_header Vary Origin always;
 add_header Access-Control-Allow-Methods "POST, GET, HEAD, PUT, DELETE, OPTIONS" always;
 add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,$http_access_control_request_headers";
-add_header Access-Control-Allow-Origin * always;
+# TODO: 需要优先读取应用代码透传的 header
+# add_header Access-Control-Allow-Origin * always;
 add_header Access-Control-Max-Age 1800;

package/lib/nginx/includes/cors-strict

@@ -1,4 +1,5 @@
-add_header Access-Control-Allow-Credentials false always;
+# TODO: 需要优先读取应用代码透传的 header
+# add_header Access-Control-Allow-Credentials false always;
 add_header Vary Origin always;
 add_header Access-Control-Allow-Methods "POST, GET, HEAD, PUT, DELETE, OPTIONS"  always;
 add_header Access-Control-Allow-Headers "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,$http_access_control_request_headers";

package/lib/nginx/includes/proxy

@@ -1,8 +1,9 @@
-proxy_hide_header Access-Control-Allow-Credentials;
-proxy_hide_header Vary;
-proxy_hide_header Access-Control-Allow-Origin;
-proxy_hide_header Access-Control-Allow-Methods;
-proxy_hide_header X-Powered-By;
+# TODO: 需要优先读取应用代码透传的 header
+# proxy_hide_header Access-Control-Allow-Credentials;
+# proxy_hide_header Vary;
+# proxy_hide_header Access-Control-Allow-Origin;
+# proxy_hide_header Access-Control-Allow-Methods;
+# proxy_hide_header X-Powered-By;
 
 proxy_set_header Host $host;
 proxy_set_header X-Real-IP $remote_addr;

package/lib/nginx/index.js

@@ -9,13 +9,11 @@ const kill = require('fkill');
 const getPort = require('get-port');
 const uniqBy = require('lodash/uniqBy');
 const isEmpty = require('lodash/isEmpty');
-const cloneDeep = require('lodash/cloneDeep');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
 const {
   DOMAIN_FOR_DEFAULT_SITE,
   ROUTING_RULE_TYPES,
   CONFIG_FOLDER_NAME,
-  DEFAULT_ADMIN_PATH,
   SLOT_FOR_IP_DNS_SITE,
   WELLKNOWN_SERVICE_PATH_PREFIX,
   USER_AVATAR_PATH_PREFIX,
@@ -57,9 +55,6 @@ const {
 
 const REQUIRED_MODULES = [{ configName: 'with-stream', moduleBinaryName: 'ngx_stream_module.so' }];
 
-// TODO: move the did-auth-path-prefix to a constant
-const ADMIN_DID_AUTH_PATH_PREFIX = `${DEFAULT_ADMIN_PATH}/api/did`;
-
 // convert wildcard domain and ipDnsDomain template to regex
 const parseServerName = (domain) => {
   // ipDnsDomain template
@@ -136,10 +131,6 @@ class NginxProvider extends BaseProvider {
     this.initialize();
   }
 
-  static isDidAuthPrefix(prefix) {
-    return prefix === ADMIN_DID_AUTH_PATH_PREFIX;
-  }
-
   getRelativeConfigDir(dir) {
     return path.relative(this.configDir, dir);
   }
@@ -190,14 +181,7 @@ class NginxProvider extends BaseProvider {
         conf.on('flushed', () => resolve());
         conf.live(this.configPath);
 
-        const { sites, configs: siteCorsConfigs } = formatRoutingTable(routingTable, (rules, rule) => {
-          // TODO: this is really hacky, and should be abstracted out
-          if (rule.type === ROUTING_RULE_TYPES.DAEMON && rule.prefix === DEFAULT_ADMIN_PATH) {
-            const clonedRule = cloneDeep(rule);
-            clonedRule.prefix = ADMIN_DID_AUTH_PATH_PREFIX;
-            rules.push(clonedRule);
-          }
-        });
+        const { sites, configs: siteCorsConfigs } = formatRoutingTable(routingTable);
 
         this._addCorsMap(conf, siteCorsConfigs);
         conf.nginx.http._add('server_tokens', 'off');
@@ -475,10 +459,9 @@ class NginxProvider extends BaseProvider {
     server._add('location', concatPath(prefix, suffix));
 
     const location = this._getLastLocation(server);
-    const isDidAuthPath = NginxProvider.isDidAuthPrefix(prefix);
 
     // Note: 下面这段代码比较 tricky，不要在这段代码之前添加任何 add_header, proxy_set_header, proxy_hide_header 的语句，否则 nginx 配置可能无法按预期工作
-    this._addCors({ location, corsAllowedOrigins, serverName, isDidAuthPath });
+    this._addCors({ location, corsAllowedOrigins, serverName });
 
     this._addCommonResHeaders(location, commonHeaders);
     if (!cacheGroup && !suffix) {
@@ -539,10 +522,9 @@ class NginxProvider extends BaseProvider {
     }
 
     // Redirect daemon traffic
-    const rewritePathPrefix = isDidAuthPath ? DEFAULT_ADMIN_PATH : prefix;
-    location._add('proxy_set_header', `X-Path-Prefix "${rewritePathPrefix}"`);
+    location._add('proxy_set_header', `X-Path-Prefix "${prefix}"`);
     if (!suffix && prefix !== target) {
-      location._add('rewrite', `^${rewritePathPrefix}/?(.*) ${`${target}/`.replace(/\/\//g, '/')}$1  break`);
+      location._add('rewrite', `^${prefix}/?(.*) ${`${target}/`.replace(/\/\//g, '/')}$1  break`);
     }
 
     location._add('proxy_pass', `http://${getUpstreamName(port)}`);
@@ -553,9 +535,7 @@ class NginxProvider extends BaseProvider {
     server._add('location', `${concatPath(prefix, suffix)}`);
     const location = this._getLastLocation(server);
 
-    const isDidAuthPath = NginxProvider.isDidAuthPrefix(prefix);
-
-    this._addCors({ location, corsAllowedOrigins, serverName, isDidAuthPath });
+    this._addCors({ location, corsAllowedOrigins, serverName });
 
     location._add('set $abt_query_string', '""');
     location._addVerbatimBlock('if ($query_string)', 'set $abt_query_string "?$query_string";');
@@ -897,18 +877,20 @@ class NginxProvider extends BaseProvider {
     });
   }
 
-  _addCors({ location, corsAllowedOrigins, serverName, isDidAuthPath }) {
+  _addCors({ location, corsAllowedOrigins, serverName }) {
     if (!isEmpty(corsAllowedOrigins)) {
-      if (corsAllowedOrigins.includes(DOMAIN_FOR_DEFAULT_SITE) || isDidAuthPath) {
+      if (corsAllowedOrigins.includes(DOMAIN_FOR_DEFAULT_SITE)) {
         location._add('include', 'includes/cors-loose');
         location._add('include', 'includes/security');
       } else {
+        // TODO: @zhanghan 此处是否需要变更默认的值，如果在逻辑代码中有指定的 Access-Control-Allow-Origin，则应该优先遵守逻辑代码中的配置
         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;');
+      // TODO: @zhanghan 统一登录需要自行处理 options 请求的逻辑
+      // location._addVerbatimBlock('if ($request_method = "OPTIONS")', 'return 204;');
     } else {
       location._add('include', 'includes/security');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.13",
+  "version": "1.16.14-beta-0c29907f",
   "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.16.13",
-    "@abtnode/logger": "1.16.13",
-    "@abtnode/router-templates": "1.16.13",
-    "@abtnode/util": "1.16.13",
+    "@abtnode/constant": "1.16.14-beta-0c29907f",
+    "@abtnode/logger": "1.16.14-beta-0c29907f",
+    "@abtnode/router-templates": "1.16.14-beta-0c29907f",
+    "@abtnode/util": "1.16.14-beta-0c29907f",
     "@arcblock/http-proxy": "^1.19.1",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
@@ -59,5 +59,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^10.1.0"
   },
-  "gitHead": "0f07f6617a8cf53a4fa693d6ca227f6f6bd90af2"
+  "gitHead": "1f02851a71861dbf09bfedfa9df6d9fc6d2355a3"
 }