tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-05 23:26:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化] 重构 WAF 和 PoW 处理逻辑，使用 require 加载运行时模块，更新相关测试以验证新行为

Browse Source
This commit is contained in:
ryan
2026-05-30 16:19:55 +08:00
parent f03718ce8c
commit b9cde88bf6
5 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openflare_server/service/config_version.go
+3 -2
View File
@@ -1264,11 +1264,12 @@ func renderAccessBlock(siteName string, powEnabled bool) string {
}
return fmt.Sprintf(` set $openflare_waf_site "%s";
access_by_lua_block {
dofile("%s/waf/check.lua")
package.path = "%s/?.lua;%s/?/init.lua;" .. package.path
require("waf.runtime").check()
if ngx.ctx.openflare_waf_blocked then
return
end
dofile("%s/pow/check.lua")
require("pow.runtime").check()
}
`, escapedSiteName, nginxLuaDirPlaceholder, nginxLuaDirPlaceholder)
}
openflare_server/service/https_phase1_test.go
+2 -2
View File
@@ -1025,7 +1025,7 @@ func TestPublishConfigVersionDetectsPoWChanges(t *testing.T) {
if !strings.Contains(secondRelease.Version.RenderedConfig, "application/javascript js mjs;") {
t.Fatal("expected rendered config to serve Anubis module scripts with a JavaScript MIME type")
}
if !strings.Contains(secondRelease.Version.RenderedConfig, " dofile(\"__OPENFLARE_LUA_DIR__/waf/check.lua\")\n if ngx.ctx.openflare_waf_blocked then\n return\n end\n dofile(\"__OPENFLARE_LUA_DIR__/pow/check.lua\")") {
if !strings.Contains(secondRelease.Version.RenderedConfig, " package.path = \"__OPENFLARE_LUA_DIR__/?.lua;__OPENFLARE_LUA_DIR__/?/init.lua;\" .. package.path\n require(\"waf.runtime\").check()\n if ngx.ctx.openflare_waf_blocked then\n return\n end\n require(\"pow.runtime\").check()") {
t.Fatal("expected combined WAF and PoW access handler to short-circuit before PoW")
}
locationStart := strings.Index(secondRelease.Version.RenderedConfig, " location / {\n")
@@ -1102,7 +1102,7 @@ func TestPublishConfigVersionRendersBasicAuthWithPoW(t *testing.T) {
if !strings.Contains(result.Version.RenderedConfig, " return ngx.exit(401)\n end\n }\n") {
t.Fatal("expected rendered basic auth Lua block to close the if statement before the nginx block")
}
if !strings.Contains(result.Version.RenderedConfig, " dofile(\"__OPENFLARE_LUA_DIR__/pow/check.lua\")") {
if !strings.Contains(result.Version.RenderedConfig, `require("pow.runtime").check()`) {
t.Fatal("expected PoW access handler to remain at server scope")
}
if !strings.Contains(result.Version.RenderedConfig, "proxy_pass http://backend_xbot_example_com_1;") {