Software / code / prosody
Changeset
7026:f0dc5cc11d0e
mod_register: Use util.cache to limit the number of per-ip throttles kept
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 23 Dec 2015 08:58:34 +0100 |
| parents | 7025:236e8d1ee96c |
| children | 7027:77d838ba91c6 |
| files | plugins/mod_register.lua |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_register.lua Wed Dec 23 08:57:12 2015 +0100 +++ b/plugins/mod_register.lua Wed Dec 23 08:58:34 2015 +0100 @@ -16,6 +16,7 @@ local nodeprep = require "util.encodings".stringprep.nodeprep; local jid_bare = require "util.jid".bare; local create_throttle = require "util.throttle".create; +local new_cache = require "util.cache".new; local compat = module:get_option_boolean("registration_compat", true); local allow_registration = module:get_option_boolean("allow_registration", false); @@ -171,7 +172,6 @@ end end -local recent_ips = {}; local min_seconds_between_registrations = module:get_option_number("min_seconds_between_registrations"); local whitelist_only = module:get_option_boolean("whitelist_registration_only"); local whitelisted_ips = module:get_option_set("registration_whitelist", { "127.0.0.1" })._items; @@ -179,14 +179,17 @@ local throttle_max = module:get_option_number("registration_throttle_max", min_seconds_between_registrations and 1); local throttle_period = module:get_option_number("registration_throttle_period", min_seconds_between_registrations); +local throttle_cache_size = module:get_option_number("registration_throttle_cache_size", 100); + +local throttle_cache = new_cache(throttle_cache_size); local function check_throttle(ip) if not throttle_max then return true end - local throttle = recent_ips[ip]; + local throttle = throttle_cache:get(ip); if not throttle then throttle = create_throttle(throttle_max, throttle_period); - recent_ips[ip] = throttle; end + throttle_cache:set(ip, throttle); return throttle:poll(1); end
