dnsbl: src/dnsbl.cpp annotate

annotate src/dnsbl.cpp @ 419:91f2a127ec69 stable-6-0-57

spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro

author	Carl Byington <carl@five-ten-sg.com>
date	Wed, 26 Apr 2017 09:20:35 -0700
parents	16451edcb962
children	1b7a785610f5

rev	line source
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1 /*
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	2
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	3 Copyright (c) 2013 Carl Byington - 510 Software Group, released under
152 c7fc218686f5 gpl3, block mail to recipients that cannot reply carl parents: 150 diff changeset	4 the GPL version 3 or any later version at your choice available at
c7fc218686f5 gpl3, block mail to recipients that cannot reply carl parents: 150 diff changeset	5 http://www.gnu.org/licenses/gpl-3.0.txt
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	6
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	7 Based on a sample milter Copyright (c) 2000-2003 Sendmail, Inc. and its
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	8 suppliers. Inspired by the DCC by Rhyolite Software
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	9
177 a4d313c2460b start embedded dcc filtering carl parents: 174 diff changeset	10 -b port The port used to talk to the dcc interface daemon
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	11 -r port The port used to talk to our internal dns resolver processes
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	12 -p port The port through which the MTA will connect to this milter.
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	13 -t sec The timeout value.
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	14 -c Check the config, and print a copy to stdout. Don't start the
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	15 milter or do anything with the socket.
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	16 -s Stress test by loading and deleting the current config in a loop.
163 97d7da45fe2a spamassassin changes carl parents: 162 diff changeset	17 -d level set the debug level
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	18 -e f\|t Print the results of looking up from address f and to address
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	19 t in the current config
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	20
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	21 */
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	22
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	23
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	24 // from sendmail sample
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	25 #include <sys/types.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	26 #include <sys/stat.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	27 #include <errno.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	28 #include <sysexits.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	29 #include <unistd.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	30
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	31 // needed for socket io
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	32 #include <sys/ioctl.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	33 #include <net/if.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	34 #include <arpa/inet.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	35 #include <netinet/in.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	36 #include <netinet/tcp.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	37 #include <netdb.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	38 #include <sys/socket.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	39 #include <sys/un.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	40
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	41 // needed for thread
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	42 #include <pthread.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	43
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	44 // needed for std c++ collections
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	45 #include <set>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	46 #include <map>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	47 #include <list>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	48
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	49 // for the dns resolver
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	50 #include <netinet/in.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	51 #include <arpa/nameser.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	52 #include <resolv.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	53
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	54 // misc stuff needed here
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	55 #include <ctype.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	56 #include <syslog.h>
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	57 #include <pwd.h>
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	58 #include <sys/wait.h> /* header for waitpid() and various macros */
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	59 #include <signal.h> /* header for signal functions */
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	60
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	61 #include "includes.h"
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	62
211 4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context. Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	63 #ifndef HAVE_DAEMON
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context. Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	64 #include "daemon.h"
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context. Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	65 #include "daemon.c"
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context. Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	66 #endif
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	67
227 3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	68 #ifndef HAVE_MEMRCHR
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	69 void memrchr(const void a, int c, size_t len);
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	70 void memrchr(const void a, int c, size_t len) {
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	71 const unsigned char p = (const unsigned char )a;
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	72 for (p += len-1; (const void *)p >= a; p--)
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	73 if (*p == c)
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	74 return (void *)p;
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	75 return (void *)0;
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	76 }
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	77 #endif
3fee608becbc Fixes to compile on old systems without memrchr or string::clear(). Carl Byington <carl@five-ten-sg.com> parents: 225 diff changeset	78
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	79 extern "C" {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	80 sfsistat mlfi_connect(SMFICTX ctx, char hostname, _SOCK_ADDR *hostaddr);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	81 sfsistat mlfi_helo(SMFICTX * ctx, char *helohost);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	82 sfsistat mlfi_envfrom(SMFICTX ctx, char *argv);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	83 sfsistat mlfi_envrcpt(SMFICTX ctx, char *argv);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	84 sfsistat mlfi_header(SMFICTX* ctx, char* headerf, char* headerv);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	85 sfsistat mlfi_body(SMFICTX ctx, u_char data, size_t len);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	86 sfsistat mlfi_eom(SMFICTX *ctx);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	87 sfsistat mlfi_abort(SMFICTX *ctx);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	88 sfsistat mlfi_close(SMFICTX *ctx);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	89 void sig_chld(int signo);
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	90 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	91
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	92 int debug_syslog = 0;
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	93 bool syslog_opened = false;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	94 bool use_syslog = true; // false to printf
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	95 bool loader_run = true; // used to stop the config loader thread
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	96 CONFIG *config = NULL; // protected by the config_mutex
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	97 int generation = 0; // protected by the config_mutex
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	98 const int maxlen = 1000; // used for snprintf buffers
235 e6c66640f6f9 Add SRS decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 233 diff changeset	99 regex_t srs_pattern; // used to detect srs coding in mail addresses
246 8b0f16abee53 Add prvs decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 244 diff changeset	100 regex_t prvs_pattern; // used to detect prvs coding in mail addresses
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	101 regex_t dkim_r_pattern; // used to detect dkim signatures authenticated by the upstream opendkim milter
f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	102 regex_t dkim_s_pattern; // used to detect dkim signatures generated by the upstream opendkim milter
322 9f8411f3919c add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 321 diff changeset	103 regex_t from_pattern; // used to extract the senders mail domain from the body from: header
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	104
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	105 pthread_mutex_t config_mutex;
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	106 pthread_mutex_t syslog_mutex;
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	107 pthread_mutex_t resolve_mutex;
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	108 pthread_mutex_t fd_pool_mutex;
136 f4746d8a12a3 add smtp auth rate limits carl parents: 134 diff changeset	109 pthread_mutex_t rate_mutex;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	110
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	111 std::set<int> fd_pool;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	112 int NULL_SOCKET = -1;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	113 const time_t ERROR_SOCKET_TIME = 60; // number of seconds between attempts to open a socket to the dns resolver process
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	114 const char *resolver_port = NULL; // unix domain socket to talk to the dns resolver process
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	115 int resolver_socket = NULL_SOCKET; // socket used to listen for resolver requests
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	116 const char *dccifd_port = NULL; // unix domain socket to talk to the dcc interface daemon
248 b0738685bf51 latest tld list; fix uninitialized variable Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	117 time_t last_error_time = 0;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	118 int resolver_sock_count = 0; // protected with fd_pool_mutex
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	119 int resolver_pool_size = 0; // protected with fd_pool_mutex
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	120 rates rcpt_hourly_counts; // protected with rate_mutex
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	121 rates rcpt_daily_counts; // protected with rate_mutex
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	122 auth_addresses auth_hourly_addresses; // protected with rate_mutex
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	123 auth_addresses auth_daily_addresses; // protected with rate_mutex
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	124
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	125
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	126
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	127 ns_map::~ns_map() {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	128 for (string_map::iterator i=ns_host.begin(); i!=ns_host.end(); i++) {
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	129 const char x = (i).first;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	130 const char y = (i).second;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	131 free((void*)x);
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	132 free((void*)y);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	133 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	134 ns_ip.clear();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	135 ns_host.clear();
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	136 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	137
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	138
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	139 void ns_map::add(const char name, const char refer) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	140 string_map::iterator i = ns_host.find(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	141 if (i != ns_host.end()) return;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	142 char *x = strdup(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	143 char *y = strdup(refer);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	144 ns_ip[x] = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	145 ns_host[x] = y;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	146
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	147 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	148
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	149 // packed structure to allow a single socket write to dump the
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	150 // length and the following answer. The packing attribute is gcc specific.
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	151 struct glommer {
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	152 size_t length;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	153 #ifdef NS_PACKETSZ
386 e27e22f6a49a start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 385 diff changeset	154 u_char answer[NS_PACKETSZ*8]; // with a resolver, we return resolver answers
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	155 #else
252 836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	156 uint32_t answer; // without a resolver, we return a single ipv4 address in network byte order, 0 == no answer
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	157 #endif
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	158 } __attribute__ ((packed));
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	159
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	160
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	161 ////////////////////////////////////////////////
136 f4746d8a12a3 add smtp auth rate limits carl parents: 134 diff changeset	162 // helper to manipulate recipient counts
f4746d8a12a3 add smtp auth rate limits carl parents: 134 diff changeset	163 //
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	164 void incr_rcpt_count(const char *user, int &hourly, int &daily);
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	165 void incr_rcpt_count(const char *user, int &hourly, int &daily) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	166 pthread_mutex_lock(&rate_mutex);
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	167 rates::iterator i = rcpt_hourly_counts.find(user);
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	168 hourly = 1;
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	169 if (i == rcpt_hourly_counts.end()) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	170 user = strdup(user);
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	171 rcpt_hourly_counts[user] = hourly;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	172 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	173 else {
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	174 hourly = ++((*i).second);
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	175 }
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	176
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	177 rates::iterator j = rcpt_daily_counts.find(user);
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	178 daily = 1;
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	179 if (j == rcpt_daily_counts.end()) {
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	180 user = strdup(user);
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	181 rcpt_daily_counts[user] = daily;
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	182 }
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	183 else {
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	184 daily = ++((*j).second);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	185 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	186 pthread_mutex_unlock(&rate_mutex);
136 f4746d8a12a3 add smtp auth rate limits carl parents: 134 diff changeset	187 }
f4746d8a12a3 add smtp auth rate limits carl parents: 134 diff changeset	188
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	189
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	190 void add_auth_address(const char *user, int &hourly, int &daily, uint32_t ip);
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	191 void add_auth_address(const char *user, int &hourly, int &daily, uint32_t ip) {
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	192 pthread_mutex_lock(&rate_mutex);
280 2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	193 auth_addresses::iterator i = auth_hourly_addresses.find(user);
2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	194 if (i == auth_hourly_addresses.end()) {
2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	195 user = strdup(user);
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	196 auth_hourly_addresses[user] = new uint32_t_set;
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	197 auth_hourly_addresses[user]->insert(ip);
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	198 hourly = 1;
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	199 }
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	200 else {
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	201 uint32_t_set::iterator k = ((*i).second)->find(ip);
280 2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	202 if (k == ((i).second)->end()) ((i).second)->insert(ip);
2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	203 hourly = ((*i).second)->size();
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	204 }
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	205
280 2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	206 auth_addresses::iterator j = auth_daily_addresses.find(user);
2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	207 if (j == auth_daily_addresses.end()) {
2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	208 user = strdup(user);
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	209 auth_daily_addresses[user] = new uint32_t_set;
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	210 auth_daily_addresses[user]->insert(ip);
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	211 daily = 1;
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	212 }
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	213 else {
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	214 uint32_t_set::iterator k = ((*j).second)->find(ip);
280 2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	215 if (k == ((j).second)->end()) ((j).second)->insert(ip);
2b77295fb9a7 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 278 diff changeset	216 daily = ((*j).second)->size();
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	217 }
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	218 pthread_mutex_unlock(&rate_mutex);
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	219 }
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	220
136 f4746d8a12a3 add smtp auth rate limits carl parents: 134 diff changeset	221 ////////////////////////////////////////////////
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	222 // helper to discard the strings held by a context_map
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	223 //
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	224 void discard(context_map &cm);
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	225 void discard(context_map &cm) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	226 for (context_map::iterator i=cm.begin(); i!=cm.end(); i++) {
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	227 const char x = (i).first;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	228 free((void*)x);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	229 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	230 cm.clear();
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	231 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	232
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	233
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	234 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	235 // helper to register a string in a context_map
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	236 //
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	237 void register_string(context_map &cm, const char name, CONTEXT con);
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	238 void register_string(context_map &cm, const char name, CONTEXT con) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	239 context_map::iterator i = cm.find(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	240 if (i != cm.end()) return;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	241 char *x = strdup(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	242 cm[x] = con;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	243 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	244
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	245
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	246 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	247 // disconnect the fd from the dns resolver process
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	248 //
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	249 void my_disconnect(int sock, bool decrement = true);
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	250 void my_disconnect(int sock, bool decrement) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	251 if (sock != NULL_SOCKET) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	252 if (decrement) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	253 pthread_mutex_lock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	254 resolver_sock_count--;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	255 pthread_mutex_unlock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	256 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	257 shutdown(sock, SHUT_RDWR);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	258 close(sock);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	259 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	260 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	261
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	262
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	263 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	264 // return fd connected to the dns resolver process
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	265 //
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	266 int my_connect();
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	267 int my_connect() {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	268 // if we have had recent errors, don't even try to open the socket
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	269 if ((time(NULL) - last_error_time) < ERROR_SOCKET_TIME) return NULL_SOCKET;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	270
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	271 // nothing recent, maybe this time it will work
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	272 int sock = NULL_SOCKET;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	273 sockaddr_un server;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	274 memset(&server, '\0', sizeof(server));
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	275 server.sun_family = AF_UNIX;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	276 strncpy(server.sun_path, resolver_port, sizeof(server.sun_path)-1);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	277 sock = socket(AF_UNIX, SOCK_STREAM, 0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	278 if (sock != NULL_SOCKET) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	279 bool rc = (connect(sock, (sockaddr *)&server, sizeof(server)) == 0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	280 if (!rc) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	281 my_disconnect(sock, false);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	282 sock = NULL_SOCKET;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	283 last_error_time = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	284 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	285 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	286 else last_error_time = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	287 if (sock != NULL_SOCKET) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	288 pthread_mutex_lock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	289 resolver_sock_count++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	290 pthread_mutex_unlock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	291 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	292 return sock;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	293 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	294
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	295
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	296 ////////////////////////////////////////////////
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	297 // Ask a dns question and get an A record answer in network byte order.
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	298 // We don't try very hard, just using the default resolver retry settings.
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	299 // If we cannot get an answer, we just accept the mail.
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	300 // If the qtype is ns_t_txt, the answer is placed in my_answer which
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	301 // must be non-null, and the return value can be ignored.
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	302 // A null string is returned in my_answer in the case of errors.
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	303 // If the qtype is ns_t_a, one of the ip addresses is returned in network byte order,
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	304 // and if my_answer is non-null, all the ip addresses are returned in
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	305 // my_answer (in network byte order), prepended with the count.
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	306 // IP address 0 is returned in case of errors.
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	307 //
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	308 uint32_t dns_interface(mlfiPriv &priv, const char question, int qtype, bool maybe_ip, ns_map nameservers, char *my_answer, size_t my_size) {
419 91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	309 // return null string if there are no txt answers
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	310 // return zero count if there are no a answers
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	311 if (my_answer && my_size) memset(my_answer, 0, my_size);
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	312
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	313 // tell sendmail we are still working
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	314 #if _FFR_SMFI_PROGRESS
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	315 if (priv.eom) smfi_progress(priv.ctx);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	316 #endif
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	317
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	318 // this part can be done without locking the resolver mutex. Each
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	319 // milter thread is talking over its own socket to a separate resolver
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	320 // process, which does the actual dns resolution.
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	321 if (priv.err) return 0; // cannot ask more questions on this socket.
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	322 if (maybe_ip && (qtype == ns_t_a)) {
409 e018ed19a1cc require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 402 diff changeset	323 int c = 0;
410 6b03435868cb require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 409 diff changeset	324 const char* q = question;
409 e018ed19a1cc require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 402 diff changeset	325 while (*q) {
e018ed19a1cc require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 402 diff changeset	326 if (*q == '.') c++;
e018ed19a1cc require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 402 diff changeset	327 q++;
e018ed19a1cc require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 402 diff changeset	328 }
e018ed19a1cc require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 402 diff changeset	329 // might be a bare IPv4 address, try this first to avoid dns lookups that may not be needed
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	330 in_addr ip;
409 e018ed19a1cc require 3 dots in bare ip addresses Carl Byington <carl@five-ten-sg.com> parents: 402 diff changeset	331 if ((c == 3) && inet_aton(question, &ip)) {
252 836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	332 return ip.s_addr;
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	333 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	334 }
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	335 int8_t qt = qtype;
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	336 priv.my_write((const char *)&qt, 1);// write the query type
328 b4f766947202 allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 327 diff changeset	337 size_t n = strlen(question);
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	338 if (question[n-1] == '.') {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	339 priv.my_write(question, n+1); // write the question including the null terminator
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	340 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	341 else {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	342 priv.my_write(question, n); // write the question
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	343 priv.my_write(".", 2); // and the fully qualified . terminator and null string terminator
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	344 }
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	345
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	346 glommer glom;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	347 char buf = (char )&glom;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	348 priv.my_read(buf, sizeof(glom.length));
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	349 buf += sizeof(glom.length);
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	350 #ifdef RESOLVER_DEBUG
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	351 char text[1000];
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	352 snprintf(text, sizeof(text), "dns_interface() wrote question %s and has answer length %d", question, glom.length);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	353 my_syslog(text);
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	354 #endif
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	355 if (glom.length == 0) return 0;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	356 if (glom.length > sizeof(glom.answer)) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	357 priv.err = true;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	358 return 0; // cannot process overlarge answers
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	359 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	360 priv.my_read(buf, glom.length);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	361
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	362 #ifdef NS_PACKETSZ
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	363 // now we need to lock the resolver mutex to keep the milter threads from
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	364 // stepping on each other while parsing the dns answer.
252 836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	365 uint32_t ret_address = 0;
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	366 pthread_mutex_lock(&resolve_mutex);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	367 // parse the answer
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	368 ns_msg handle;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	369 ns_rr rr;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	370 if (ns_initparse(glom.answer, glom.length, &handle) == 0) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	371 // look for ns names
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	372 if (nameservers) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	373 ns_map &ns = *nameservers;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	374 int rrnum = 0;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	375 while (ns_parserr(&handle, ns_s_ns, rrnum++, &rr) == 0) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	376 if (ns_rr_type(rr) == ns_t_ns) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	377 char nam[NS_MAXDNAME+1];
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	378 char *n = nam;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	379 const u_char *p = ns_rr_rdata(rr);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	380 while (((n-nam) < NS_MAXDNAME) && ((size_t)(p-glom.answer) < glom.length) && *p) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	381 size_t s = *(p++);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	382 if (s > 191) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	383 // compression pointer
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	384 s = (s-192)256 + (p++);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	385 if (s >= glom.length) break; // pointer outside bounds of answer
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	386 p = glom.answer + s;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	387 s = *(p++);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	388 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	389 if (s > 0) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	390 if ((size_t)(n-nam) >= (NS_MAXDNAME-s)) break; // destination would overflow name buffer
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	391 if ((size_t)(p-glom.answer) >= (glom.length-s)) break; // source outside bounds of answer
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	392 memcpy(n, p, s);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	393 n += s;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	394 p += s;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	395 *(n++) = '.';
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	396 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	397 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	398 if (n-nam) n--; // remove trailing .
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	399 *n = '\0'; // null terminate it
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	400 ns.add(nam, question); // ns host to lookup later
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	401 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	402 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	403 rrnum = 0;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	404 while (ns_parserr(&handle, ns_s_ar, rrnum++, &rr) == 0) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	405 if (ns_rr_type(rr) == ns_t_a) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	406 char* nam = (char*)ns_rr_name(rr);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	407 ns_mapper::iterator i = ns.ns_ip.find(nam);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	408 if (i != ns.ns_ip.end()) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	409 // we want this ip address
252 836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	410 uint32_t address;
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	411 memcpy(&address, ns_rr_rdata(rr), sizeof(address));
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	412 ns.ns_ip[nam] = address;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	413 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	414 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	415 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	416 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	417 int rrnum = 0;
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	418 if (qtype == ns_t_a) {
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	419 uint32_t ans = (uint32_t )my_answer;
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	420 size_t c = 0;
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	421 size_t m = my_size/4; // 1 + max ipv4 addresses that will fit in the answer buffer
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	422 while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) {
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	423 if (ns_rr_type(rr) == qtype) {
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	424 uint32_t address;
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	425 memcpy(&address, ns_rr_rdata(rr), sizeof(address));
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	426 ret_address = address;
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	427 if (ans && (c < m-1)) {
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	428 c++;
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	429 ans[c] = address;
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	430 }
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	431 }
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	432 }
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	433 if (ans && (c < m)) ans[0] = c;
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	434 }
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	435 if ((qtype == ns_t_mx) && (my_answer) && (my_size > 1)) {
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	436 uint32_t c = 0;
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	437 while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) {
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	438 if (ns_rr_type(rr) == qtype) {
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	439 char exchange[NS_MAXDNAME];
415 16451edcb962 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 414 diff changeset	440 //size_t rdlen = ns_rr_rdlen(rr);
16451edcb962 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 414 diff changeset	441 //const uint16_t pri = ns_get16(rdata);
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	442 const unsigned char *rdata = ns_rr_rdata(rr);
419 91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	443 int len = dn_expand(ns_msg_base(handle), ns_msg_base(handle) + ns_msg_size(handle), rdata + NS_INT16SZ, exchange, sizeof(exchange));
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	444 if (len > 0) { // no error
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	445 len = strlen(exchange) + 1;
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	446 if (my_size >= (uint32_t)len+1) {
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	447 strcpy(my_answer, exchange);
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	448 my_answer += len;
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	449 my_size -= len;
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	450 c++;
91f2a127ec69 spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 415 diff changeset	451 }
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	452 }
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	453 }
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	454 }
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	455 *my_answer = '\0'; // final trailing null
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	456 ret_address = htonl(c);
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	457 }
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	458 if ((qtype == ns_t_txt) && (my_answer) && (my_size > 7)) {
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	459 my_answer[0] = '\0'; // return null string if there are no txt answers
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	460 my_size--; // allow room for terminating null;
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	461 while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) {
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	462 if (ns_rr_type(rr) == qtype) {
384 7b7066a51c33 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 382 diff changeset	463 size_t offset = 0;
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	464 size_t rdlen = ns_rr_rdlen(rr);
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	465 const unsigned char *rdata = ns_rr_rdata(rr);
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	466 #ifdef RESOLVER_DEBUG
385 be7355b47051 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 384 diff changeset	467 char text[1000];
be7355b47051 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 384 diff changeset	468 snprintf(text, sizeof(text), "found txt record rdlen = %d", rdlen);
be7355b47051 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 384 diff changeset	469 my_syslog(text);
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	470 #endif
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	471 while ((offset < my_size) && rdlen) {
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	472 size_t slen = size_t(*(rdata++));
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	473 rdlen--;
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	474 size_t m = min(slen, rdlen);
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	475 m = min(m, my_size-offset);
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	476 memcpy(my_answer+offset, rdata, m);
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	477 offset += m;
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	478 rdata += m;
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	479 rdlen -= m;
879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	480 }
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	481 my_answer[offset] = '\0'; // trailing null
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	482 #ifdef RESOLVER_DEBUG
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	483 snprintf(text, sizeof(text), "found txt record %s", my_answer);
385 be7355b47051 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 384 diff changeset	484 my_syslog(text);
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	485 #endif
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	486 if (strncasecmp(my_answer, "v=spf1 ", 7) == 0) break;
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	487 }
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	488 }
414 d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	489 if (strncasecmp(my_answer, "v=spf1 ", 7) != 0) {
d5a1ed33d3ae spf code now handles mx,exists,ptr tags, multiple A records, %{i} macro Carl Byington <carl@five-ten-sg.com> parents: 410 diff changeset	490 my_answer[0] = '\0'; // return null string if there are no spf1 txt answers
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	491 }
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	492 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	493 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	494 pthread_mutex_unlock(&resolve_mutex);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	495 #ifdef RESOLVER_DEBUG
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	496 snprintf(text, sizeof(text), "dns_interface() found ip %d", ret_address);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	497 my_syslog(text);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	498 #endif
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	499 return ret_address;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	500 #else
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	501 return glom.answer;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	502 #endif
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	503 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	504
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	505
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	506 ////////////////////////////////////////////////
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	507 // lookup a hostname on the uribl
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	508 //
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	509 // if we find hostname on the uribl, return true and point found to hostname
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	510 // as a string registered in hosts.
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	511 // otherwise, return false and preserve the value of found.
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	512 //
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	513 bool uriblookup(mlfiPriv &priv, string_set &hosts, const char hostname, const char &found) ;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	514 bool uriblookup(mlfiPriv &priv, string_set &hosts, const char hostname, const char &found) {
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	515 char buf[maxlen];
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	516 snprintf(buf, sizeof(buf), "%s.%s.", hostname, priv.uribl_suffix);
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	517 uint32_t ip = ntohl(dns_interface(priv, buf, ns_t_a));
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	518 if (ip and (ip != 0x7f000000)) {
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	519 if (debug_syslog > 2) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	520 char tmp[maxlen];
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	521 snprintf(tmp, sizeof(tmp), "found %s on %s", hostname, priv.uribl_suffix);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	522 my_syslog(tmp);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	523 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	524 found = register_string(hosts, hostname);
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	525 return true;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	526 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	527 return false;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	528 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	529
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	530
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	531 ////////////////////////////////////////////////
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	532 // uribl checker
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	533 // -------------
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	534 // hostname MUST not have a trailing dot. Find the tld part of
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	535 // the hostname, and add one more level. If that is listed on
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	536 // the uribl, return true and point found to the part of the
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	537 // hostname that we found as a string registered in hosts.
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	538 // Otherwise, return false and preserve the value of found.
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	539 //
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	540 bool check_uribl(mlfiPriv &priv, string_set &hosts, const char hostname, const char &found) ;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	541 bool check_uribl(mlfiPriv &priv, string_set &hosts, const char hostname, const char &found) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	542 in_addr ip;
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	543 if (inet_aton(hostname, &ip)) return false; // don't check ip addresses in uribls
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	544 const char* components[maxlen];
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	545 int n = 0; // number of components in the hostname
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	546 while (n < maxlen) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	547 components[n++] = hostname;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	548 const char *c = strchr(hostname, '.');
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	549 if (!c) break;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	550 hostname = c+1;
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	551 }
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	552 string_set *tlds = priv.memory->get_tlds();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	553 string_set *tldwilds = priv.memory->get_tldwilds();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	554 string_set *tldnots = priv.memory->get_tldnots();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	555 string_set::iterator xtlds = tlds->end();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	556 string_set::iterator xtldwilds = tldwilds->end();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	557 string_set::iterator xtldnots = tldnots->end();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	558 for (int i=max(0,n-4); i<n; i++) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	559 const char* name = components[i];
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	560 bool rc = false;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	561 string_set::iterator tt = tldnots->find(name);
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	562 if (tt != xtldnots) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	563 rc = true;
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	564 }
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	565 else {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	566 tt = tldwilds->find(name);
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	567 if (tt != xtldwilds) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	568 if (i > 1) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	569 rc = true;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	570 name = components[i-2];
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	571 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	572 else return false;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	573 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	574 else {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	575 tt = tlds->find(name);
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	576 if (tt != xtlds) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	577 if (i > 0) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	578 rc = true;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	579 name = components[i-1];
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	580 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	581 else return false;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	582 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	583 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	584 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	585 if (rc) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	586 return uriblookup(priv, hosts, name, found);
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	587 }
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	588 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	589 return false;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	590 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	591
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	592
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	593 mlfiPriv::mlfiPriv() {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	594 pthread_mutex_lock(&config_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	595 pc = config;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	596 pc->reference_count++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	597 pthread_mutex_unlock(&config_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	598 get_fd();
230 ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	599 ctx = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	600 eom = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	601 ip = 0;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	602 helo = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	603 mailaddr = NULL;
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	604 origaddr = NULL;
321 e172dc10fe24 add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 311 diff changeset	605 fromaddr = NULL;
e172dc10fe24 add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 311 diff changeset	606 header_count = 0;
322 9f8411f3919c add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 321 diff changeset	607 dkim_ok = true;
230 ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	608 queueid = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	609 authenticated = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	610 client_name = NULL;
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	611 client_dns_name = NULL;
268 f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	612 client_dns_forged = false;
238 7b818a4e21a4 produce correct uribl message Carl Byington <carl@five-ten-sg.com> parents: 236 diff changeset	613 host_uribl = NULL;
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	614 helo_uribl = false;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	615 client_uribl = false;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	616 from_uribl = false;
230 ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	617 have_whites = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	618 only_whites = true;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	619 want_spamassassin = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	620 want_dccgrey = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	621 want_dccbulk = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	622 allow_autowhitelisting = true;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	623 content_context = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	624 memory = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	625 scanner = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	626 content_suffix = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	627 content_message = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	628 uribl_suffix = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	629 uribl_message = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	630 content_host_ignore = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	631 assassin = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	632 dccifd = NULL;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	633 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	634
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	635 mlfiPriv::~mlfiPriv() {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	636 return_fd();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	637 pthread_mutex_lock(&config_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	638 pc->reference_count--;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	639 bool last = (!pc->reference_count) && (pc != config);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	640 pthread_mutex_unlock(&config_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	641 if (last) delete pc; // free this config, since we were the last reference to it
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	642 if (helo) free((void*)helo);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	643 reset(true);
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	644 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	645
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	646 void mlfiPriv::reset(bool final) {
194 688ec12a3c0c delay autowhitelisting to avoid out of office reply bots carl parents: 193 diff changeset	647 while (!delayer.empty()) {
231 4d6bd04d93fa Fix memory leak in suppressed auto whitelisting. Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	648 DELAYWHITEP dwp = delayer.front();
4d6bd04d93fa Fix memory leak in suppressed auto whitelisting. Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	649 const char *loto = dwp->get_loto();
4d6bd04d93fa Fix memory leak in suppressed auto whitelisting. Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	650 if (loto) free((void*)loto);
193 3ea79ef741a0 delay autowhitelisting to avoid out of office reply bots carl parents: 192 diff changeset	651 delete dwp;
3ea79ef741a0 delay autowhitelisting to avoid out of office reply bots carl parents: 192 diff changeset	652 delayer.pop_front();
3ea79ef741a0 delay autowhitelisting to avoid out of office reply bots carl parents: 192 diff changeset	653 }
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	654 if (mailaddr) free((void*)mailaddr);
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	655 if (origaddr) free((void*)origaddr);
321 e172dc10fe24 add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 311 diff changeset	656 if (fromaddr) free((void*)fromaddr);
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	657 if (queueid) free((void*)queueid);
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	658 if (authenticated) free((void*)authenticated);
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	659 if (client_name) free((void*)client_name);
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	660 if (client_dns_name) free((void*)client_dns_name);
326 5e4b5540c8cc allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 325 diff changeset	661 discard(dkim_signers);
238 7b818a4e21a4 produce correct uribl message Carl Byington <carl@five-ten-sg.com> parents: 236 diff changeset	662 discard(hosts_uribl);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	663 delayer.clear();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	664 discard(env_to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	665 if (memory) delete memory;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	666 if (scanner) delete scanner;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	667 if (assassin) delete assassin;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	668 if (dccifd) delete dccifd;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	669 if (!final) {
230 ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	670 ctx = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	671 eom = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	672 mailaddr = NULL;
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	673 origaddr = NULL;
321 e172dc10fe24 add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 311 diff changeset	674 fromaddr = NULL;
e172dc10fe24 add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 311 diff changeset	675 header_count = 0;
322 9f8411f3919c add dkim white/black listing Carl Byington <carl@five-ten-sg.com> parents: 321 diff changeset	676 dkim_ok = true;
230 ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	677 queueid = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	678 authenticated = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	679 client_name = NULL;
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	680 client_dns_name = NULL;
238 7b818a4e21a4 produce correct uribl message Carl Byington <carl@five-ten-sg.com> parents: 236 diff changeset	681 host_uribl = NULL;
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	682 helo_uribl = false;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	683 client_uribl = false;
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	684 from_uribl = false;
230 ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	685 have_whites = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	686 only_whites = true;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	687 want_spamassassin = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	688 want_dccgrey = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	689 want_dccbulk = false;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	690 allow_autowhitelisting = true;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	691 content_context = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	692 memory = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	693 scanner = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	694 content_suffix = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	695 content_message = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	696 uribl_suffix = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	697 uribl_message = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	698 content_host_ignore = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	699 assassin = NULL;
ad38575e98ca Prevent auto whitelisting due to outgoing multipart/report delivery notifications. Carl Byington <carl@five-ten-sg.com> parents: 227 diff changeset	700 dccifd = NULL;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	701 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	702 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	703
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	704 void mlfiPriv::get_fd() {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	705 err = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	706 fd = NULL_SOCKET;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	707 int result = pthread_mutex_lock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	708 if (!result) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	709 std::set<int>::iterator i;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	710 i = fd_pool.begin();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	711 if (i != fd_pool.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	712 // have at least one fd in the pool
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	713 err = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	714 fd = *i;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	715 fd_pool.erase(fd);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	716 resolver_pool_size--;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	717 pthread_mutex_unlock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	718 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	719 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	720 // pool is empty, get a new fd
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	721 pthread_mutex_unlock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	722 fd = my_connect();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	723 err = (fd == NULL_SOCKET);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	724 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	725 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	726 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	727 // cannot lock the pool, just get a new fd
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	728 fd = my_connect();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	729 err = (fd == NULL_SOCKET);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	730 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	731 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	732
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	733 void mlfiPriv::return_fd() {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	734 if (err) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	735 // this fd got a socket error, so close it, rather than returning it to the pool
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	736 my_disconnect(fd);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	737 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	738 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	739 int result = pthread_mutex_lock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	740 if (!result) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	741 if ((resolver_sock_count > resolver_pool_size*5) \|\| (resolver_pool_size < 5)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	742 // return the fd to the pool
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	743 fd_pool.insert(fd);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	744 resolver_pool_size++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	745 pthread_mutex_unlock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	746 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	747 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	748 // more than 20% of the open resolver sockets are in the pool, and the
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	749 // pool as at least 5 sockets. that is enough, so just close this one.
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	750 pthread_mutex_unlock(&fd_pool_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	751 my_disconnect(fd);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	752 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	753 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	754 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	755 // could not lock the pool, so just close the fd
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	756 my_disconnect(fd);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	757 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	758 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	759 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	760
177 a4d313c2460b start embedded dcc filtering carl parents: 174 diff changeset	761 size_t mlfiPriv::my_write(const char *buf, size_t len) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	762 if (err) return 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	763 size_t rs = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	764 while (len) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	765 size_t ws = write(fd, buf, len);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	766 if (ws > 0) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	767 rs += ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	768 len -= ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	769 buf += ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	770 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	771 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	772 // peer closed the socket!
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	773 rs = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	774 err = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	775 break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	776 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	777 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	778 return rs;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	779 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	780
177 a4d313c2460b start embedded dcc filtering carl parents: 174 diff changeset	781 size_t mlfiPriv::my_read(char *buf, size_t len) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	782 if (err) return 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	783 size_t rs = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	784 while (len) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	785 size_t ws = read(fd, buf, len);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	786 if (ws > 0) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	787 rs += ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	788 len -= ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	789 buf += ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	790 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	791 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	792 // peer closed the socket!
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	793 rs = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	794 err = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	795 break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	796 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	797 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	798 return rs;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	799 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	800
377 7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	801 const char *mlfiPriv::check_uribl_signers() {
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	802 if (uribl_suffix) {
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	803 for (string_set::iterator s=dkim_signers.begin(); s!=dkim_signers.end(); s++) {
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	804 if (check_uribl(this, hosts_uribl, s, host_uribl)) return host_uribl;
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	805 }
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	806 }
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	807 return NULL;
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	808 }
7fd39f029936 reject if dkim signer is listed on surbl Carl Byington <carl@five-ten-sg.com> parents: 366 diff changeset	809
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	810 void mlfiPriv::need_content_filter(CONTEXT &con) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	811 if (!memory) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	812 // first recipient that needs content filtering sets
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	813 // some of the content filtering parameters
270 f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists Carl Byington <carl@five-ten-sg.com> parents: 268 diff changeset	814 memory = new recorder(this, con.get_html_tags(), con.get_content_tlds(), con.get_content_tldwilds(), con.get_content_tldnots());
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	815 scanner = new url_scanner(memory);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	816 content_suffix = con.get_content_suffix();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	817 content_message = con.get_content_message();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	818 uribl_suffix = con.get_uribl_suffix();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	819 uribl_message = con.get_uribl_message();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	820 content_host_ignore = &con.get_content_host_ignore();
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	821 // if we are using uribl, test helo and client names here
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	822 if (uribl_suffix) {
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	823 if (helo) {
238 7b818a4e21a4 produce correct uribl message Carl Byington <carl@five-ten-sg.com> parents: 236 diff changeset	824 helo_uribl = check_uribl(*this, hosts_uribl, helo, host_uribl);
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	825 }
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	826 if (client_dns_name && !helo_uribl) {
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	827 client_uribl = check_uribl(*this, hosts_uribl, client_dns_name, host_uribl);
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	828 }
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	829 if (mailaddr && !client_uribl) {
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	830 const char *f = strchr(mailaddr, '@');
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	831 if (f) from_uribl = check_uribl(*this, hosts_uribl, f+1, host_uribl);
236 c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	832 }
c0d2e99c0a1d Add surbl checks on the smtp helo value, client reverse dns name, and mail from domain name Carl Byington <carl@five-ten-sg.com> parents: 235 diff changeset	833 }
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	834 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	835 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	836
186 2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	837
2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	838 mlfiPriv* fetch_priv_from_ctx(SMFICTX *ctx);
2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	839 mlfiPriv* fetch_priv_from_ctx(SMFICTX *ctx)
2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	840 {
2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	841 mlfiPriv priv = (struct mlfiPriv )smfi_getpriv(ctx);
187 f0eda59e8afd fix null pointer dereference from missing HELO command carl parents: 186 diff changeset	842 priv->ctx = ctx;
186 2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	843 return priv;
2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	844 }
2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	845 #define MLFIPRIV fetch_priv_from_ctx(ctx)
2a80c9b5d2c9 fix null pointer dereference from missing HELO command carl parents: 185 diff changeset	846
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	847
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	848
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	849 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	850 // syslog a message
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	851 //
310 802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	852 void my_syslog(const char queueid, const char text) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	853 char buf[maxlen];
311 f5547e7b3a09 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 310 diff changeset	854 if (queueid && queueid[0]) {
310 802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	855 snprintf(buf, sizeof(buf), "%s: %s", queueid, text);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	856 text = buf;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	857 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	858 if (use_syslog) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	859 pthread_mutex_lock(&syslog_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	860 if (!syslog_opened) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	861 openlog("dnsbl", LOG_PID, LOG_MAIL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	862 syslog_opened = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	863 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	864 syslog(LOG_NOTICE, "%s", text);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	865 pthread_mutex_unlock(&syslog_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	866 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	867 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	868 printf("%s \n", text);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	869 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	870 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	871
310 802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	872 void my_syslog(mlfiPriv priv, const char text) {
802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	873 if (priv) my_syslog(priv->queueid, text);
802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	874 else my_syslog((const char *)NULL, text);
802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	875 }
802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	876
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	877 void my_syslog(mlfiPriv *priv, const string text) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	878 if (debug_syslog > 3) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	879 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	880 strncpy(buf, text.c_str(), sizeof(buf));
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	881 buf[maxlen-1] = '\0'; // ensure null termination
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	882 my_syslog(priv, buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	883 }
163 97d7da45fe2a spamassassin changes carl parents: 162 diff changeset	884 }
97d7da45fe2a spamassassin changes carl parents: 162 diff changeset	885
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	886 void my_syslog(const char *text) {
310 802e2b779ed1 enable smtp verify logging Carl Byington <carl@five-ten-sg.com> parents: 301 diff changeset	887 my_syslog((const char *)NULL, text);
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	888 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	889
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	890
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	891 ////////////////////////////////////////////////
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	892 // read a resolver request from the socket, process it, and
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	893 // write the result back to the socket.
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	894
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	895 void process_resolver_requests(int socket);
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	896 void process_resolver_requests(int socket) {
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	897 #ifdef NS_MAXDNAME
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	898 char question[NS_MAXDNAME];
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	899 #else
389 aa9795b407e8 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 388 diff changeset	900 char question[1025];
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	901 #endif
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	902 glommer glom;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	903
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	904 int maxq = sizeof(question);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	905 while (true) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	906 // read a question
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	907 int rs = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	908 while (rs < maxq) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	909 int ns = read(socket, question+rs, maxq-rs);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	910 if (ns > 0) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	911 rs += ns;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	912 if (question[rs-1] == '\0') {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	913 // last byte read was the null terminator, we are done
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	914 break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	915 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	916 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	917 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	918 // peer closed the socket
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	919 #ifdef RESOLVER_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	920 my_syslog("process_resolver_requests() peer closed socket while reading question");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	921 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	922 shutdown(socket, SHUT_RDWR);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	923 close(socket);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	924 return;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	925 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	926 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	927 question[rs-1] = '\0'; // ensure null termination
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	928
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	929 // find the answer
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	930 #ifdef NS_PACKETSZ
388 2354a1944e49 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 387 diff changeset	931 int qt = int8_t(question[0]);
2354a1944e49 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 387 diff changeset	932 int res_result = res_query(question+1, ns_c_in, qt, glom.answer, sizeof(glom.answer));
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	933 #ifdef RESOLVER_DEBUG
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	934 char text[1000];
387 616e46e9b8f0 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 386 diff changeset	935 snprintf(text, sizeof(text), "process_resolver_requests() has a question %s qtype %d buf len %d result %d",
388 2354a1944e49 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 387 diff changeset	936 question+1, qt, sizeof(glom.answer), res_result);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	937 my_syslog(text);
390 bcef093b1ba6 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 389 diff changeset	938 #endif
223 da9e7f1c8160 fix unsigned signed compare, back to mixed -lresolv and libresolv.a with auto requires Carl Byington <carl@five-ten-sg.com> parents: 222 diff changeset	939 if (res_result < 0) glom.length = 0; // represent all errors as zero length answers
da9e7f1c8160 fix unsigned signed compare, back to mixed -lresolv and libresolv.a with auto requires Carl Byington <carl@five-ten-sg.com> parents: 222 diff changeset	940 else glom.length = (size_t)res_result;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	941 #else
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	942 glom.length = sizeof(glom.answer);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	943 glom.answer = 0;
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	944 int t = int8_t(question[0]);
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	945 if (t != ns_t_a) {
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	946 glom.length = 0;
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	947 }
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	948 else {
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	949 struct hostent *host = gethostbyname(question+1);
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	950 if (host && (host->h_addrtype == AF_INET)) {
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	951 memcpy(&glom.answer, host->h_addr, sizeof(glom.answer));
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	952 }
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	953 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	954 #endif
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	955
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	956 // write the answer
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	957 char buf = (char )&glom;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	958 int len = glom.length + sizeof(glom.length);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	959 #ifdef RESOLVER_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	960 snprintf(text, sizeof(text), "process_resolver_requests() writing answer length %d for total %d", glom.length, len);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	961 my_syslog(text);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	962 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	963 int ws = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	964 while (len > ws) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	965 int ns = write(socket, buf+ws, len-ws);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	966 if (ns > 0) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	967 ws += ns;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	968 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	969 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	970 // peer closed the socket!
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	971 #ifdef RESOLVER_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	972 my_syslog("process_resolver_requests() peer closed socket while writing answer");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	973 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	974 shutdown(socket, SHUT_RDWR);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	975 close(socket);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	976 return;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	977 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	978 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	979 }
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	980 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	981
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	982
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	983 ////////////////////////////////////////////////
252 836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	984 // check a single dns list, return ip address in network byte order
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	985 //
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	986 uint32_t check_single(mlfiPriv &priv, uint32_t ip, const char *suffix);
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	987 uint32_t check_single(mlfiPriv &priv, uint32_t ip, const char *suffix) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	988 // make a dns question
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	989 const u_char src = (const u_char )&ip;
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	990 if (src[0] == 127) return 0; // don't do dns lookups on localhost
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	991 if (src[0] == 10) return 0; // don't do dns lookups on rfc1918 space
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	992 if ((src[0] == 192) && (src[1] == 168)) return 0;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	993 if ((src[0] == 172) && (16 <= src[1]) && (src[1] <= 31)) return 0;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	994 #ifdef NS_MAXDNAME
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	995 char question[NS_MAXDNAME];
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	996 #else
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	997 char question[1000];
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	998 #endif
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	999 snprintf(question, sizeof(question), "%u.%u.%u.%u.%s.", src[3], src[2], src[1], src[0], suffix);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1000 // ask the question, if we get an A record it implies a blacklisted ip address
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	1001 return dns_interface(priv, question, ns_t_a);
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1002 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1003
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1004
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1005 ////////////////////////////////////////////////
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1006 // check a single dnsbl
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1007 //
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1008 bool check_single(mlfiPriv &priv, uint32_t ip, DNSBL &bl);
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1009 bool check_single(mlfiPriv &priv, uint32_t ip, DNSBL &bl) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1010 return check_single(priv, ip, bl.suffix);
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1011 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1012
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1013
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1014 ////////////////////////////////////////////////
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1015 // check a single dnswl
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1016 //
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1017 bool check_single(mlfiPriv &priv, uint32_t ip, DNSWL &wl);
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1018 bool check_single(mlfiPriv &priv, uint32_t ip, DNSWL &wl) {
252 836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	1019 uint32_t r = ntohl(check_single(priv, ip, wl.suffix));
836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	1020 uint32_t v = (uint32_t)0x7f000000;
836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	1021 uint32_t m = (uint32_t)0xffff0000;
836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	1022 uint32_t m2 = (uint32_t)0x000000ff;
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1023 if ((r & m) == v) {
252 836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	1024 uint32_t l = r & m2;
836b7f2357f9 need ntohl() before using masks that are defined in host byte order Carl Byington <carl@five-ten-sg.com> parents: 249 diff changeset	1025 if ((int)l >= wl.level) return true;
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1026 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1027 return false;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1028 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1029
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1030
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1031 ////////////////////////////////////////////////
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1032 // check the dnsbls specified for this recipient
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1033 //
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1034 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist);
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1035 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1036 for (dnsblp_list::iterator i=dnsbll.begin(); i!=dnsbll.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1037 DNSBLP dp = *i; // non null by construction
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1038 bool st;
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1039 map<DNSBLP, bool>::iterator f = priv.checked_black.find(dp);
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1040 if (f == priv.checked_black.end()) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1041 // have not checked this list yet
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1042 st = check_single(priv, priv.ip, *dp);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1043 rejectlist = dp;
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1044 priv.checked_black[dp] = st;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1045 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1046 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1047 st = (*f).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1048 rejectlist = (*f).first;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1049 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1050 if (st) return st;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1051 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1052 return false;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1053 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1054
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1055
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1056 ////////////////////////////////////////////////
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1057 // check the dnswls specified for this recipient
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1058 //
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1059 bool check_dnswl(mlfiPriv &priv, dnswlp_list &dnswll, DNSWLP &acceptlist);
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1060 bool check_dnswl(mlfiPriv &priv, dnswlp_list &dnswll, DNSWLP &acceptlist) {
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1061 for (dnswlp_list::iterator i=dnswll.begin(); i!=dnswll.end(); i++) {
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1062 DNSWLP dp = *i; // non null by construction
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1063 bool st;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1064 map<DNSWLP, bool>::iterator f = priv.checked_white.find(dp);
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1065 if (f == priv.checked_white.end()) {
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1066 // have not checked this list yet
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1067 st = check_single(priv, priv.ip, *dp);
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1068 acceptlist = dp;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1069 priv.checked_white[dp] = st;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1070 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1071 else {
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1072 st = (*f).second;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1073 acceptlist = (*f).first;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1074 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1075 if (st) return st;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1076 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1077 return false;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1078 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1079
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1080
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1081 ////////////////////////////////////////////////
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1082 // check the hosts from the body against the content filter and uribl dnsbls
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1083 //
124 ea6f9c812faa put hostname in smtp message for uribl style lookups carl parents: 123 diff changeset	1084 //
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1085 bool check_hosts(mlfiPriv &priv, bool random, int limit, const char &msg, const char &host, uint32_t &ip, const char *&found);
c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1086 bool check_hosts(mlfiPriv &priv, bool random, int limit, const char &msg, const char &host, uint32_t &ip, const char *&found) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1087 found = NULL; // normally ip address style
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1088 if (!priv.content_suffix && !priv.uribl_suffix) return false; // nothing to check
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1089 string_set &hosts = priv.memory->get_hosts();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1090 string_set &ignore = *priv.content_host_ignore;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1091
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1092 int count = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1093 int cnt = hosts.size(); // number of hosts we could look at
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1094 uint32_t_set ips;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1095 ns_map nameservers;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1096 for (string_set::iterator i=hosts.begin(); i!=hosts.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1097 host = *i; // a reference into hosts, which will live until this smtp transaction is closed
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1098
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1099 // don't bother looking up hosts on the ignore list
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1100 string_set::iterator j = ignore.find(host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1101 if (j != ignore.end()) continue;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1102
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1103 // try to only look at limit/cnt fraction of the available cnt host names in random mode
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1104 if ((cnt > limit) && (limit > 0) && random) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1105 int r = rand() % cnt;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1106 if (r >= limit) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1107 if (debug_syslog > 2) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1108 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1109 snprintf(buf, sizeof(buf), "host %s skipped", host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1110 my_syslog(&priv, buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1111 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1112 continue;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1113 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1114 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1115 count++;
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	1116 ip = dns_interface(priv, host, ns_t_a, true, &nameservers);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1117 if (debug_syslog > 2) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1118 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1119 if (ip) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1120 char adr[sizeof "255.255.255.255 "];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1121 adr[0] = '\0';
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1122 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1123 snprintf(buf, sizeof(buf), "host %s found at %s", host, adr);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1124 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1125 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1126 snprintf(buf, sizeof(buf), "host %s not found", host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1127 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1128 my_syslog(&priv, buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1129 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1130 if (ip) {
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1131 uint32_t_set::iterator i = ips.find(ip);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1132 if (i == ips.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1133 // we haven't looked this up yet
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1134 ips.insert(ip);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1135 // check dnsbl style list
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1136 if (priv.content_suffix && check_single(priv, ip, priv.content_suffix)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1137 msg = priv.content_message;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1138 return true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1139 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1140 // Check uribl & surbl style list
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1141 if (priv.uribl_suffix && check_uribl(priv, hosts, host, found)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1142 msg = priv.uribl_message;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1143 return true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1144 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1145 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1146 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1147 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1148 limit *= 4; // allow average of 3 ns per host name
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1149 for (ns_mapper::iterator i=nameservers.ns_ip.begin(); i!=nameservers.ns_ip.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1150 count++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1151 if ((count > limit) && (limit > 0)) return false; // too many name servers to check them all
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1152 host = (*i).first; // a transient reference that needs to be replaced before we return it
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1153 ip = (*i).second;
381 879a470c6ac3 fetch spf txt records for required dkim signers Carl Byington <carl@five-ten-sg.com> parents: 379 diff changeset	1154 if (!ip) ip = dns_interface(priv, host, ns_t_a);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1155 if (debug_syslog > 2) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1156 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1157 if (ip) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1158 char adr[sizeof "255.255.255.255 "];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1159 adr[0] = '\0';
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1160 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1161 snprintf(buf, sizeof(buf), "ns %s found at %s", host, adr);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1162 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1163 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1164 snprintf(buf, sizeof(buf), "ns %s not found", host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1165 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1166 my_syslog(&priv, buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1167 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1168 if (ip) {
382 c378e9d03f37 start parsing spf txt records Carl Byington <carl@five-ten-sg.com> parents: 381 diff changeset	1169 uint32_t_set::iterator i = ips.find(ip);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1170 if (i == ips.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1171 ips.insert(ip);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1172 if (check_single(priv, ip, priv.content_suffix)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1173 msg = priv.content_message;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1174 string_map::iterator j = nameservers.ns_host.find(host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1175 if (j != nameservers.ns_host.end()) {
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1176 const char refer = (j).second;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1177 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1178 snprintf(buf, sizeof(buf), "%s with nameserver %s", refer, host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1179 host = register_string(hosts, buf); // put a copy into hosts, and return that reference
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1180 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1181 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1182 host = register_string(hosts, host); // put a copy into hosts, and return that reference
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1183 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1184 return true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1185 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1186 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1187 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1188 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1189 return false;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1190 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1191
127 2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes carl parents: 126 diff changeset	1192
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1193 ////////////////////////////////////////////////
127 2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes carl parents: 126 diff changeset	1194 //
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes carl parents: 126 diff changeset	1195 // this email address is passed in from sendmail, and will normally be
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1196 // enclosed in <>. I think older versions of sendmail supplied the <>
127 2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes carl parents: 126 diff changeset	1197 // wrapper if the mail client did not, but the current version does not do
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes carl parents: 126 diff changeset	1198 // that. So the <> wrapper is now optional. It may have mixed case, just
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1199 // as the mail client sent it. We dup the string and convert the duplicate
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1200 // to lower case. Some clients enclose the entire address in single quotes,
246 8b0f16abee53 Add prvs decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 244 diff changeset	1201 // so we strip those as well. We also remove the SRS and prvs coding.
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1202 //
346 66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1203 const char to_lower_string(const char email, bool srs = true);
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1204 const char to_lower_string(const char email, bool srs) {
266 582cfb9c4031 fix unauthenticated rate limit bug for empty mail from Carl Byington <carl@five-ten-sg.com> parents: 263 diff changeset	1205 if (!email) return strdup("<>");
328 b4f766947202 allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 327 diff changeset	1206 size_t n = strlen(email);
b4f766947202 allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 327 diff changeset	1207 if ((n > 1) && (email[0] == '<') && (email[n-1] == '>')) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1208 n -= 2;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1209 email++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1210 }
328 b4f766947202 allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 327 diff changeset	1211 if ((n > 1) && (email[0] == '\'') && (email[n-1] == '\'')) {
b4f766947202 allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 327 diff changeset	1212 n -= 2;
b4f766947202 allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 327 diff changeset	1213 email++;
b4f766947202 allow multiple dkim signers in authentication results Carl Byington <carl@five-ten-sg.com> parents: 327 diff changeset	1214 }
352 f5a6740cabee need to lowercase the domain extracted from the from header so it will match the keys in dkim_from Carl Byington <carl@five-ten-sg.com> parents: 350 diff changeset	1215 if (n == 0) return strdup("<>");
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1216 char *key = strdup(email);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1217 key[n] = '\0';
331 9800776436b9 allow dkim whitelisting to override uribl hosts in the mail body Carl Byington <carl@five-ten-sg.com> parents: 330 diff changeset	1218 for (size_t i=0; i<n; i++) key[i] = tolower(key[i]);
346 66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1219
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1220 if (srs) {
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1221 if ((n > 14) && (strncmp(key, "srs", 3) == 0)) {
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1222 // might have srs coding to be removed
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1223 const int nmatch = 7;
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1224 regmatch_t match[nmatch];
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1225 if (0 == regexec(&srs_pattern, key, nmatch, match, 0)) {
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1226 int s4 = match[5].rm_so; // domain
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1227 int e4 = match[5].rm_eo;
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1228 int s5 = match[6].rm_so; // user
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1229 int e5 = match[6].rm_eo;
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1230 if ((s4 != -1) && (s5 != -1)) {
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1231 char *newkey = strdup(key); // large enough
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1232 key[e4] = '\0';
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1233 key[e5] = '\0';
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1234 strcpy(newkey, key+s5); // user
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1235 strcat(newkey, "@"); // @
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1236 strcat(newkey, key+s4); // domain
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1237 free(key);
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1238 key = newkey;
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1239 }
235 e6c66640f6f9 Add SRS decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 233 diff changeset	1240 }
e6c66640f6f9 Add SRS decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 233 diff changeset	1241 }
346 66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1242 if ((n > 7) && (strncmp(key, "prvs", 4) == 0)) {
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1243 // might have prvs coding to be removed
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1244 const int nmatch = 3;
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1245 regmatch_t match[nmatch];
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1246 if (0 == regexec(&prvs_pattern, key, nmatch, match, 0)) {
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1247 int s2 = match[2].rm_so; // user@domain
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1248 if (s2 != -1) {
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1249 char *newkey = strdup(key+s2); // user@domain
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1250 free(key);
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1251 key = newkey;
66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1252 }
246 8b0f16abee53 Add prvs decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 244 diff changeset	1253 }
8b0f16abee53 Add prvs decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 244 diff changeset	1254 }
8b0f16abee53 Add prvs decoding to envelope addresses Carl Byington <carl@five-ten-sg.com> parents: 244 diff changeset	1255 }
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1256 return key;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1257 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1258
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1259
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1260 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1261 // start of sendmail milter interfaces
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1262 //
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1263 sfsistat mlfi_connect(SMFICTX ctx, char hostname, _SOCK_ADDR *hostaddr)
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1264 {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1265 // allocate some private memory
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1266 mlfiPriv *priv = new mlfiPriv;
286 9bd5388bf469 Fix possible segfault in mlfi_connect, hostaddr might be null Carl Byington <carl@five-ten-sg.com> parents: 284 diff changeset	1267 if (hostaddr && (hostaddr->sa_family == AF_INET)) {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1268 priv->ip = ((struct sockaddr_in *)hostaddr)->sin_addr.s_addr;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1269 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1270 // save the private data
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1271 smfi_setpriv(ctx, (void*)priv);
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1272
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1273 // continue processing
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1274 return SMFIS_CONTINUE;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1275 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1276
163 97d7da45fe2a spamassassin changes carl parents: 162 diff changeset	1277 sfsistat mlfi_helo(SMFICTX * ctx, char *helohost)
97d7da45fe2a spamassassin changes carl parents: 162 diff changeset	1278 {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1279 mlfiPriv &priv = *MLFIPRIV;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1280 priv.helo = strdup(helohost);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1281 return SMFIS_CONTINUE;
163 97d7da45fe2a spamassassin changes carl parents: 162 diff changeset	1282 }
97d7da45fe2a spamassassin changes carl parents: 162 diff changeset	1283
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1284 sfsistat mlfi_envfrom(SMFICTX ctx, char *from)
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1285 {
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1286 mlfiPriv &priv = *MLFIPRIV;
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1287 CONFIG &dc = *priv.pc;
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	1288 priv.origaddr = to_lower_string(from[0], false);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1289 priv.mailaddr = to_lower_string(from[0]);
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1290 priv.queueid = strdup(smfi_getsymval(ctx, (char*)"i"));
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1291 priv.authenticated = smfi_getsymval(ctx, (char*)"{auth_authen}");
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1292 priv.client_name = smfi_getsymval(ctx, (char*)"_");
191 2a67d31099c3 fix null pointer dereference from missing HELO command carl parents: 190 diff changeset	1293 if (!priv.helo) priv.helo = strdup("unknown");
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1294 if (priv.authenticated) priv.authenticated = strdup(priv.authenticated);
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1295 if (priv.client_name) {
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1296 priv.client_name = strdup(priv.client_name);
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1297 const char *p = strstr(priv.client_name, " [");
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1298 if (p) {
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1299 uint pp = p - priv.client_name;
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1300 priv.client_dns_name = strdup(priv.client_name);
d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1301 priv.client_dns_name[pp] = '\0';
259 be939802c64e add recipient rate limits by email from address or domain Carl Byington <carl@five-ten-sg.com> parents: 257 diff changeset	1302 //char text[500];
be939802c64e add recipient rate limits by email from address or domain Carl Byington <carl@five-ten-sg.com> parents: 257 diff changeset	1303 //snprintf(text, sizeof(text), "found simple dns client name %s", priv.client_dns_name);
be939802c64e add recipient rate limits by email from address or domain Carl Byington <carl@five-ten-sg.com> parents: 257 diff changeset	1304 //my_syslog(text);
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1305 }
268 f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1306 p = strstr(priv.client_name, "] (may be forged)");
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1307 if (p) {
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1308 priv.client_dns_forged = true;
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1309 if (priv.client_dns_name) {
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1310 char text[500];
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1311 snprintf(text, sizeof(text), "forged dns client name %s", priv.client_dns_name);
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1312 my_syslog(text);
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1313 }
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1314 }
257 d11b529ce9c5 Fix uribl lookups on client dns name, need to strip the ip address in brackets Carl Byington <carl@five-ten-sg.com> parents: 255 diff changeset	1315 }
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1316 if (spamc != spamc_empty) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1317 priv.assassin = new SpamAssassin(&priv, priv.ip, priv.helo, priv.mailaddr, priv.queueid);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1318 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1319 if (dccifd_port) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1320 priv.dccifd = new DccInterface(dccifd_port, &priv, priv.ip, priv.helo, priv.mailaddr);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1321 }
290 bb69fdc3acaa Unique ip connection limits only apply to authenticated connections Carl Byington <carl@five-ten-sg.com> parents: 286 diff changeset	1322 if (priv.authenticated) {
284 896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1323 int hourly, daily;
290 bb69fdc3acaa Unique ip connection limits only apply to authenticated connections Carl Byington <carl@five-ten-sg.com> parents: 286 diff changeset	1324 add_auth_address(priv.authenticated, hourly, daily, priv.ip);
bb69fdc3acaa Unique ip connection limits only apply to authenticated connections Carl Byington <carl@five-ten-sg.com> parents: 286 diff changeset	1325 int h_limit = dc.default_context->find_address_limit(priv.authenticated);
284 896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1326 int d_limit = dc.default_context->get_daily_address_multiple() * h_limit;
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1327 if (debug_syslog > 1) {
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1328 char msg[maxlen];
290 bb69fdc3acaa Unique ip connection limits only apply to authenticated connections Carl Byington <carl@five-ten-sg.com> parents: 286 diff changeset	1329 snprintf(msg, sizeof(msg), "connect for %s (%d %d addresses, %d %d limits)", priv.authenticated, hourly, daily, h_limit, d_limit);
284 896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1330 my_syslog(&priv, msg);
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1331 }
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1332 if ((hourly > h_limit) \|\| (daily > d_limit)){
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1333 smfi_setreply(ctx, (char)"550", (char)"5.7.1", (char*)"unique connection ip address limit exceeded");
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1334 return SMFIS_REJECT;
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1335 }
896b9393d3f0 Fix segfault caused by freeing unallocated memory Carl Byington <carl@five-ten-sg.com> parents: 282 diff changeset	1336 }
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1337 return SMFIS_CONTINUE;
94 e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1338 }
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1339
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1340 sfsistat mlfi_envrcpt(SMFICTX ctx, char *rcpt)
e107ade3b1c0 fix dos line terminators carl parents: 92 diff changeset	1341 {
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1342 DNSBLP rejectlist = NULL; // list that caused the reject
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1343 mlfiPriv &priv = *MLFIPRIV;
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1344 CONFIG &dc = *priv.pc;
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1345 const char *rcptaddr = rcpt[0];
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1346 const char *loto = to_lower_string(rcptaddr);
342 6d27b4f45799 allow envelope from whitelisting without dkim override for mail from localhost, or where the from address is root@* Carl Byington <carl@five-ten-sg.com> parents: 340 diff changeset	1347 bool self = (strcmp(loto, priv.mailaddr) == 0);
6d27b4f45799 allow envelope from whitelisting without dkim override for mail from localhost, or where the from address is root@* Carl Byington <carl@five-ten-sg.com> parents: 340 diff changeset	1348 const u_char src = (const u_char )&priv.ip;
6d27b4f45799 allow envelope from whitelisting without dkim override for mail from localhost, or where the from address is root@* Carl Byington <carl@five-ten-sg.com> parents: 340 diff changeset	1349 bool local_source = (src[0] == 127);
6d27b4f45799 allow envelope from whitelisting without dkim override for mail from localhost, or where the from address is root@* Carl Byington <carl@five-ten-sg.com> parents: 340 diff changeset	1350 bool from_root = (strncasecmp(priv.mailaddr, "root@", 5) == 0);
174 da0c41b9f672 don't whitelist addresses with embedded spaces carl parents: 173 diff changeset	1351
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1352 // some version of sendmail allowed rcpt to:<> and passed it thru to the milters
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1353 if (strcmp(loto, "<>") == 0) {
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1354 smfi_setreply(ctx, (char)"550", (char)"5.7.1", (char*)"bogus recipient");
286 9bd5388bf469 Fix possible segfault in mlfi_connect, hostaddr might be null Carl Byington <carl@five-ten-sg.com> parents: 284 diff changeset	1355 free((void*)loto); // cppcheck static analysis found memory leak
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1356 return SMFIS_REJECT;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1357 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1358 // priv.mailaddr sending original message to loto
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1359 CONTEXT &con = *(dc.find_context(loto)->find_context(priv.mailaddr));
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1360 VERIFYP ver = con.find_verify(loto);
233 5c3e9bf45bb5 Add whitelisting by regex expression filtering. Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1361 const char *fromvalue = con.find_from(priv.mailaddr, true, priv.queueid);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1362 // tell spam assassin and dccifd about this recipient
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1363 if (priv.assassin) priv.assassin->mlfi_envrcpt(ctx, loto);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1364 if (priv.dccifd) priv.dccifd->mlfi_envrcpt(ctx, loto, con.get_grey() && !priv.authenticated);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1365 // loto sending a reply back to priv.mailaddr
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1366 CONTEXT &con2 = *(dc.find_context(priv.mailaddr)->find_context(loto));
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1367 const char *replyvalue = con2.find_from(loto);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1368 if (debug_syslog > 1) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1369 char buf[maxlen];
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1370 char buf2[maxlen];
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1371 char msg[maxlen];
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1372 snprintf(msg, sizeof(msg), "from <%s> to <%s> using context %s state %s reply context %s state %s", priv.mailaddr, loto, con.get_full_name(buf,maxlen), fromvalue, con2.get_full_name(buf2,maxlen), replyvalue);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1373 my_syslog(&priv, msg);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1374 }
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1375 free((void*)loto);
340 be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1376 status st = oksofar;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1377 if (replyvalue == token_black) {
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1378 smfi_setreply(ctx, (char)"550", (char)"5.7.1", (char*)"recipient can not reply due to blacklisting");
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1379 return SMFIS_REJECT;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1380 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1381 if (priv.authenticated) {
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	1382 int hourly, daily;
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	1383 incr_rcpt_count(priv.authenticated, hourly, daily);
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1384 int h_limit = dc.default_context->find_rate_limit(priv.authenticated);
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1385 int d_limit = dc.default_context->get_daily_rate_multiple() * h_limit;
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1386 if (debug_syslog > 1) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1387 char msg[maxlen];
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	1388 snprintf(msg, sizeof(msg), "authenticated id %s (%d %d recipients, %d %d limits)", priv.authenticated, hourly, daily, h_limit, d_limit);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1389 my_syslog(&priv, msg);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1390 }
255 d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits. Carl Byington <carl@five-ten-sg.com> parents: 252 diff changeset	1391 if ((hourly > h_limit) \|\| (daily > d_limit)){
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1392 smfi_setreply(ctx, (char)"550", (char)"5.7.1", (char*)"recipient rate limit exceeded");
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1393 return SMFIS_REJECT;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1394 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1395 st = white;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1396 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1397 else if (fromvalue == token_black) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1398 st = black;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1399 }
342 6d27b4f45799 allow envelope from whitelisting without dkim override for mail from localhost, or where the from address is root@* Carl Byington <carl@five-ten-sg.com> parents: 340 diff changeset	1400 else if ((fromvalue == token_white) && (local_source \|\| from_root)) {
6d27b4f45799 allow envelope from whitelisting without dkim override for mail from localhost, or where the from address is root@* Carl Byington <carl@five-ten-sg.com> parents: 340 diff changeset	1401 st = white;
6d27b4f45799 allow envelope from whitelisting without dkim override for mail from localhost, or where the from address is root@* Carl Byington <carl@five-ten-sg.com> parents: 340 diff changeset	1402 }
216 784030ac71f1 Never whitelist self addressed mail. Changes for Fedora 10 and const correctness. Carl Byington <carl@five-ten-sg.com> parents: 214 diff changeset	1403 else if ((fromvalue == token_white) && !self) {
330 b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1404 // whitelisting based on envelope from value, but ignore it if
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	1405 // we have a dkim requirement for the original domain
f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	1406 const char *domain = strchr(priv.origaddr, '@');
330 b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1407 if (domain) {
338 f375a67ee516 set st in all paths; missing +1 to avoid lookup starting with @ Carl Byington <carl@five-ten-sg.com> parents: 337 diff changeset	1408 DKIMP dk = con.find_dkim_from(domain+1);
330 b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1409 if (dk && (dk->action == token_require_signed)) {
b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1410 my_syslog(&priv, "dkim require_signed overrides envelope from whitelist");
338 f375a67ee516 set st in all paths; missing +1 to avoid lookup starting with @ Carl Byington <carl@five-ten-sg.com> parents: 337 diff changeset	1411 st = oksofar;
330 b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1412 }
b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1413 else st = white;
b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1414 }
b5b93a7e1e6d ignore envelope-from based whitelisting if we have a dkim requirement for that domain Carl Byington <carl@five-ten-sg.com> parents: 329 diff changeset	1415 else st = white; // might be <>, envelope from has no @
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1416 }
340 be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1417
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1418 if (st == oksofar) {
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1419 // check the dns based lists, whitelist first
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1420 DNSWLP acceptlist = NULL; // list that caused the whitelisting
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1421 if (check_dnswl(priv, con.get_dnswl_list(), acceptlist)) {
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1422 st = white;
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1423 if (debug_syslog > 1) {
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1424 char msg[maxlen];
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1425 snprintf(msg, sizeof(msg), "whitelisted by %s", acceptlist->name);
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1426 my_syslog(&priv, msg);
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1427 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1428 }
15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1429 else if (check_dnsbl(priv, con.get_dnsbl_list(), rejectlist)) {
340 be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1430 // reject the recipient based on some dnsbl
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1431 char adr[sizeof "255.255.255.255 "];
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1432 adr[0] = '\0';
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1433 inet_ntop(AF_INET, (const u_char *)&priv.ip, adr, sizeof(adr));
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1434 char buf[maxlen];
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1435 snprintf(buf, sizeof(buf), rejectlist->message, adr, adr);
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1436 smfi_setreply(ctx, (char)"550", (char)"5.7.1", buf);
be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1437 return SMFIS_REJECT;
249 15bf4f68a0b2 Add dnswl support Carl Byington <carl@five-ten-sg.com> parents: 248 diff changeset	1438 }
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1439 }
340 be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1440
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1441 if (st == oksofar) {
268 f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1442 // check forged rdns
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1443 if (con.get_requirerdns() && (!priv.client_dns_name \|\| priv.client_dns_forged)) {
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1444 // reject the recipient based on forged reverse dns
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1445 char buf[maxlen];
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1446 snprintf(buf, sizeof(buf), "%s is not acceptable", priv.client_name);
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1447 smfi_setreply(ctx, (char)"550", (char)"5.7.1", buf);
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1448 return SMFIS_REJECT;
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1449 }
f941563c2a95 Add require_rdns checking Carl Byington <carl@five-ten-sg.com> parents: 266 diff changeset	1450 // check generic rdns
301 13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1451 if (priv.client_dns_name) {
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1452 const char *msg = con.generic_match(priv.client_dns_name);
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1453 if (msg) {
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1454 // reject the recipient based on generic reverse dns
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1455 char buf[maxlen];
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1456 snprintf(buf, sizeof(buf), msg, priv.client_name);
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1457 smfi_setreply(ctx, (char)"550", (char)"5.7.1", buf);
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1458 return SMFIS_REJECT;
13905d36ca82 Generic regex now matches against the reverse dns PTR value Carl Byington <carl@five-ten-sg.com> parents: 296 diff changeset	1459 }
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1460 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1461 }
340 be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1462
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1463 if (st == black) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1464 // reject the recipient based on blacklisting either from or to
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1465 smfi_setreply(ctx, (char)"550", (char)"5.7.1", (char*)"no such user");
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1466 return SMFIS_REJECT;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1467 }
340 be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1468
203 92a5c866bdfa Verify from/to pairs even if they might be explicitly whitelisted. Carl Byington <carl@five-ten-sg.com> parents: 194 diff changeset	1469 if (ver) {
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	1470 // try to verify the original from/to pair of addresses even if it might be explicitly whitelisted
346 66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1471 const char *loto = to_lower_string(rcptaddr, false);
350 f4ca91f49cb6 send the original mail from address to the verify server, not the srs/pvrs unwrapped version; recognize our own dkim signatures Carl Byington <carl@five-ten-sg.com> parents: 348 diff changeset	1472 bool rc = ver->ok(priv.queueid, priv.origaddr, loto);
346 66969443a012 need to strip <> from recipient address before sending to verifier Carl Byington <carl@five-ten-sg.com> parents: 344 diff changeset	1473 free((void*)loto);
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1474 if (!rc) {
214 82886d4dd71f Fixes to compile on Fedora 9 and for const correctness. Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	1475 smfi_setreply(ctx, (char)"550", (char)"5.7.1", (char*)"no such user");
192 8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1476 return SMFIS_REJECT;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1477 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots carl parents: 191 diff changeset	1478 }
340 be776a246f97 when dkim require_signed overrides envelope from whitelisting, we still want to check dns based white/blacklists before content filtering Carl Byington <carl@five-ten-sg.com> parents: 338 diff changeset	1479
263 e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1480 if (!priv.authenticated && dc.default_context->is_unauthenticated_limited(priv.mailaddr)) {
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1481 int hourly, daily;
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1482 incr_rcpt_count(priv.mailaddr, hourly, daily);
278 368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1483 int h_limit = dc.default_context->find_rate_limit(priv.mailaddr);
368572c57013 add limits on unique ip addresses per hour per authenticated user Carl Byington <carl@five-ten-sg.com> parents: 272 diff changeset	1484 int d_limit = dc.default_context->get_daily_rate_multiple() * h_limit;
263 e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1485 if (debug_syslog > 1) {
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1486 char msg[maxlen];
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1487 snprintf(msg, sizeof(msg), "unauthenticated address %s (%d %d recipients, %d %d limits)", priv.mailaddr, hourly, daily, h_limit, d_limit);
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1488 my_syslog(&priv, msg);
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1489 }
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1490 if ((hourly > h_limit) \|\| (daily > d_limit)){
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam filtering Carl Byington <carl@five-ten-sg.com> parents: 259 diff changeset	1491 smfi_setreply(ctx, (char)"550", (char)"5.7.1", (char*)"recipient rate limit exceeded");
e118fd2c6af0 fix unauthenticated rate limit bug for empty mail from; move unauthenticate rate limit checks after spam fi

Mercurial > dnsbl

annotate src/dnsbl.cpp @ 419:91f2a127ec69 stable-6-0-57