@abtnode/router-provider 1.16.14-beta-a898bfcb → 1.16.14-beta-d802cd3c

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

@@ -883,12 +883,14 @@ class NginxProvider extends BaseProvider {
         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.14-beta-a898bfcb",
+  "version": "1.16.14-beta-d802cd3c",
   "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.14-beta-a898bfcb",
-    "@abtnode/logger": "1.16.14-beta-a898bfcb",
-    "@abtnode/router-templates": "1.16.14-beta-a898bfcb",
-    "@abtnode/util": "1.16.14-beta-a898bfcb",
+    "@abtnode/constant": "1.16.14-beta-d802cd3c",
+    "@abtnode/logger": "1.16.14-beta-d802cd3c",
+    "@abtnode/router-templates": "1.16.14-beta-d802cd3c",
+    "@abtnode/util": "1.16.14-beta-d802cd3c",
     "@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": "1e6f2ec5199ca28e106a6b02114f2a3f355b3ceb"
+  "gitHead": "f8e2dcefd8d6876e5dedee833ac976b4a0496b20"
 }