limit req - multiple url support

confs/site/main-lua.conf

@@ -58,9 +58,7 @@ local dnsbl_list		= {% raw %}{{% endraw %}{% if DNSBL_LIST != "" %}{% set elemen
 local use_bad_behavior		= {% if USE_BAD_BEHAVIOR == "yes" %}true{% else %}false{% endif +%}
 
 -- limit req
-local use_req_limit		= {% if USE_REQ_LIMIT == "yes" %}true{% else %}false{% endif +%}
+local use_limit_req		= {% if USE_LIMIT_REQ == "yes" %}true{% else %}false{% endif +%}
-local limit_req_rate		= "{{ LIMIT_REQ_RATE }}"
-local limit_req_burst		= "{{ LIMIT_REQ_BURST }}"
 
 -- remote API
 local use_remote_api		= {% if USE_REMOTE_API == "yes" %}true{% else %}false{% endif +%}
@@ -155,9 +153,28 @@ if use_bad_behavior and behavior.is_banned() then
 end
 
 -- check if IP is banned because of "request limit"
--- if use_req_limit and reqlimit.check() then
+if use_limit_req then
---	ngx.exit(ngx.HTTP_FORBIDDEN)
+{% if USE_LIMIT_REQ == "yes" %}
--- end
+	{% for k, v in all.items() %}
+		{% if k.startswith("LIMIT_REQ_URL") and v != "" +%}
+			{% set url = v %}
+			{% set rate = all[k.replace("URL", "RATE")] if k.replace("URL", "RATE") in all else "1r/s" %}
+			{% set burst = all[k.replace("URL", "BURST")] if k.replace("URL", "BURST") in all else "5" %}
+			{% set delay = all[k.replace("URL", "DELAY")] if k.replace("URL", "DELAY") in all else "1" %}
+			{% if url == "/" %}
+	if limitreq.check("{{ rate }}", {{ burst }}, {{ delay }}) then
+		ngx.exit(ngx.HTTP_TOO_MANY_REQUESTS)
+	end
+			{% else %}
+	if ngx.var.uri == "{{ url }}" and limitreq.check("{{ rate }}", {{ burst }}, {{ delay }}) then
+		ngx.exit(ngx.HTTP_TOO_MANY_REQUESTS)
+	end
+			{% endif %}
+		{% endif %}
+	{% endfor %}
+{% endif %}
+
+end
 
 -- our redis client
 local redis_client = nil

lua/limitreq.lua

@@ -35,7 +35,10 @@ end
 
 function M.check (rate, burst, sleep)
 	local key = ngx.var.remote_addr .. ngx.var.uri
-	local rate_split = rate:gmatch("([^r/]+)")
+	local rate_split = {}
+	for str in rate:gmatch("([^r/]+)") do
+		table.insert(rate_split, str)
+	end
 	local max = rate_split[1]
 	local unit = rate_split[2]
 	local delay = 0

settings.json

@@ -99,6 +99,56 @@
             }
         ]
     },
+    "Bad behavior": {
+        "id": "bad-behavior",
+        "params": [
+            {
+                "context": "multisite",
+                "default": "yes",
+                "env": "USE_BAD_BEHAVIOR",
+                "id": "use-bad-behavior",
+                "label": "Use bad behavior",
+                "regex": "^(yes|no)$",
+                "type": "checkbox"
+            },
+            {
+                "context": "multisite",
+                "default": "86400",
+                "env": "BAD_BEHAVIOR_BAN_TIME",
+                "id": "bad-behavior-ban-time",
+                "label": "Ban duration time",
+                "regex": "^[0-9]+$",
+                "type": "text"
+            },
+            {
+                "context": "multisite",
+                "default": "60",
+                "env": "BAD_BEHAVIOR_COUNT_TIME",
+                "id": "bad-behavior-count-time",
+                "label": "Count time",
+                "regex": "^[0-9]+$",
+                "type": "text"
+            },
+            {
+                "context": "multisite",
+                "default": "400 401 403 404 405 429 444",
+                "env": "BAD_BEHAVIOR_STATUS_CODES",
+                "id": "bad-behavior-status-codes",
+                "label": "Status codes",
+                "regex": "^([0-9]{3} ?)*$",
+                "type": "text"
+            },
+            {
+                "context": "multisite",
+                "default": "10",
+                "env": "BAD_BEHAVIOR_THRESHOLD",
+                "id": "bad-behavior-threshold",
+                "label": "Threshold",
+                "regex": "^[0-9]+$",
+                "type": "text"
+            }
+        ]
+    },
     "Basic auth": {
         "id": "auth-basic",
         "params": [
@@ -779,7 +829,7 @@
             {
                 "id": "custom-headers",
                 "label": "Custom headers",
-                "params" : [
+                "params": [
                     {
                         "context": "multisite",
                         "default": "",
@@ -827,6 +877,92 @@
             }
         ]
     },
+    "Internal": {
+        "id": "internal",
+        "params": [
+            {
+                "context": "global",
+                "default": "no",
+                "env": "USE_API",
+                "id": "use-api",
+                "label": "Enable API",
+                "regex": "^(yes|no)$",
+                "type": "checkbox"
+            },
+            {
+                "context": "global",
+                "default": "192.168.0.0/16 172.16.0.0/12 10.0.0.0/8",
+                "env": "API_WHITELIST_IP",
+                "id": "api-whitelist-ip",
+                "label": "API whitelist IP",
+                "regex": "^(\\d+.\\d+.\\d+.\\d+(/\\d+)? ?)*$",
+                "type": "text"
+            },
+            {
+                "context": "global",
+                "default": "random",
+                "env": "API_URI",
+                "id": "api-uri",
+                "label": "API URI",
+                "regex": "^(random|\\/[A-Za-z0-9\\-\\/]+)$",
+                "type": "text"
+            },
+            {
+                "context": "global",
+                "default": "no",
+                "env": "SWARM_MODE",
+                "id": "swarm-mode",
+                "label": "Swarm mode",
+                "regex": "^(yes|no)$",
+                "type": "checkbox"
+            },
+            {
+                "context": "global",
+                "default": "no",
+                "env": "KUBERNETES_MODE",
+                "id": "kubernetes-mode",
+                "label": "Kubernetes mode",
+                "regex": "^(yes|no)$",
+                "type": "checkbox"
+            },
+            {
+                "context": "global",
+                "default": "no",
+                "env": "USE_REDIS",
+                "id": "use-redis",
+                "label": "Use external redis when coupled with autoconf",
+                "regex": "^(yes|no)$",
+                "type": "checkbox"
+            },
+            {
+                "context": "global",
+                "default": "",
+                "env": "REDIS_HOST",
+                "id": "redis-host",
+                "label": "Hostname/IP of the Redis service",
+                "regex": "^([A-Za-z0-9\\-\\.\\_]+|.{0})$",
+                "type": "text"
+            },
+            {
+                "context": "multisite",
+                "default": "no",
+                "env": "USE_REMOTE_API",
+                "id": "use-remote-api",
+                "label": "Use a remote service for enhanced security",
+                "regex": "^(yes|no)$",
+                "type": "checkbox"
+            },
+            {
+                "context": "global",
+                "default": "",
+                "env": "REMOTE_API_SERVER",
+                "id": "remote-api-server",
+                "label": "The URL of the remote service",
+                "regex": "^.*$",
+                "type": "text"
+            }
+        ]
+    },
     "Limit conn": {
         "id": "limit-conn",
         "params": [
@@ -871,12 +1007,27 @@
                 "regex": "^(yes|no)$",
                 "type": "checkbox"
             },
+            {
+                "id": "limit-req-params",
+                "label": "Limit request",
+                "params": [
+                    {
+                        "context": "multisite",
+                        "default": "",
+                        "env": "LIMIT_REQ_URL",
+                        "id": "limit-req-url",
+                        "label": "Limit req url",
+                        "multiple": "Limit request",
+                        "regex": "^.*$",
+                        "type": "text"
+                    },
                     {
                         "context": "multisite",
                         "default": "1r/s",
                         "env": "LIMIT_REQ_RATE",
                         "id": "limit-req-rate",
                         "label": "Limit req rate",
+                        "multiple": "Limit request",
                         "regex": "^\\d+r/(s|m|h|d)$",
                         "type": "text"
                     },
@@ -886,6 +1037,7 @@
                         "env": "LIMIT_REQ_BURST",
                         "id": "limit-req-burst",
                         "label": "Limit req burst",
+                        "multiple": "Limit request",
                         "regex": "^\\d+$",
                         "type": "text"
                     },
@@ -895,8 +1047,12 @@
                         "env": "LIMIT_REQ_DELAY",
                         "id": "limit-req-delay",
                         "label": "Limit req delay",
+                        "multiple": "Limit request",
                         "regex": "^\\d+(\\.\\d+)?$",
                         "type": "text"
+                    }
+                ],
+                "type": "multiple"
             },
             {
                 "context": "global",
@@ -1167,138 +1323,70 @@
             }
         ]
     },
-    "Bad behavior": {
+    "Whitelist": {
-        "id": "bad-behavior",
+        "id": "whitelist",
         "params": [
             {
                 "context": "multisite",
                 "default": "yes",
-                "env": "USE_BAD_BEHAVIOR",
+                "env": "USE_WHITELIST_IP",
-                "id": "use-bad-behavior",
+                "id": "use-whitelist-ip",
-                "label": "Use bad behavior",
+                "label": "Use whitelist ip",
                 "regex": "^(yes|no)$",
                 "type": "checkbox"
             },
             {
                 "context": "multisite",
-                "default": "86400",
+                "default": "23.21.227.69 40.88.21.235 50.16.241.113 50.16.241.114 50.16.241.117 50.16.247.234 52.204.97.54 52.5.190.19 54.197.234.188 54.208.100.253 54.208.102.37 107.21.1.8",
-                "env": "BAD_BEHAVIOR_BAN_TIME",
+                "env": "WHITELIST_IP_LIST",
-                "id": "bad-behavior-ban-time",
+                "id": "whitelist-ip-list",
-                "label": "Ban duration time",
+                "label": "Whitelist ip list",
-                "regex": "^[0-9]+$",
-                "type": "text"
-            },
-            {
-                "context": "multisite",
-                "default": "60",
-                "env": "BAD_BEHAVIOR_COUNT_TIME",
-                "id": "bad-behavior-count-time",
-                "label": "Count time",
-                "regex": "^[0-9]+$",
-                "type": "text"
-            },
-            {
-                "context": "multisite",
-                "default": "400 401 403 404 405 429 444",
-                "env": "BAD_BEHAVIOR_STATUS_CODES",
-                "id": "bad-behavior-status-codes",
-                "label": "Status codes",
-                "regex": "^([0-9]{3} ?)*$",
-                "type": "text"
-            },
-            {
-                "context": "multisite",
-                "default": "10",
-                "env": "BAD_BEHAVIOR_THRESHOLD",
-                "id": "bad-behavior-threshold",
-                "label": "Threshold",
-                "regex": "^[0-9]+$",
-                "type": "text"
-            }
-        ]
-    },
-    "Internal": {
-        "id": "internal",
-        "params": [
-            {
-                "context": "global",
-                "default": "no",
-                "env": "USE_API",
-                "id": "use-api",
-                "label": "Enable API",
-                "regex": "^(yes|no)$",
-                "type": "checkbox"
-            },
-            {
-                "context": "global",
-                "default": "192.168.0.0/16 172.16.0.0/12 10.0.0.0/8",
-                "env": "API_WHITELIST_IP",
-                "id": "api-whitelist-ip",
-                "label": "API whitelist IP",
                 "regex": "^(\\d+.\\d+.\\d+.\\d+(/\\d+)? ?)*$",
                 "type": "text"
             },
             {
-                "context": "global",
+                "context": "multisite",
-                "default": "random",
+                "default": "yes",
-                "env": "API_URI",
+                "env": "USE_WHITELIST_REVERSE",
-                "id": "api-uri",
+                "id": "use-whitelist-reverse",
-                "label": "API URI",
+                "label": "Use whitelist reverse",
-                "regex": "^(random|\\/[A-Za-z0-9\\-\\/]+)$",
-                "type": "text"
-            },
-            {
-                "context": "global",
-                "default": "no",
-                "env": "SWARM_MODE",
-                "id": "swarm-mode",
-                "label": "Swarm mode",
                 "regex": "^(yes|no)$",
                 "type": "checkbox"
             },
             {
-                "context": "global",
+                "context": "multisite",
-                "default": "no",
+                "default": ".googlebot.com .google.com .search.msn.com .crawl.yahoo.net .crawl.baidu.jp .crawl.baidu.com .yandex.com .yandex.ru .yandex.net",
-                "env": "KUBERNETES_MODE",
+                "env": "WHITELIST_REVERSE_LIST",
-                "id": "kubernetes-mode",
+                "id": "whitelist-reverse-list",
-                "label": "Kubernetes mode",
+                "label": "Whitelist reverse list",
-                "regex": "^(yes|no)$",
+                "regex": "^([a-z\\-0-9\\.]+ ?)*$",
-                "type": "checkbox"
-            },
-            {
-                "context": "global",
-                "default": "no",
-                "env": "USE_REDIS",
-                "id": "use-redis",
-                "label": "Use external redis when coupled with autoconf",
-                "regex": "^(yes|no)$",
-                "type": "checkbox"
-            },
-            {
-                "context": "global",
-                "default": "",
-                "env": "REDIS_HOST",
-                "id": "redis-host",
-                "label": "Hostname/IP of the Redis service",
-                "regex": "^([A-Za-z0-9\\-\\.\\_]+|.{0})$",
                 "type": "text"
             },
             {
                 "context": "multisite",
-                "default": "no",
+                "default": "",
-                "env": "USE_REMOTE_API",
+                "env": "WHITELIST_COUNTRY",
-                "id": "use-remote-api",
+                "id": "whitelist-country",
-                "label": "Use a remote service for enhanced security",
+                "label": "Whitelist country",
-                "regex": "^(yes|no)$",
+                "regex": "^([A-Z]{2} ?)*$",
-                "type": "checkbox"
+                "type": "text"
             },
             {
-                "context": "global",
+                "context": "multisite",
                 "default": "",
-                "env": "REMOTE_API_SERVER",
+                "env": "WHITELIST_USER_AGENT",
-                "id": "remote-api-server",
+                "id": "whitelist-user-agent",
-                "label": "The URL of the remote service",
+                "label": "Whitelist user agent",
-                "regex": "^.*$",
+                "regex": ".*",
+                "type": "text"
+            },
+            {
+                "context": "multisite",
+                "default": "",
+                "env": "WHITELIST_URI",
+                "id": "whitelist-uri",
+                "label": "Whitelist URI",
+                "regex": "^(\\S ?)*$",
                 "type": "text"
             }
         ]
@@ -1372,6 +1460,7 @@
             {
                 "context": "global",
                 "default": "8080",
+
                 "env": "HTTP_PORT",
                 "id": "http-port",
                 "label": "HTTP port",
@@ -1415,73 +1504,5 @@
                 "type": "text"
             }
         ]
-    },
-    "Whitelist": {
-        "id": "whitelist",
-        "params": [
-            {
-                "context": "multisite",
-                "default": "yes",
-                "env": "USE_WHITELIST_IP",
-                "id": "use-whitelist-ip",
-                "label": "Use whitelist ip",
-                "regex": "^(yes|no)$",
-                "type": "checkbox"
-            },
-            {
-                "context": "multisite",
-                "default": "23.21.227.69 40.88.21.235 50.16.241.113 50.16.241.114 50.16.241.117 50.16.247.234 52.204.97.54 52.5.190.19 54.197.234.188 54.208.100.253 54.208.102.37 107.21.1.8",
-                "env": "WHITELIST_IP_LIST",
-                "id": "whitelist-ip-list",
-                "label": "Whitelist ip list",
-                "regex": "^(\\d+.\\d+.\\d+.\\d+(/\\d+)? ?)*$",
-                "type": "text"
-            },
-            {
-                "context": "multisite",
-                "default": "yes",
-                "env": "USE_WHITELIST_REVERSE",
-                "id": "use-whitelist-reverse",
-                "label": "Use whitelist reverse",
-                "regex": "^(yes|no)$",
-                "type": "checkbox"
-            },
-            {
-                "context": "multisite",
-                "default": ".googlebot.com .google.com .search.msn.com .crawl.yahoo.net .crawl.baidu.jp .crawl.baidu.com .yandex.com .yandex.ru .yandex.net",
-                "env": "WHITELIST_REVERSE_LIST",
-                "id": "whitelist-reverse-list",
-                "label": "Whitelist reverse list",
-                "regex": "^([a-z\\-0-9\\.]+ ?)*$",
-                "type": "text"
-            },
-            {
-                "context": "multisite",
-                "default": "",
-                "env": "WHITELIST_COUNTRY",
-                "id": "whitelist-country",
-                "label": "Whitelist country",
-                "regex": "^([A-Z]{2} ?)*$",
-                "type": "text"
-            },
-            {
-                "context": "multisite",
-                "default": "",
-                "env": "WHITELIST_USER_AGENT",
-                "id": "whitelist-user-agent",
-                "label": "Whitelist user agent",
-                "regex": ".*",
-                "type": "text"
-            },
-            {
-                "context": "multisite",
-                "default": "",
-                "env": "WHITELIST_URI",
-                "id": "whitelist-uri",
-                "label": "Whitelist URI",
-                "regex": "^(\\S ?)*$",
-                "type": "text"
-            }
-        ]
     }
 }