X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fspf.c;h=1aa68f18115f94aa451aee187446e0d3f12d681f;hp=0b00a5c7cb6b32596998e3b9723ee4977261518e;hb=2f6c7b1aa0bf4a675d0ec95646b27f5c71bf06c2;hpb=c8f419afe4b673ce93b7db07eb3093d8a07afb5f

diff --git a/src/src/spf.c b/src/src/spf.c
index 0b00a5c7c..1aa68f181 100644
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -2,10 +2,10 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Experimental SPF support.
+/* SPF support.
    Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2014
    License: GPL
-   Copyright (c) The Exim Maintainers 2015 - 2018
+   Copyright (c) The Exim Maintainers 2015 - 2019
 */
 
 /* Code for calling spf checks via libspf-alt. Called from acl.c. */
@@ -31,23 +31,158 @@ SPF_request_t   *spf_request = NULL;
 SPF_response_t  *spf_response = NULL;
 SPF_response_t  *spf_response_2mx = NULL;
 
+SPF_dns_rr_t  * spf_nxdomain = NULL;
+
+
+
+static SPF_dns_rr_t *
+SPF_dns_exim_lookup(SPF_dns_server_t *spf_dns_server,
+const char *domain, ns_type rr_type, int should_cache)
+{
+dns_answer * dnsa = store_get_dns_answer();
+dns_scan dnss;
+SPF_dns_rr_t * spfrr;
+
+DEBUG(D_receive) debug_printf("SPF_dns_exim_lookup\n");
+
+if (dns_lookup(dnsa, US domain, rr_type, NULL) == DNS_SUCCEED)
+  for (dns_record * rr = dns_next_rr(dnsa, &dnss, RESET_ANSWERS); rr;
+       rr = dns_next_rr(dnsa, &dnss, RESET_NEXT))
+    if (  rr->type == rr_type
+       && Ustrncmp(rr->data+1, "v=spf1", 6) == 0)
+      {
+      gstring * g = NULL;
+      uschar chunk_len;
+      uschar * s;
+      SPF_dns_rr_t srr = {
+	.domain = CS rr->name,			/* query information */
+	.domain_buf_len = DNS_MAXNAME,
+	.rr_type = rr->type,
+
+	.num_rr = 1,				/* answer information */
+	.rr = NULL,
+	.rr_buf_len = 0,
+	.rr_buf_num = 0,
+	.ttl = rr->ttl,
+	.utc_ttl = 0,
+	.herrno = NETDB_SUCCESS,
+
+	.hook = NULL,				/* misc information */
+	.source = spf_dns_server
+      };
+
+      for (int off = 0; off < rr->size; off += chunk_len)
+	{
+	chunk_len = (rr->data)[off++];
+	g = string_catn(g, US ((rr->data)+off), chunk_len);
+	}
+      if (!g)
+	{
+	HDEBUG(D_host_lookup) debug_printf("IP address lookup yielded an "
+	  "empty name: treated as non-existent host name\n");
+	continue;
+	}
+      gstring_release_unused(g);
+      s = string_copy_malloc(string_from_gstring(g));
+      srr.rr = (void *) &s;
+
+      /* spfrr->rr must have been malloc()d for this */
+      SPF_dns_rr_dup(&spfrr, &srr);
+
+      return spfrr;
+      }
+
+SPF_dns_rr_dup(&spfrr, spf_nxdomain);
+return spfrr;
+}
+
+
+
+SPF_dns_server_t *
+SPF_dns_exim_new(int debug)
+{
+SPF_dns_server_t *spf_dns_server;
+
+DEBUG(D_receive) debug_printf("SPF_dns_exim_new\n");
+
+if (!(spf_dns_server = malloc(sizeof(SPF_dns_server_t))))
+  return NULL;
+memset(spf_dns_server, 0, sizeof(SPF_dns_server_t));
+
+spf_dns_server->destroy      = NULL;
+spf_dns_server->lookup       = SPF_dns_exim_lookup;
+spf_dns_server->get_spf      = NULL;
+spf_dns_server->get_exp      = NULL;
+spf_dns_server->add_cache    = NULL;
+spf_dns_server->layer_below  = NULL;
+spf_dns_server->name         = "exim";
+spf_dns_server->debug        = debug;
+
+/* XXX This might have to return NO_DATA sometimes. */
+
+spf_nxdomain = SPF_dns_rr_new_init(spf_dns_server,
+  "", ns_t_any, 24 * 60 * 60, HOST_NOT_FOUND);
+if (!spf_nxdomain)
+  {
+  free(spf_dns_server);
+  return NULL;
+  }
+
+return spf_dns_server;
+}
+
+
 
-/* spf_init sets up a context that can be re-used for several
-   messages on the same SMTP connection (that come from the
-   same host with the same HELO string)
 
-Return: Boolean success */
+/* Construct the SPF library stack.
+   Return: Boolean success.
+*/
 
 BOOL
-spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr)
+spf_init(void)
 {
-spf_server = SPF_server_new(SPF_DNS_CACHE, 0);
+SPF_dns_server_t * dc;
+int debug = 0;
+
+DEBUG(D_receive) debug = 1;
+
+/* We insert our own DNS access layer rather than letting the spf library
+do it, so that our dns access path is used for debug tracing and for the
+testsuite. */
 
-if (!spf_server)
+if (!(dc = SPF_dns_exim_new(debug)))
+  {
+  DEBUG(D_receive) debug_printf("spf: SPF_dns_exim_new() failed\n");
+  return FALSE;
+  }
+if (!(dc = SPF_dns_cache_new(dc, NULL, debug, 8)))
+  {
+  DEBUG(D_receive) debug_printf("spf: SPF_dns_cache_new() failed\n");
+  return FALSE;
+  }
+if (!(spf_server = SPF_server_new_dns(dc, debug)))
   {
   DEBUG(D_receive) debug_printf("spf: SPF_server_new() failed.\n");
   return FALSE;
   }
+return TRUE;
+}
+
+
+/* Set up a context that can be re-used for several
+   messages on the same SMTP connection (that come from the
+   same host with the same HELO string).
+
+Return: Boolean success
+*/
+
+BOOL
+spf_conn_init(uschar * spf_helo_domain, uschar * spf_remote_addr)
+{
+DEBUG(D_receive)
+  debug_printf("spf_conn_init: %s %s\n", spf_helo_domain, spf_remote_addr);
+
+if (!spf_server && !spf_init()) return FALSE;
 
 if (SPF_server_set_rec_dom(spf_server, CS primary_hostname))
   {
@@ -98,6 +233,8 @@ const uschar *list = *listptr;
 uschar *spf_result_id;
 int rc = SPF_RESULT_PERMERROR;
 
+DEBUG(D_receive) debug_printf("spf_process\n");
+
 if (!(spf_server && spf_request))
   /* no global context, assume temp error and skip to evaluation */
   rc = SPF_RESULT_PERMERROR;