From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 15 Apr 2015 16:34:35 +0000 (+0100)
Subject: Use tld when checking for DMARC policy.
X-Git-Tag: 0.9.0~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ac0ad45badeb5e0d2c4d6ebbafdbd46bd491ac5;p=thirdparty%2Frspamd.git

Use tld when checking for DMARC policy.
---

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index 94ef119a54..27c5ecad37 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -30,7 +30,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 local rspamd_regexp = require "rspamd_regexp"
 local rspamd_logger = require "rspamd_logger"
 local rspamd_redis = require "rspamd_redis"
+local rspamd_url = require "rspamd_url"
 local upstream_list = require "rspamd_upstream_list"
+
 --local dumper = require 'pl.pretty'.dump
 
 local symbols = {
@@ -191,10 +193,12 @@ local function dmarc_callback(task)
   end
   
   if from and from[1]['domain'] and not from[2] then
-    -- XXX: use tld list here and generate top level domain
-    local dmarc_domain = '_dmarc.' .. from[1]['domain']
-    task:get_resolver():resolve_txt(task:get_session(), task:get_mempool(),
-      dmarc_domain, dmarc_dns_cb)
+    local url_from = rspamd_url.create(task:get_mempool(), from[1]['domain'])
+    if url_from then
+      local dmarc_domain = '_dmarc.' .. url_from:get_tld()
+      task:get_resolver():resolve_txt(task:get_session(), task:get_mempool(),
+        dmarc_domain, dmarc_dns_cb)
+    end
   end
 end