From 3a4c7fb80d6976ac16a7d2cc6c0590bd8ac60b1a Mon Sep 17 00:00:00 2001
From: potatso <bangzhiliang@gmail.com>
Date: Wed, 5 Jul 2023 10:13:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 t/integration_block_req_header.t | 7 ++-----
 t/integration_passed.t           | 7 ++-----
 t/integration_with_coreruleset.t | 8 +++-----
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/t/integration_block_req_header.t b/t/integration_block_req_header.t
index f526151..664e12a 100644
--- a/t/integration_block_req_header.t
+++ b/t/integration_block_req_header.t
@@ -6,7 +6,7 @@ our $HttpConfig = <<'_EOC_';
     lua_code_cache on;
     lua_need_request_body on;
     init_worker_by_lua_block{
-            local coraza = require "resty.coraza"
+            coraza = require "resty.coraza"
             waf = coraza.do_init()
             coraza.rules_add(waf, [[SecRule REQUEST_HEADERS:User-Agent "Mozilla" "phase:1, id:3,drop,status:452,log,msg:'Blocked User-Agent'"]])
     }
@@ -14,8 +14,7 @@ _EOC_
 
 our $LocationConfig = <<'_EOC_';
     location /t {
-            access_by_lua_block {
-            local coraza = require "resty.coraza"
+        access_by_lua_block {
             coraza.do_access_filter(waf)
             coraza.do_interrupt()
         }
@@ -25,13 +24,11 @@ our $LocationConfig = <<'_EOC_';
         }
 
         header_filter_by_lua_block{
-            local coraza = require "resty.coraza"
             coraza.do_header_filter()
             coraza.do_interrupt()
         }
 
         log_by_lua_block{
-            local coraza = require "resty.coraza"
             coraza.do_log()
             coraza.do_free()
         }
diff --git a/t/integration_passed.t b/t/integration_passed.t
index 7311e07..2a1445b 100644
--- a/t/integration_passed.t
+++ b/t/integration_passed.t
@@ -6,15 +6,14 @@ our $HttpConfig = <<'_EOC_';
     lua_code_cache on;
     lua_need_request_body on;
     init_worker_by_lua_block{
-            local coraza = require "resty.coraza"
+            coraza = require "resty.coraza"
             waf = coraza.do_init()
    }
 _EOC_
 
 our $LocationConfig = <<'_EOC_';
     location /t {
-            access_by_lua_block {
-            local coraza = require "resty.coraza"
+        access_by_lua_block {
             coraza.do_access_filter(waf)
             coraza.do_interrupt()
         }
@@ -24,13 +23,11 @@ our $LocationConfig = <<'_EOC_';
         }
 
         header_filter_by_lua_block{
-            local coraza = require "resty.coraza"
             coraza.do_header_filter()
             coraza.do_interrupt()
         }
 
         log_by_lua_block{
-            local coraza = require "resty.coraza"
             coraza.do_log()
             coraza.do_free()
         }
diff --git a/t/integration_with_coreruleset.t b/t/integration_with_coreruleset.t
index 1871e8e..7e2cd2b 100644
--- a/t/integration_with_coreruleset.t
+++ b/t/integration_with_coreruleset.t
@@ -6,9 +6,10 @@ our $HttpConfig = <<'_EOC_';
     lua_code_cache on;
     lua_need_request_body on;
     init_worker_by_lua_block{
-            local coraza = require "resty.coraza"
+            coraza = require "resty.coraza"
             waf = coraza.do_init()
             coraza.rules_add_file(waf, "%s/t/coraza.conf")
+            coraza.rules_add(waf, "Include %s/t/coreruleset/crs-setup.conf.example")
             coraza.rules_add(waf, "Include %s/t/coreruleset/rules/*.conf")
     }
 _EOC_
@@ -17,8 +18,7 @@ $HttpConfig = sprintf($HttpConfig, $ENV{PWD}, $ENV{PWD});
 
 our $LocationConfig = <<'_EOC_';
     location /t {
-            access_by_lua_block {
-            local coraza = require "resty.coraza"
+        access_by_lua_block {
             coraza.do_access_filter(waf)
             coraza.do_interrupt()
         }
@@ -28,13 +28,11 @@ our $LocationConfig = <<'_EOC_';
         }
 
         header_filter_by_lua_block{
-            local coraza = require "resty.coraza"
             coraza.do_header_filter()
             coraza.do_interrupt()
         }
 
         log_by_lua_block{
-            local coraza = require "resty.coraza"
             coraza.do_log()
             coraza.do_free()
         }