From 8c7b636950da60a795f10e40d1248a81859e4e61 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Tue, 25 Jun 2024 10:08:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=20Openresty=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=B0=201.21.4.3-3-3=20(#1639)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1pwaf/data/conf/.aes_key | 0 .../1pwaf/data/conf/.secret | 0 .../1pwaf/data/conf/global.json | 5 +++-- .../1pwaf/data/conf/monitor.json | 4 +++- .../1pwaf/data/conf/siteConfig.json | 3 ++- .../1pwaf/data/conf/sites.json | 0 .../1pwaf/data/conf/token | 0 .../1pwaf/data/conf/waf.conf | 0 .../1pwaf/data/conf/waf.json | 0 .../1pwaf/data/default/cc.html | 0 .../1pwaf/data/default/forbidden.html | 0 .../1pwaf/data/default/geo.html | 0 .../1pwaf/data/default/global.json | 19 +++++++++++++++---- .../1pwaf/data/default/ip.html | 0 .../1pwaf/data/default/monitor.json | 6 ++++-- .../1pwaf/data/default/unknown.html | 0 .../1pwaf/data/html/5s.html | 0 .../1pwaf/data/html/5s.js | 0 .../1pwaf/data/html/cc.html | 0 .../1pwaf/data/html/forbidden.html | 0 .../1pwaf/data/html/geo.html | 0 .../1pwaf/data/html/ip.html | 0 .../1pwaf/data/html/redirect.html | 0 .../1pwaf/data/html/slide.html | 0 .../1pwaf/data/html/slide.js | 0 .../1pwaf/data/html/unknown.html | 0 .../1pwaf/data/rules/acl.json | 0 .../1pwaf/data/rules/args.json | 0 .../1pwaf/data/rules/cdn.json | 0 .../1pwaf/data/rules/cookie.json | 0 .../1pwaf/data/rules/defaultUaBlack.json | 0 .../1pwaf/data/rules/defaultUrlBlack.json | 0 .../1pwaf/data/rules/fileExt.json | 0 .../1pwaf/data/rules/header.json | 0 .../1pwaf/data/rules/ipBlack.json | 0 .../1pwaf/data/rules/ipWhite.json | 0 .../1pwaf/data/rules/methodWhite.json | 0 .../1pwaf/data/rules/post.json | 0 .../1pwaf/data/rules/uaBlack.json | 0 .../1pwaf/data/rules/uaWhite.json | 0 .../1pwaf/data/rules/urlBlack.json | 0 .../1pwaf/data/rules/urlWhite.json | 0 .../conf/conf.d/00.default.conf | 0 .../conf/conf.d/default.conf | 0 .../conf/fastcgi-php.conf | 0 .../conf/fastcgi_params | 0 .../conf/mime.types | 0 .../conf/nginx.conf | 0 .../data.yml | 0 .../docker-compose.yml | 0 .../root/404.html | 0 .../root/index.html | 0 .../root/stop/index.html | 0 .../scripts/init.sh | 0 54 files changed, 27 insertions(+), 10 deletions(-) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/.aes_key (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/.secret (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/global.json (97%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/monitor.json (90%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/siteConfig.json (97%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/sites.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/token (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/waf.conf (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/conf/waf.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/default/cc.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/default/forbidden.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/default/geo.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/default/global.json (92%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/default/ip.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/default/monitor.json (86%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/default/unknown.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/5s.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/5s.js (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/cc.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/forbidden.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/geo.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/ip.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/redirect.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/slide.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/slide.js (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/html/unknown.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/acl.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/args.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/cdn.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/cookie.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/defaultUaBlack.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/defaultUrlBlack.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/fileExt.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/header.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/ipBlack.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/ipWhite.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/methodWhite.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/post.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/uaBlack.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/uaWhite.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/urlBlack.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/1pwaf/data/rules/urlWhite.json (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/conf/conf.d/00.default.conf (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/conf/conf.d/default.conf (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/conf/fastcgi-php.conf (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/conf/fastcgi_params (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/conf/mime.types (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/conf/nginx.conf (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/data.yml (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/docker-compose.yml (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/root/404.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/root/index.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/root/stop/index.html (100%) rename apps/openresty/{1.21.4.3-3-2-focal => 1.21.4.3-3-3-focal}/scripts/init.sh (100%) diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/.aes_key b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.aes_key similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/.aes_key rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.aes_key diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/.secret b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.secret similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/.secret rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/.secret diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/global.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/global.json similarity index 97% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/global.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/global.json index 9ccafd44..c473226d 100644 --- a/apps/openresty/1.21.4.3-3-2-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", diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/monitor.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/monitor.json similarity index 90% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/monitor.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/monitor.json index 1e231a7d..6bd11920 100644 --- a/apps/openresty/1.21.4.3-3-2-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 diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/siteConfig.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/siteConfig.json similarity index 97% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/siteConfig.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/siteConfig.json index 7b61ba2b..a489ce00 100644 --- a/apps/openresty/1.21.4.3-3-2-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", diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/sites.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/sites.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/sites.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/sites.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/token b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/token similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/token rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/token diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/waf.conf b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.conf similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/waf.conf rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.conf diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/waf.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/conf/waf.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/conf/waf.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/cc.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/cc.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/cc.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/cc.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/forbidden.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/forbidden.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/forbidden.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/forbidden.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/geo.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/geo.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/geo.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/geo.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/global.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/global.json similarity index 92% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/global.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/global.json index b065e640..c473226d 100644 --- a/apps/openresty/1.21.4.3-3-2-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" } } diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/ip.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/ip.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/ip.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/ip.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/monitor.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/monitor.json similarity index 86% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/monitor.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/monitor.json index 0fb0fbe9..6bd11920 100644 --- a/apps/openresty/1.21.4.3-3-2-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 diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/unknown.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/unknown.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/default/unknown.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/default/unknown.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/5s.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/5s.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/5s.js b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.js similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/5s.js rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/5s.js diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/cc.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/cc.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/cc.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/cc.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/forbidden.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/forbidden.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/forbidden.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/forbidden.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/geo.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/geo.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/geo.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/geo.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/ip.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/ip.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/ip.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/ip.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/redirect.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/redirect.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/redirect.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/redirect.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/slide.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/slide.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/slide.js b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.js similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/slide.js rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/slide.js diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/unknown.html b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/unknown.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/html/unknown.html rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/html/unknown.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/acl.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/acl.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/acl.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/acl.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/args.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/args.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/args.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/args.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/cdn.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cdn.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/cdn.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cdn.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/cookie.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cookie.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/cookie.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/cookie.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/defaultUaBlack.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUaBlack.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/defaultUaBlack.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUaBlack.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/defaultUrlBlack.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUrlBlack.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/defaultUrlBlack.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/defaultUrlBlack.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/fileExt.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/fileExt.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/fileExt.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/fileExt.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/header.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/header.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/header.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/header.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/ipBlack.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipBlack.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/ipBlack.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipBlack.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/ipWhite.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipWhite.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/ipWhite.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/ipWhite.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/methodWhite.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/methodWhite.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/methodWhite.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/methodWhite.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/post.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/post.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/post.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/post.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/uaBlack.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaBlack.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/uaBlack.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaBlack.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/uaWhite.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaWhite.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/uaWhite.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/uaWhite.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/urlBlack.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlBlack.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/urlBlack.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlBlack.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/urlWhite.json b/apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlWhite.json similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/1pwaf/data/rules/urlWhite.json rename to apps/openresty/1.21.4.3-3-3-focal/1pwaf/data/rules/urlWhite.json diff --git a/apps/openresty/1.21.4.3-3-2-focal/conf/conf.d/00.default.conf b/apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/conf/conf.d/00.default.conf rename to apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/00.default.conf diff --git a/apps/openresty/1.21.4.3-3-2-focal/conf/conf.d/default.conf b/apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/default.conf similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/conf/conf.d/default.conf rename to apps/openresty/1.21.4.3-3-3-focal/conf/conf.d/default.conf diff --git a/apps/openresty/1.21.4.3-3-2-focal/conf/fastcgi-php.conf b/apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi-php.conf similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/conf/fastcgi-php.conf rename to apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi-php.conf diff --git a/apps/openresty/1.21.4.3-3-2-focal/conf/fastcgi_params b/apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi_params similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/conf/fastcgi_params rename to apps/openresty/1.21.4.3-3-3-focal/conf/fastcgi_params diff --git a/apps/openresty/1.21.4.3-3-2-focal/conf/mime.types b/apps/openresty/1.21.4.3-3-3-focal/conf/mime.types similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/conf/mime.types rename to apps/openresty/1.21.4.3-3-3-focal/conf/mime.types diff --git a/apps/openresty/1.21.4.3-3-2-focal/conf/nginx.conf b/apps/openresty/1.21.4.3-3-3-focal/conf/nginx.conf similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/conf/nginx.conf rename to apps/openresty/1.21.4.3-3-3-focal/conf/nginx.conf diff --git a/apps/openresty/1.21.4.3-3-2-focal/data.yml b/apps/openresty/1.21.4.3-3-3-focal/data.yml similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/data.yml rename to apps/openresty/1.21.4.3-3-3-focal/data.yml diff --git a/apps/openresty/1.21.4.3-3-2-focal/docker-compose.yml b/apps/openresty/1.21.4.3-3-3-focal/docker-compose.yml similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/docker-compose.yml rename to apps/openresty/1.21.4.3-3-3-focal/docker-compose.yml diff --git a/apps/openresty/1.21.4.3-3-2-focal/root/404.html b/apps/openresty/1.21.4.3-3-3-focal/root/404.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/root/404.html rename to apps/openresty/1.21.4.3-3-3-focal/root/404.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/root/index.html b/apps/openresty/1.21.4.3-3-3-focal/root/index.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/root/index.html rename to apps/openresty/1.21.4.3-3-3-focal/root/index.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/root/stop/index.html b/apps/openresty/1.21.4.3-3-3-focal/root/stop/index.html similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/root/stop/index.html rename to apps/openresty/1.21.4.3-3-3-focal/root/stop/index.html diff --git a/apps/openresty/1.21.4.3-3-2-focal/scripts/init.sh b/apps/openresty/1.21.4.3-3-3-focal/scripts/init.sh similarity index 100% rename from apps/openresty/1.21.4.3-3-2-focal/scripts/init.sh rename to apps/openresty/1.21.4.3-3-3-focal/scripts/init.sh