feat: 升级 OpenResty 到 1.21.4.3-2-2-focal (#1360)

apps/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/global.json

@@ -1,6 +1,6 @@
 {
   "waf": {
-    "state": "on",
+    "state": "off",
     "mode": "protection",
     "secret": ""
   },
@@ -109,7 +109,7 @@
     "rule": "cc",
     "tokenTimeOut": 1800,
     "threshold": 100,
-    "duration": 10,
+    "duration": 20,
     "action": "deny",
     "ipBlock": "on",
     "ipBlockTime": 600
@@ -165,5 +165,8 @@
     "state": "on",
     "code": 403,
     "action": "deny"
+  },
+  "cdn": {
+    "state": "off"
   }
 }

apps/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/siteConfig.json

@@ -90,5 +90,8 @@
     "state": "on",
     "code": 444,
     "action": "deny"
+  },
+  "cdn": {
+    "state": "off"
   }
 }

apps/openresty/1.21.4.3-2-2-focal/1pwaf/data/default/global.json

@@ -70,13 +70,6 @@
     "ipBlock": "on",
     "ipBlockTime": 600
   },
-  "unknownWebsite": {
-    "state": "on",
-    "type": "unknownWebsite",
-    "action": "deny",
-    "code": 403,
-    "res": "unknown"
-  },
   "geoRestrict": {
     "state": "off",
     "rules": [],
@@ -104,7 +97,7 @@
     "action": "deny"
   },
   "cc": {
-    "state": "on",
+    "state": "off",
     "type": "cc",
     "rule": "cc",
     "tokenTimeOut": 1800,

apps/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/cdn.json

@@ -0,0 +1,47 @@
+{
+  "rules": [
+    {
+      "rule": "x-forwarded-for"
+    },
+    {
+      "rule": "x-real-ip"
+    },
+    {
+      "rule": "x-forwarded"
+    },
+    {
+      "rule": "forwarded-for"
+    },
+    {
+      "rule": "forwarded"
+    },
+    {
+      "rule": "true-client-ip"
+    },
+    {
+      "rule": "client-ip"
+    },
+    {
+      "rule": "ali-cdn-real-ip"
+    },
+    {
+      "rule": "cdn-src-ip"
+    },
+    {
+      "rule": "cdn-real-ip"
+    },
+    {
+      "rule": "cf-connecting-ip"
+    },
+    {
+      "rule": "x-cluster-client-ip"
+    },
+    {
+      "rule": "wl-proxy-client-ip"
+    },
+    {
+      "rule": "proxy-client-ip"
+    }
+  ]
+}
+

apps/openresty/1.21.4.3-2-2-focal/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   openresty:
-    image: 1panel/openresty:1.21.4.3-2-1-focal
+    image: 1panel/openresty:1.21.4.3-2-2-focal
     container_name: ${CONTAINER_NAME}
     restart: always
     network_mode: host