* Add new plugin ip_score to set and get score for specified ip address.

diff --git a/src/kvstorage.c b/src/kvstorage.c
index 4a45850946dd65f8743965b7eff67e90035a1777..76e58adbaebe84791a2e90505b45a8cac3ba9a20 100644 (file)
--- a/src/kvstorage.c
+++ b/src/kvstorage.c
@@ -343,9 +343,16 @@ rspamd_kv_storage_increment (struct rspamd_kv_storage *storage, gpointer key, gu
                lp = &ELT_LONG (elt);
                *lp += *value;
                *value = *lp;
+               elt->age = time (NULL);
                if (storage->backend) {
-                       g_static_rw_lock_writer_unlock (&storage->rwlock);
-                       return storage->backend->replace_func (storage->backend, key, keylen, elt);
+                       if (storage->backend->replace_func (storage->backend, key, keylen, elt)) {
+                               g_static_rw_lock_writer_unlock (&storage->rwlock);
+                               return TRUE;
+                       }
+                       else {
+                               g_static_rw_lock_writer_unlock (&storage->rwlock);
+                               return FALSE;
+                       }
                }
                else {
                        g_static_rw_lock_writer_unlock (&storage->rwlock);

diff --git a/src/plugins/lua/ip_score.lua b/src/plugins/lua/ip_score.lua
new file mode 100644 (file)
index 0000000..1fd7cc0
--- /dev/null
+++ b/src/plugins/lua/ip_score.lua
@@ -0,0 +1,149 @@
+-- IP score is a module that set ip score of specific ip and 
+
+-- Default settings
+local keystorage_host = nil
+local keystorage_port = 0
+local metric = 'default'
+local reject_score = 3
+local add_header_score = 1
+local no_action_score = -2
+local symbol = 'IP_SCORE'
+-- This score is used for normalization of scores from keystorage
+local normalize_score = 100 
+
+-- Set score based on metric's action
+local ip_score_set = function(task)
+       -- Callback generator
+       local make_key_cb = function(ip)
+               local cb = function(task, err, data)
+                       if err then
+                               if string.find(err, 'not found') then 
+                                       -- Try to set this key
+                                       local cb_set = function(task, err, data)
+                                               if err then
+                                                       if err ~= 'OK' then
+                                                               rspamd_logger.info('got error: ' .. err)
+                                                       end
+                                               end
+                                       end
+                                       rspamd_redis.make_request(task, 'localhost', 6050, cb_set, 'SET %b %b %b', ip, '100', '0')
+                               else
+                                       rspamd_logger.info('got error while incrementing: ' .. err)
+                               end
+                       end
+               end
+               return cb
+       end
+       local action = task:get_metric_action(metric)
+       if action then
+               if action == 'reject' then
+                       local ip = task:get_from_ip()
+                       if ip then
+                               local cb = make_key_cb(ip)
+                               if reject_score > 0 then
+                                       rspamd_redis.make_request(task, keystorage_host, keystorage_port, cb, 'INCRBY %b %b', ip, reject_score)
+                               else
+                                       rspamd_redis.make_request(task, keystorage_host, keystorage_port, cb, 'DECRBY %b %b', ip, -reject_score)
+                               end
+                       end
+               elseif action == 'add header' then
+                       local ip = task:get_from_ip()
+                       if ip then
+                               local cb = make_key_cb(ip)
+                               if add_header_score > 0 then
+                                       rspamd_redis.make_request(task, keystorage_host, keystorage_port, cb, 'INCRBY %b %b', ip, add_header_score)
+                               else
+                                       rspamd_redis.make_request(task, keystorage_host, keystorage_port, cb, 'DECRBY %b %b', ip, -add_header_score)
+                               end
+                       end
+               elseif action == 'no action' then
+                       local ip = task:get_from_ip()
+                       if ip then
+                               local cb = make_key_cb(ip)
+                               if no_action_score > 0 then
+                                       rspamd_redis.make_request(task, keystorage_host, keystorage_port, cb, 'INCRBY %b %b', ip, no_action_score)
+                               else
+                                       rspamd_redis.make_request(task, keystorage_host, keystorage_port, cb, 'DECRBY %b %b', ip, -no_action_score)
+                               end
+                       end
+               end
+       end
+end
+
+-- Check score for ip in keystorage
+local ip_score_check = function(task)
+       local cb = function(task, err, data)
+               if err then
+                       -- Key is not found
+                       return
+               elseif data then
+                       local score = tonumber(data)
+                       -- Normalize
+                       if score > 0 and score > normalize_score then
+                               score = 1
+                       elseif score < 0 and score < -normalize_score then
+                               score = -1
+                       else
+                               score = score / normalize_score
+                       end
+                       task:insert_result(symbol, score)
+               end
+       end
+       local ip = task:get_from_ip()
+       if ip then
+               rspamd_redis.make_request(task, keystorage_host, keystorage_port, cb, 'GET %b', ip)
+       end
+end
+
+
+-- Configuration options
+local configure_ip_score_module = function()
+       local opts =  rspamd_config:get_all_opt('ip_score')
+       if opts then
+               if opts['keystorage_host'] then
+                       keystorage_host = opts['keystorage_host']
+               end
+               if opts['keystorage_port'] then
+                       keystorage_port = opts['keystorage_port']
+               end
+               if opts['metric'] then
+                       metric = opts['metric']
+               end
+               if opts['reject_score'] then
+                       reject_score = opts['reject_score']
+               end
+               if opts['add_header_score'] then
+                       add_header_score = opts['add_header_score']
+               end
+               if opts['no_action_score'] then
+                       no_action_score = opts['no_action_score']
+               end
+               if opts['symbol'] then
+                       symbol = opts['symbol']
+               end
+               if opts['normalize_score'] then
+                       normalize_score = opts['normalize_score']
+               end
+       end
+end
+
+-- Registration
+if rspamd_config:get_api_version() >= 9 then
+       rspamd_config:register_module_option('ip_score', 'keystorage_host', 'string')
+       rspamd_config:register_module_option('ip_score', 'keystorage_port', 'uint')
+       rspamd_config:register_module_option('ip_score', 'metric', 'string')
+       rspamd_config:register_module_option('ip_score', 'reject_score', 'int')
+       rspamd_config:register_module_option('ip_score', 'add_header_score', 'int')
+       rspamd_config:register_module_option('ip_score', 'no_action_score', 'int')
+       rspamd_config:register_module_option('ip_score', 'symbol', 'string')
+       rspamd_config:register_module_option('ip_score', 'normalize_score', 'uint')
+
+       configure_ip_score_module()
+       if keystorage_host and keystorage_port and normalize_score > 0 then
+               -- Register ip_score module
+               rspamd_config:register_symbol(symbol, 1.0, ip_score_check)
+               rspamd_config:register_post_filter(ip_score_set)
+       end
+else
+       rspamd_logger.err('cannot register module ip_score as it requres at least 9 version of lua API and rspamd >= 0.4.6')
+end