X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/eac732adbd59b15f10f4db14414dd1405b488e65..5c161fa615ab4a2d40170fedd71d1b9a7f079ff6:/src/src/lookups/spf.c diff --git a/src/src/lookups/spf.c b/src/src/lookups/spf.c index 8b846ba55..179b3a648 100644 --- a/src/src/lookups/spf.c +++ b/src/src/lookups/spf.c @@ -2,82 +2,121 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* - * Exim - SPF lookup module using libspf2 - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * Copyright (c) 2005 Chris Webb, Arachsys Internet Services Ltd - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - */ +/* Exim - SPF lookup module using libspf2 + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Copyright (c) 2005 Chris Webb, Arachsys Internet Services Ltd + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +Copyright (c) The Exim Maintainers 2020 +*/ #include "../exim.h" -#ifndef EXPERIMENTAL_SPF +#ifndef SUPPORT_SPF static void dummy(int x); static void dummy2(int x) { dummy(x-1); } static void dummy(int x) { dummy2(x-1); } #else #include "lf_functions.h" -#ifndef HAVE_NS_TYPE -#define HAVE_NS_TYPE +#if !defined(HAVE_NS_TYPE) && defined(NS_INADDRSZ) +# define HAVE_NS_TYPE #endif #include #include #include +extern SPF_dns_server_t * SPF_dns_exim_new(int); + + static void * -spf_open(uschar *filename, uschar **errmsg) +spf_open(const uschar * filename, uschar ** errmsg) { - SPF_server_t *spf_server = NULL; - spf_server = SPF_server_new(SPF_DNS_CACHE, 0); - if (spf_server == NULL) { - *errmsg = US"SPF_server_new() failed"; - return NULL; +SPF_dns_server_t * dc; +SPF_server_t *spf_server = NULL; +int debug = 0; + +DEBUG(D_lookup) debug = 1; + +if ((dc = SPF_dns_exim_new(debug))) + if ((dc = SPF_dns_cache_new(dc, NULL, debug, 8))) + spf_server = SPF_server_new_dns(dc, debug); + +if (!spf_server) + { + *errmsg = US"SPF_dns_exim_nnew() failed"; + return NULL; } - return (void *) spf_server; +return (void *) spf_server; } + static void spf_close(void *handle) { - SPF_server_t *spf_server = handle; - if (spf_server) SPF_server_free(spf_server); +SPF_server_t *spf_server = handle; +if (spf_server) SPF_server_free(spf_server); } static int -spf_find(void *handle, uschar *filename, const uschar *keystring, int key_len, - uschar **result, uschar **errmsg, uint *do_cache) +spf_find(void * handle, const uschar * filename, const uschar * keystring, + int key_len, uschar ** result, uschar ** errmsg, uint * do_cache, + const uschar * opts) { - SPF_server_t *spf_server = handle; - SPF_request_t *spf_request = NULL; - SPF_response_t *spf_response = NULL; +SPF_server_t *spf_server = handle; +SPF_request_t *spf_request; +SPF_response_t *spf_response = NULL; + +if (!(spf_request = SPF_request_new(spf_server))) + { + *errmsg = US"SPF_request_new() failed"; + return FAIL; + } + +#if HAVE_IPV6 +switch (string_is_ip_address(filename, NULL)) +#else +switch (4) +#endif + { + case 4: + if (!SPF_request_set_ipv4_str(spf_request, CS filename)) + break; + *errmsg = string_sprintf("invalid IPv4 address '%s'", filename); + return FAIL; +#if HAVE_IPV6 - spf_request = SPF_request_new(spf_server); - if (spf_request == NULL) { - *errmsg = US"SPF_request_new() failed"; + case 6: + if (!SPF_request_set_ipv6_str(spf_request, CS filename)) + break; + *errmsg = string_sprintf("invalid IPv6 address '%s'", filename); return FAIL; - } - if (SPF_request_set_ipv4_str(spf_request, CS filename)) { + default: *errmsg = string_sprintf("invalid IP address '%s'", filename); return FAIL; +#endif } - if (SPF_request_set_env_from(spf_request, CS keystring)) { - *errmsg = string_sprintf("invalid envelope from address '%s'", keystring); - return FAIL; - } - SPF_request_query_mailfrom(spf_request, &spf_response); - *result = string_copy(US SPF_strresult(SPF_response_result(spf_response))); - SPF_response_free(spf_response); - SPF_request_free(spf_request); - return OK; +if (SPF_request_set_env_from(spf_request, CS keystring)) + { + *errmsg = string_sprintf("invalid envelope from address '%s'", keystring); + return FAIL; +} + +SPF_request_query_mailfrom(spf_request, &spf_response); +*result = string_copy(US SPF_strresult(SPF_response_result(spf_response))); + +DEBUG(D_lookup) spf_response_debug(spf_response); + +SPF_response_free(spf_response); +SPF_request_free(spf_request); +return OK; } @@ -99,15 +138,15 @@ fprintf(f, "Library version: SPF: Exim version %s\n", EXIM_VERSION_STR); static lookup_info _lookup_info = { - US"spf", /* lookup name */ - 0, /* not absfile, not query style */ - spf_open, /* open function */ - NULL, /* no check function */ - spf_find, /* find function */ - spf_close, /* close function */ - NULL, /* no tidy function */ - NULL, /* no quoting function */ - spf_version_report /* version reporting */ + .name = US"spf", /* lookup name */ + .type = 0, /* not absfile, not query style */ + .open = spf_open, /* open function */ + .check = NULL, /* no check function */ + .find = spf_find, /* find function */ + .close = spf_close, /* close function */ + .tidy = NULL, /* no tidy function */ + .quote = NULL, /* no quoting function */ + .version_report = spf_version_report /* version reporting */ }; #ifdef DYNLOOKUP @@ -117,4 +156,4 @@ static lookup_info _lookup_info = { static lookup_info *_lookup_list[] = { &_lookup_info }; lookup_module_info spf_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 }; -#endif /* EXPERIMENTAL_SPF */ +#endif /* SUPPORT_SPF */