From dcdb07f76de02883a871eac49ff517d35dd7a05d Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Tue, 11 Oct 2022 00:35:13 +0800
Subject: [PATCH] up

---
 plugins/op_waf/index.py         |  1 +
 plugins/op_waf/t/index.py       | 17 +++++--
 plugins/op_waf/waf/lua/init.lua | 85 +++++++++++++++++----------------
 plugins/op_waf/waf/total.json   |  2 +-
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/plugins/op_waf/index.py b/plugins/op_waf/index.py
index 521c0c00e..b064dd07f 100755
--- a/plugins/op_waf/index.py
+++ b/plugins/op_waf/index.py
@@ -178,6 +178,7 @@ def initTotalInfo():
             tmp['get'] = 0
             tmp['post'] = 0
             tmp['total'] = 0
+            tmp['url_ext'] = 0
             _name = {}
             _name[name] = tmp
             total_contents['sites'] = _name
diff --git a/plugins/op_waf/t/index.py b/plugins/op_waf/t/index.py
index a57ae411a..2d2301d18 100644
--- a/plugins/op_waf/t/index.py
+++ b/plugins/op_waf/t/index.py
@@ -145,15 +145,26 @@ def test_CC():
 
     print("CC test end")
 
-    # 7FKnElusaEqY0qIc
+
+def test_url_ext():
+    '''
+    目录保存
+    '''
+    url = TEST_URL + 't.sql'
+    print("url_ext start")
+    url_val = httpGet(url, 10)
+    print(url_val)
+
+    print("url_ext end")
 
 
 def test_start():
-    test_Dir()
-    test_UA()
+    # test_Dir()
+    # test_UA()
     # test_POST()
     # test_scan()
     # test_CC()
+    test_url_ext()
 
 
 if __name__ == "__main__":
diff --git a/plugins/op_waf/waf/lua/init.lua b/plugins/op_waf/waf/lua/init.lua
index b81bad0cb..b885d8279 100644
--- a/plugins/op_waf/waf/lua/init.lua
+++ b/plugins/op_waf/waf/lua/init.lua
@@ -43,6 +43,10 @@ C:setParams(params)
 
 C:setDebug(true)
 
+local server_name = params["server_name"]
+
+C:D(server_name)
+
 function get_return_state(rstate,rmsg)
     result = {}
     result['status'] = rstate
@@ -412,39 +416,39 @@ function post_X_Forwarded()
 end
 
 
-function php_path()
-    if site_config[server_name] == nil then return false end
-    for _,rule in ipairs(site_config[server_name]['disable_php_path'])
-    do
-        if ngx_match(uri,rule .. "/?.*\\.php$","isjo") then
-            C:write_log('php_path','regular')
-            C:return_html(config['other']['status'],other_html)
-            return C:return_message(200,uri)
-        end
-    end
-    return false
-end
-
-function url_path()
-    if site_config[server_name] == nil then return false end
-    for _,rule in ipairs(site_config[server_name]['disable_path'])
-    do
-        if ngx_match(uri,rule,"isjo") then
-            C:write_log('path','regular')
-            C:return_html(config['other']['status'],other_html)
-            return true
-        end
-    end
-    return false
-end
+-- function php_path()
+--     if site_config[server_name] == nil then return false end
+--     for _,rule in ipairs(site_config[server_name]['disable_php_path'])
+--     do
+--         if C:ngx_match_string(params['uri'],rule .. "/?.*\\.php$","isjo") then
+--             C:write_log('php_path','regular')
+--             C:return_html(config['other']['status'],other_html)
+--             return C:return_message(200,uri)
+--         end
+--     end
+--     return false
+-- end
+
+-- function url_path()
+--     if site_config[server_name] == nil then return false end
+--     for _,rule in ipairs(site_config[server_name]['disable_path'])
+--     do
+--         if ngx_match(uri,rule,"isjo") then
+--             C:write_log('path','regular')
+--             C:return_html(config['other']['status'],other_html)
+--             return true
+--         end
+--     end
+--     return false
+-- end
 
 function url_ext()
     if site_config[server_name] == nil then return false end
     for _,rule in ipairs(site_config[server_name]['disable_ext'])
     do
-        if ngx_match(uri,"\\."..rule.."$","isjo") then
+        if C:ngx_match_string("\\."..rule.."$", params['uri'],'url_ext') then
             C:write_log('url_ext','regular')
-            C:return_html(config['other']['status'],other_html)
+            C:return_html(config['other']['status'], other_html)
             return true
         end
     end
@@ -571,7 +575,6 @@ function waf()
     if waf_ip_black() then return true end
 
 
-
     -- cc setting
     if waf_drop() then return true end
     if waf_cc() then return true end
@@ -581,26 +584,24 @@ function waf()
     if waf_url() then return true end
 
     -- cookie检查
-    waf_cookie()
+    if waf_cookie() then return true end
     
     -- args参数拦截
-    waf_get_args()
+    if waf_get_args() then return true end
 
     -- 扫描软件禁止
-    waf_scan_black()
+    if waf_scan_black() then return true end
 
-    waf_post()
-    post_data_chekc()
-
-    local server_name = params["server_name"]
+    if waf_post() then return true end
+    if post_data_chekc() then return true end
+    
     if site_config[server_name] then
-        X_Forwarded()
-        post_X_Forwarded()
-        php_path()
-        url_path()
-        url_ext()
-        url_rule_ex()
-        url_tell()
+        if X_Forwarded() then return true end
+        if post_X_Forwarded() then return true end
+        -- url_path()
+        if url_ext() then return true end
+        -- url_rule_ex()
+        -- url_tell()
         post_data()
     end
 end
diff --git a/plugins/op_waf/waf/total.json b/plugins/op_waf/waf/total.json
index c7516630c..4d111b7ed 100644
--- a/plugins/op_waf/waf/total.json
+++ b/plugins/op_waf/waf/total.json
@@ -1 +1 @@
-{"rules":{"user_agent":0,"scan":0,"cookie":0,"post":0,"args":0,"url":0,"cc":0},"sites":{},"total":0}
\ No newline at end of file
+{"rules":{"url_ext":0,"user_agent":0,"scan":0,"cookie":0,"post":0,"args":0,"url":0,"cc":0},"sites":{},"total":0}
\ No newline at end of file