Merge e07cb445ac into 314a2f62ec

2016-09-06 13:34:14 +00:00 · 2016-09-06 13:34:14 +00:00 · 41f02ab18b
parent 314a2f62ec e07cb445ac
commit 41f02ab18b
1 changed files with 4 additions and 2 deletions
--- a/init.lua
+++ b/init.lua
@ -223,8 +223,9 @@ end

 function whiteip()
    if next(ipWhitelist) ~= nil then
+        clientIp = getClientIp()
        for _,ip in pairs(ipWhitelist) do
-            if getClientIp()==ip then
+            if ip == clientIp or string.find(clientIp, ip) == 1 then
                return true
            end
        end
@ -234,8 +235,9 @@ end

 function blockip()
     if next(ipBlocklist) ~= nil then
+        clientIp = getClientIp()
         for _,ip in pairs(ipBlocklist) do
-             if getClientIp()==ip then
+            if ip == clientIp or string.find(clientIp, ip) == 1 then
                 ngx.exit(403)
                 return true
             end