@abtnode/router-provider 1.16.34-beta-20241205-145120-3a7aa096 → 1.16.34-beta-20241207-004652-f10ad343

package/lib/nginx/includes/{proxy → proxy.raw}

@@ -1,22 +1,3 @@
-# DOC: http://nginx.org/en/docs/http/ngx_http_proxy_module.html
-
-# 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_set_header Host $host;
-proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header X-Real-Uri $uri;
-proxy_set_header X-Request-ID $request_id;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Proto $scheme;
-proxy_set_header X-Forwarded-Host  $host;
-proxy_set_header X-Forwarded-Port  $server_port;
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header Connection $connection_upgrade;
-
 proxy_connect_timeout 60;
 proxy_read_timeout 3600;
 proxy_send_timeout 3600;
@@ -30,3 +11,13 @@ proxy_redirect off;
 proxy_http_version 1.1;
 
 proxy_ignore_client_abort off;
+
+proxy_set_header Host $host;
+proxy_set_header X-Real-IP $remote_addr;
+proxy_set_header X-Real-Uri $uri;
+proxy_set_header X-Request-ID $request_id;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $connection_upgrade;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Forwarded-Host  $host;
+proxy_set_header X-Forwarded-Port  $server_port;

package/lib/nginx/index.js

@@ -201,6 +201,7 @@ class NginxProvider extends BaseProvider {
         if (blockPolicy && blockPolicy?.enabled) {
           this.updateBlacklist(blockPolicy.blacklist);
         }
+        this.updateProxyPolicy(proxyPolicy);
 
         const allRules = sites.reduce((acc, site) => {
           acc.push(...(site.rules || []));
@@ -908,6 +909,22 @@ class NginxProvider extends BaseProvider {
     fs.writeFileSync(blacklistFile, blacklist.map((x) => `${x} 1;`).join(os.EOL));
   }
 
+  updateProxyPolicy(proxyPolicy) {
+    const proxyRaw = fs.readFileSync(path.join(this.includesDir, 'proxy.raw'), 'utf8');
+    const proxyPolicyFile = path.join(this.includesDir, 'proxy');
+    if (proxyPolicy?.enabled) {
+      fs.writeFileSync(
+        proxyPolicyFile,
+        [proxyRaw, 'proxy_set_header X-Forwarded-For "$http_x_forwarded_for,$realip_remote_addr";'].join(os.EOL)
+      );
+    } else {
+      fs.writeFileSync(
+        proxyPolicyFile,
+        [proxyRaw, 'proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;'].join(os.EOL)
+      );
+    }
+  }
+
   getLogFilesForToday() {
     return {
       access: this.accessLog,

package/lib/nginx/util.js

@@ -226,7 +226,7 @@ real_ip_recursive ${proxyPolicy?.trustRecursive ? 'on' : 'off'};`
 
     log_format compression '$remote_addr - $remote_user [$time_iso8601] $request_id '
                           '"$host" "$request" $status $body_bytes_sent '
-                          '"$http_referer" "$http_user_agent" "$http_x_forwarded_for" '
+                          '"$http_referer" "$http_user_agent" "${proxyPolicy?.enabled ? '$realip_remote_addr' : '$http_x_forwarded_for'}" '
                           'rt="$request_time" uid="$cookie_connected_did" uos="$cookie_connected_wallet_os" '
                           'uct="$upstream_connect_time" uht="$upstream_header_time" urt="$upstream_response_time"';
     access_log ${path.join(logDir, 'access.log')} compression;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.16.34-beta-20241205-145120-3a7aa096",
+  "version": "1.16.34-beta-20241207-004652-f10ad343",
   "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.34-beta-20241205-145120-3a7aa096",
-    "@abtnode/logger": "1.16.34-beta-20241205-145120-3a7aa096",
-    "@abtnode/router-templates": "1.16.34-beta-20241205-145120-3a7aa096",
-    "@abtnode/util": "1.16.34-beta-20241205-145120-3a7aa096",
+    "@abtnode/constant": "1.16.34-beta-20241207-004652-f10ad343",
+    "@abtnode/logger": "1.16.34-beta-20241207-004652-f10ad343",
+    "@abtnode/router-templates": "1.16.34-beta-20241207-004652-f10ad343",
+    "@abtnode/util": "1.16.34-beta-20241207-004652-f10ad343",
     "@arcblock/http-proxy": "^1.19.1",
     "@arcblock/is-valid-domain": "^1.0.5",
     "axios": "^1.7.5",
@@ -59,5 +59,5 @@
     "bluebird": "^3.7.2",
     "fs-extra": "^11.2.0"
   },
-  "gitHead": "1162a42e8d2c5ed0330a51724685b2d554c50160"
+  "gitHead": "164559152125585db2b26864ecb627bd81b56a77"
 }