diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/.aes_key b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/.aes_key similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/.aes_key rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/.aes_key diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/.secret b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/.secret similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/.secret rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/.secret diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/global.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/global.json similarity index 97% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/global.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/global.json index 3cbff70c7..0af9ad0bf 100644 --- a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/global.json +++ b/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" } } diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/siteConfig.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/siteConfig.json similarity index 97% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/siteConfig.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/siteConfig.json index 4ebef946f..7c08d6050 100644 --- a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/siteConfig.json +++ b/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" } } diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/sites.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/sites.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/sites.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/sites.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/token b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/token similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/token rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/token diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/waf.conf b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/waf.conf similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/waf.conf rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/waf.conf diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/waf.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/waf.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/conf/waf.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/conf/waf.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/default/cc.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/default/cc.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/default/cc.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/default/cc.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/default/forbidden.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/default/forbidden.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/default/forbidden.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/default/forbidden.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/default/geo.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/default/geo.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/default/geo.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/default/geo.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/default/global.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/default/global.json similarity index 94% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/default/global.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/default/global.json index 3cbff70c7..b065e6409 100644 --- a/openresty/1.21.4.3-2-1-focal/1pwaf/data/default/global.json +++ b/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, diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/default/ip.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/default/ip.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/default/ip.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/default/ip.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/default/unknown.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/default/unknown.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/default/unknown.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/default/unknown.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/geo/BlackIP.mmdb b/openresty/1.21.4.3-2-2-focal/1pwaf/data/geo/BlackIP.mmdb similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/geo/BlackIP.mmdb rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/geo/BlackIP.mmdb diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/geo/GeoIP.mmdb b/openresty/1.21.4.3-2-2-focal/1pwaf/data/geo/GeoIP.mmdb similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/geo/GeoIP.mmdb rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/geo/GeoIP.mmdb diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/5s.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/5s.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/5s.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/5s.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/5s.js b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/5s.js similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/5s.js rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/5s.js diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/cc.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/cc.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/cc.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/cc.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/forbidden.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/forbidden.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/forbidden.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/forbidden.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/geo.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/geo.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/geo.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/geo.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/ip.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/ip.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/ip.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/ip.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/redirect.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/redirect.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/redirect.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/redirect.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/slide.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/slide.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/slide.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/slide.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/slide.js b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/slide.js similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/slide.js rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/slide.js diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/html/unknown.html b/openresty/1.21.4.3-2-2-focal/1pwaf/data/html/unknown.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/html/unknown.html rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/html/unknown.html diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/acl.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/acl.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/acl.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/acl.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/args.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/args.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/args.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/args.json diff --git a/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/cdn.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/cdn.json new file mode 100644 index 000000000..52fede84b --- /dev/null +++ b/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" + } + ] +} + diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/cookie.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/cookie.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/cookie.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/cookie.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/defaultUaBlack.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/defaultUaBlack.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/defaultUaBlack.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/defaultUaBlack.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/defaultUrlBlack.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/defaultUrlBlack.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/defaultUrlBlack.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/defaultUrlBlack.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/fileExt.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/fileExt.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/fileExt.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/fileExt.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/header.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/header.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/header.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/header.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/ipBlack.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/ipBlack.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/ipBlack.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/ipBlack.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/ipWhite.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/ipWhite.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/ipWhite.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/ipWhite.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/methodWhite.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/methodWhite.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/methodWhite.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/methodWhite.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/post.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/post.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/post.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/post.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/uaBlack.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/uaBlack.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/uaBlack.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/uaBlack.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/uaWhite.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/uaWhite.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/uaWhite.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/uaWhite.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/urlBlack.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/urlBlack.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/urlBlack.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/urlBlack.json diff --git a/openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/urlWhite.json b/openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/urlWhite.json similarity index 100% rename from openresty/1.21.4.3-2-1-focal/1pwaf/data/rules/urlWhite.json rename to openresty/1.21.4.3-2-2-focal/1pwaf/data/rules/urlWhite.json diff --git a/openresty/1.21.4.3-2-1-focal/conf/conf.d/00.default.conf b/openresty/1.21.4.3-2-2-focal/conf/conf.d/00.default.conf similarity index 100% rename from openresty/1.21.4.3-2-1-focal/conf/conf.d/00.default.conf rename to openresty/1.21.4.3-2-2-focal/conf/conf.d/00.default.conf diff --git a/openresty/1.21.4.3-2-1-focal/conf/conf.d/default.conf b/openresty/1.21.4.3-2-2-focal/conf/conf.d/default.conf similarity index 100% rename from openresty/1.21.4.3-2-1-focal/conf/conf.d/default.conf rename to openresty/1.21.4.3-2-2-focal/conf/conf.d/default.conf diff --git a/openresty/1.21.4.3-2-1-focal/conf/fastcgi-php.conf b/openresty/1.21.4.3-2-2-focal/conf/fastcgi-php.conf similarity index 100% rename from openresty/1.21.4.3-2-1-focal/conf/fastcgi-php.conf rename to openresty/1.21.4.3-2-2-focal/conf/fastcgi-php.conf diff --git a/openresty/1.21.4.3-2-1-focal/conf/fastcgi_params b/openresty/1.21.4.3-2-2-focal/conf/fastcgi_params similarity index 100% rename from openresty/1.21.4.3-2-1-focal/conf/fastcgi_params rename to openresty/1.21.4.3-2-2-focal/conf/fastcgi_params diff --git a/openresty/1.21.4.3-2-1-focal/conf/mime.types b/openresty/1.21.4.3-2-2-focal/conf/mime.types similarity index 100% rename from openresty/1.21.4.3-2-1-focal/conf/mime.types rename to openresty/1.21.4.3-2-2-focal/conf/mime.types diff --git a/openresty/1.21.4.3-2-1-focal/conf/nginx.conf b/openresty/1.21.4.3-2-2-focal/conf/nginx.conf similarity index 100% rename from openresty/1.21.4.3-2-1-focal/conf/nginx.conf rename to openresty/1.21.4.3-2-2-focal/conf/nginx.conf diff --git a/openresty/1.21.4.3-2-1-focal/data.yml b/openresty/1.21.4.3-2-2-focal/data.yml similarity index 100% rename from openresty/1.21.4.3-2-1-focal/data.yml rename to openresty/1.21.4.3-2-2-focal/data.yml diff --git a/openresty/1.21.4.3-2-1-focal/docker-compose.yml b/openresty/1.21.4.3-2-2-focal/docker-compose.yml similarity index 92% rename from openresty/1.21.4.3-2-1-focal/docker-compose.yml rename to openresty/1.21.4.3-2-2-focal/docker-compose.yml index a2518d93a..131a5d77f 100644 --- a/openresty/1.21.4.3-2-1-focal/docker-compose.yml +++ b/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 diff --git a/openresty/1.21.4.3-2-1-focal/root/404.html b/openresty/1.21.4.3-2-2-focal/root/404.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/root/404.html rename to openresty/1.21.4.3-2-2-focal/root/404.html diff --git a/openresty/1.21.4.3-2-1-focal/root/index.html b/openresty/1.21.4.3-2-2-focal/root/index.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/root/index.html rename to openresty/1.21.4.3-2-2-focal/root/index.html diff --git a/openresty/1.21.4.3-2-1-focal/root/stop/index.html b/openresty/1.21.4.3-2-2-focal/root/stop/index.html similarity index 100% rename from openresty/1.21.4.3-2-1-focal/root/stop/index.html rename to openresty/1.21.4.3-2-2-focal/root/stop/index.html diff --git a/openresty/1.21.4.3-2-1-focal/scripts/init.sh b/openresty/1.21.4.3-2-2-focal/scripts/init.sh similarity index 100% rename from openresty/1.21.4.3-2-1-focal/scripts/init.sh rename to openresty/1.21.4.3-2-2-focal/scripts/init.sh