diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-12-21 11:11:21 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-12-21 11:11:21 +0000 |
| commit | a9dcf6a0b3f49b63be438d4cfefbcd315a14df6f (patch) | |
| tree | d998c6b7fba3348d9d2c1b6f1f9648eff9a5c5a2 /src | |
| parent | a0925a468c0d3db95d75b089728a63cd584bf42d (diff) | |
| download | rspamd-a9dcf6a0b3f49b63be438d4cfefbcd315a14df6f.tar.gz rspamd-a9dcf6a0b3f49b63be438d4cfefbcd315a14df6f.zip | |
Prefer spf1 records as spf2 records are usually rotten
Diffstat (limited to 'src')
| -rw-r--r-- | src/libserver/spf.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/libserver/spf.c b/src/libserver/spf.c index b1dc9a1a1..a421d7a07 100644 --- a/src/libserver/spf.c +++ b/src/libserver/spf.c @@ -1654,7 +1654,7 @@ static void spf_dns_callback (struct rdns_reply *reply, gpointer arg) { struct spf_record *rec = arg; - struct rdns_reply_entry *elt; + struct rdns_reply_entry *elt, *selected = NULL; struct spf_resolved_element *resolved; rec->requests_inflight--; @@ -1666,11 +1666,28 @@ spf_dns_callback (struct rdns_reply *reply, gpointer arg) rec->ttl = reply->entries->ttl; } + /* + * We prefer spf version 1 as other records are mostly likely garbadge + * or incorrect records (e.g. spf2 records) + */ LL_FOREACH (reply->entries, elt) { - if (start_spf_parse (rec, resolved, elt->content.txt.data)) { + if (strncmp (elt->content.txt.data, "v=spf1", sizeof ("v=spf1") - 1) + == 0) { + selected = elt; break; } } + + if (!selected) { + LL_FOREACH (reply->entries, elt) { + if (start_spf_parse (rec, resolved, elt->content.txt.data)) { + break; + } + } + } + else { + start_spf_parse (rec, resolved, elt->content.txt.data); + } } rspamd_spf_maybe_return (rec); |