diff --git a/init.lua b/init.lua index 2eb5966..04c3f67 100644 --- a/init.lua +++ b/init.lua @@ -8,7 +8,7 @@ logpath = logdir rulepath = RulePath UrlDeny = optionIsOn(UrlDeny) PostCheck = optionIsOn(postMatch) -CookieCheck = optionIsOn(cookieMatch) +CookieCheck = optionIsOn(CookieMatch) WhiteCheck = optionIsOn(whiteModule) PathInfoFix = optionIsOn(PathInfoFix) attacklog = optionIsOn(attacklog) @@ -78,7 +78,7 @@ function whiteurl() if WhiteCheck then if wturlrules ~=nil then for _,rule in pairs(wturlrules) do - if ngxmatch(ngx.var.uri,rule,"isjo") then + if ngxmatch(ngx.var.request_uri,rule,"isjo") then return true end end diff --git a/waf.lua b/waf.lua index 8ce05f4..17b4bee 100644 --- a/waf.lua +++ b/waf.lua @@ -42,7 +42,7 @@ elseif PostCheck then return true end size = size + len(data) - local m = ngxmatch(data,[[Content-Disposition: form-data;(.+)filename="(.+)\\.(.*)"]],'ijo') + local m = ngx.re.match(data,[[Content-Disposition: form-data;(.+)filename="(.+)\.(\w+)"]],'isjo') if m then fileExtCheck(m[3]) filetranslate = true