feat: 升级 Openresty 版本到 1.21.4.3-3-3 (#1639)

2024-11-25 09:38:47 +08:00 · 2024-06-25 10:08:35 +08:00 · 2024-06-25 10:08:35 +08:00 · 8c7b636950
commit 8c7b636950
parent 920511525b
54 changed files with 27 additions and 10 deletions
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.aes_key
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.aes_key
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.secret
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.secret
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/global.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/global.json
@ -108,11 +108,12 @@
    "type": "cc",
    "rule": "cc",
    "tokenTimeOut": 1800,
-    "threshold": 200,
+    "threshold": 100,
    "duration": 10,
    "action": "deny",
    "ipBlock": "on",
-    "ipBlockTime": 600
+    "ipBlockTime": 600,
+    "mode": "uri"
  },
  "ccurl": {
    "state": "off",
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/monitor.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/monitor.json
@ -20,7 +20,9 @@
    "status": [],
    "uri": [
      "/favicon.ico"
-    ]
+    ],
+    "ua": [],
+    "ip": []
  },
  "log": {
    "maxDay": 180
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/siteConfig.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/siteConfig.json
@ -58,7 +58,8 @@
    "duration": 10,
    "action": "deny",
    "ipBlock": "on",
-    "ipBlockTime": 600
+    "ipBlockTime": 600,
+    "mode": "uri"
  },
  "ccurl": {
    "state": "on",
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/sites.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/sites.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/token
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/token
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.conf
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.conf
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/cc.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/cc.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/forbidden.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/forbidden.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/geo.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/geo.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/global.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/global.json
@ -1,6 +1,6 @@
 {
  "waf": {
-    "state": "on",
+    "state": "off",
    "mode": "protection",
    "secret": ""
  },
@ -70,6 +70,13 @@
    "ipBlock": "on",
    "ipBlockTime": 600
  },
+  "unknownWebsite": {
+    "state": "on",
+    "type": "unknownWebsite",
+    "action": "deny",
+    "code": 403,
+    "res": "unknown"
+  },
  "geoRestrict": {
    "state": "off",
    "rules": [],
@ -97,7 +104,7 @@
    "action": "deny"
  },
  "cc": {
-    "state": "off",
+    "state": "on",
    "type": "cc",
    "rule": "cc",
    "tokenTimeOut": 1800,
@ -105,7 +112,8 @@
    "duration": 10,
    "action": "deny",
    "ipBlock": "on",
-    "ipBlockTime": 600
+    "ipBlockTime": 600,
+    "mode": "uri"
  },
  "ccurl": {
    "state": "off",
@ -124,7 +132,7 @@
    "ipBlockTime": 3000
  },
  "fileExt": {
-    "state": "on",
+    "state": "off",
    "action": "deny",
    "code": 403,
    "type": "fileExtCheck"
@ -158,5 +166,8 @@
    "state": "on",
    "code": 403,
    "action": "deny"
+  },
+  "cdn": {
+    "state": "off"
  }
 }
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/ip.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/ip.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/monitor.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/monitor.json
@ -1,5 +1,5 @@
 {
-  "state": "on",
+  "state": "off",
  "exclude": {
    "extensions": [
      "png",
@ -20,7 +20,9 @@
    "status": [],
    "uri": [
      "/favicon.ico"
-    ]
+    ],
+    "ua": [],
+    "ip": []
  },
  "log": {
    "maxDay": 180
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/unknown.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/unknown.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.js
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.js
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/cc.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/cc.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/forbidden.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/forbidden.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/geo.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/geo.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/ip.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/ip.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/redirect.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/redirect.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.js
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.js
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/unknown.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/unknown.html
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/acl.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/acl.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/args.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/args.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cdn.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cdn.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cookie.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cookie.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUaBlack.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUaBlack.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUrlBlack.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUrlBlack.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/fileExt.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/fileExt.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/header.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/header.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipBlack.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipBlack.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipWhite.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipWhite.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/methodWhite.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/methodWhite.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/post.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/post.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaBlack.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaBlack.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaWhite.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaWhite.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlBlack.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlBlack.json
--- a/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlWhite.json
+++ b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlWhite.json
--- a/apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf
+++ b/apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf
--- a/apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/default.conf
+++ b/apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/default.conf
--- a/apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi-php.conf
+++ b/apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi-php.conf
--- a/apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi_params
+++ b/apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi_params
--- a/apps/openresty/1.21.4.3-3-3-focal/conf/mime.types
+++ b/apps/openresty/1.21.4.3-3-3-focal/conf/mime.types
--- a/apps/openresty/1.21.4.3-3-3-focal/conf/nginx.conf
+++ b/apps/openresty/1.21.4.3-3-3-focal/conf/nginx.conf
--- a/apps/openresty/1.21.4.3-3-3-focal/data.yml
+++ b/apps/openresty/1.21.4.3-3-3-focal/data.yml
--- a/apps/openresty/1.21.4.3-3-3-focal/docker-compose.yml
+++ b/apps/openresty/1.21.4.3-3-3-focal/docker-compose.yml
--- a/apps/openresty/1.21.4.3-3-3-focal/root/404.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/root/404.html
--- a/apps/openresty/1.21.4.3-3-3-focal/root/index.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/root/index.html
--- a/apps/openresty/1.21.4.3-3-3-focal/root/stop/index.html
+++ b/apps/openresty/1.21.4.3-3-3-focal/root/stop/index.html
--- a/apps/openresty/1.21.4.3-3-3-focal/scripts/init.sh
+++ b/apps/openresty/1.21.4.3-3-3-focal/scripts/init.sh