Merge branch 'master' of ssh://git.exim.org/home/git/exim

[exim.git] / src / src / spf.c

diff --git a/src/src/spf.c b/src/src/spf.c
index 48150eb01ba0ccf880c0ab7172e72fffecab9661..7167f5778c511d1f90c1dd1f3951ee9119b939cf 100644 (file)
--- a/src/src/spf.c
+++ b/src/src/spf.c
@@ -1,11 +1,9 @@
-/* $Cambridge: exim/src/src/spf.c,v 1.6 2005/06/27 15:28:45 tom Exp $ */
-

 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /* Experimental SPF support.
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /* Experimental SPF support.

-   Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
+   Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004 - 2014

    License: GPL */
 
 /* Code for calling spf checks via libspf-alt. Called from acl.c. */
    License: GPL */
 
 /* Code for calling spf checks via libspf-alt. Called from acl.c. */


@@ -21,8 +19,10 @@ static spf_result_id spf_result_id_list[] = {
   { US"fail", 3 },
   { US"softfail", 4 },
   { US"none", 5 },
   { US"fail", 3 },
   { US"softfail", 4 },
   { US"none", 5 },

-  { US"err_temp", 6 },
-  { US"err_perm", 7 }
+  { US"err_temp", 6 },  /* Deprecated Apr 2014 */
+  { US"err_perm", 7 },  /* Deprecated Apr 2014 */
+  { US"temperror", 6 }, /* RFC 4408 defined */
+  { US"permerror", 7 }  /* RFC 4408 defined */

 };
 
 SPF_server_t    *spf_server = NULL;
 };
 
 SPF_server_t    *spf_server = NULL;


@@ -43,17 +43,24 @@ int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
     return 0;
   }
 
     return 0;
   }
 

+  if (SPF_server_set_rec_dom(spf_server, CS primary_hostname)) {
+    debug_printf("spf: SPF_server_set_rec_dom(\"%s\") failed.\n", primary_hostname);
+    spf_server = NULL;
+    return 0;
+  }
+

   spf_request = SPF_request_new(spf_server);
 
   spf_request = SPF_request_new(spf_server);
 

-  if (SPF_request_set_ipv4_str(spf_request, spf_remote_addr)) {
-    debug_printf("spf: SPF_request_set_ipv4_str() failed.\n");
+  if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)
+      && SPF_request_set_ipv6_str(spf_request, CS spf_remote_addr)) {
+    debug_printf("spf: SPF_request_set_ipv4_str() and SPF_request_set_ipv6_str() failed [%s]\n", spf_remote_addr);

     spf_server = NULL;
     spf_request = NULL;
     return 0;
   }
 
     spf_server = NULL;
     spf_request = NULL;
     return 0;
   }
 

-  if (SPF_request_set_helo_dom(spf_request, spf_helo_domain)) {
-    debug_printf("spf: SPF_set_helo_dom() failed.\n");
+  if (SPF_request_set_helo_dom(spf_request, CS spf_helo_domain)) {
+    debug_printf("spf: SPF_set_helo_dom(\"%s\") failed.\n", spf_helo_domain);

     spf_server = NULL;
     spf_request = NULL;
     return 0;
     spf_server = NULL;
     spf_request = NULL;
     return 0;


@@ -67,7 +74,7 @@ int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) {
    context (if any), retrieves the result, sets up expansion
    strings and evaluates the condition outcome. */
 
    context (if any), retrieves the result, sets up expansion
    strings and evaluates the condition outcome. */
 

-int spf_process(uschar **listptr, uschar *spf_envelope_sender) {
+int spf_process(uschar **listptr, uschar *spf_envelope_sender, int action) {

   int sep = 0;
   uschar *list = *listptr;
   uschar *spf_result_id;
   int sep = 0;
   uschar *list = *listptr;
   uschar *spf_result_id;


@@ -80,14 +87,17 @@ int spf_process(uschar **listptr, uschar *spf_envelope_sender) {
     goto SPF_EVALUATE;
   };
 
     goto SPF_EVALUATE;
   };
 

-  if (SPF_request_set_env_from(spf_request, spf_envelope_sender)) {
+  if (SPF_request_set_env_from(spf_request, CS spf_envelope_sender)) {

     /* Invalid sender address. This should be a real rare occurence */
     rc = SPF_RESULT_PERMERROR;
     goto SPF_EVALUATE;
   }
 
   /* get SPF result */
     /* Invalid sender address. This should be a real rare occurence */
     rc = SPF_RESULT_PERMERROR;
     goto SPF_EVALUATE;
   }
 
   /* get SPF result */

-  SPF_request_query_mailfrom(spf_request, &spf_response);
+  if (action == SPF_PROCESS_FALLBACK)
+    SPF_request_query_fallback(spf_request, &spf_response, CS spf_guess);
+  else
+    SPF_request_query_mailfrom(spf_request, &spf_response);

 
   /* set up expansion items */
   spf_header_comment     = (uschar *)SPF_response_get_header_comment(spf_response);
 
   /* set up expansion items */
   spf_header_comment     = (uschar *)SPF_response_get_header_comment(spf_response);


@@ -100,6 +110,10 @@ int spf_process(uschar **listptr, uschar *spf_envelope_sender) {
   /* We got a result. Now see if we should return OK or FAIL for it */
   SPF_EVALUATE:
   debug_printf("SPF result is %s (%d)\n", SPF_strresult(rc), rc);
   /* We got a result. Now see if we should return OK or FAIL for it */
   SPF_EVALUATE:
   debug_printf("SPF result is %s (%d)\n", SPF_strresult(rc), rc);

+
+  if (action == SPF_PROCESS_GUESS && (!strcmp (SPF_strresult(rc), "none")))
+    return spf_process(listptr, spf_envelope_sender, SPF_PROCESS_FALLBACK);
+

   while ((spf_result_id = string_nextinlist(&list, &sep,
                                      spf_result_id_buffer,
                                      sizeof(spf_result_id_buffer))) != NULL) {
   while ((spf_result_id = string_nextinlist(&list, &sep,
                                      spf_result_id_buffer,
                                      sizeof(spf_result_id_buffer))) != NULL) {