From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 8 Dec 2014 02:08:00 +0000 (+0000)
Subject: Remove broken whitelist module.
X-Git-Tag: 0.8.0~83
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a235d3437073ca1747d1e400b3b83bbdd8e26f5d;p=rspamd.git

Remove broken whitelist module.
---

diff --git a/src/plugins/lua/whitelist.lua b/src/plugins/lua/whitelist.lua
deleted file mode 100644
index 82d2bb958..000000000
--- a/src/plugins/lua/whitelist.lua
+++ /dev/null
@@ -1,86 +0,0 @@
--- Module that add symbols to those hosts or from domains that are contained in whitelist
-
-local symbol_ip = nil
-local symbol_from = nil
-
-local r = nil
-local h = nil  -- radix tree and hash table
-local rspamd_logger = require "rspamd_logger"
-
-local function check_whitelist (task)
-	if symbol_ip then
-		-- check client's ip
-		local ipn = task:get_from_ip():to_number()
-		if ipn then
-			local key = r:get_key(ipn)
-			if key then
-				task:insert_result( symbol_ip, 1)
-			end
-		end
-	end
-
-	if symbol_from then
-		-- check client's from domain
-		local from = task:get_from()
-		if from then
-			local from_addr = from[1]['addr']
-
-			if from_addr then
-				local _,_,domain = string.find(from_addr, '@(.+)>?$')
-				local key = h:get_key(domain)
-				if key then
-					task:insert_result(symbol_from, 1)
-				end
-			end
-		end
-	end
-
-end
-
--- Registration
-if type(rspamd_config.get_api_version) ~= 'nil' then
-	if rspamd_config:get_api_version() >= 1 then
-		rspamd_config:register_module_option('whitelist', 'symbol_ip', 'string')
-		rspamd_config:register_module_option('whitelist', 'symbol_from', 'string')
-		rspamd_config:register_module_option('whitelist', 'ip_whitelist', 'map')
-		rspamd_config:register_module_option('whitelist', 'from_whitelist', 'map')
-	end
-end
-
--- Configuration
-local opts =  rspamd_config:get_all_opt('whitelist')
-if opts then
-    if opts['symbol_ip'] or opts['symbol_from'] then
-        local symbol_ip = opts['symbol_ip']
-        local symbol_from = opts['symbol_from']
-		
-		if symbol_ip then
-			if opts['ip_whitelist'] then
-				r = rspamd_config:add_radix_map (opts['ip_whitelist'])
-			else
-				-- No whitelist defined
-				symbol_ip = nil
-			end
-		end
-		if symbol_from then
-			if opts['from_whitelist'] then
-				h = rspamd_config:add_hash_map (opts['from_whitelist'])
-			else
-				-- No whitelist defined
-				symbol_from = nil
-			end
-		end
-
-
-		-- Register symbol's callback
-		if symbol_ip or symbol_from then
-			rspamd_config:register_callback_symbol_priority('WHITELIST', 1.0, -1, check_whitelist)
-			if symbol_from then
-				rspamd_config:register_virtual_symbol(symbol_from, 1.0)
-			end
-			if symbol_ip then
-				rspamd_config:register_virtual_symbol(symbol_ip, 1.0)
-			end
-		end
-	end
-end