annotate src/dnsbl.cpp @ 165:bf828f785407 stable-6-0-5

fix unitialized variable
author carl
date Sun, 26 Aug 2007 20:54:58 -0700
parents 5809bcdc325b
children 9b129ed78d7d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
152
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
3 Copyright (c) 2007 Carl Byington - 510 Software Group, released under
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
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
8 suppliers. Inspired by the DCC by Rhyolite Software
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
9
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
10 -r port The port used to talk to our internal dns resolver processes
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
11 -p port The port through which the MTA will connect to this milter.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
12 -t sec The timeout value.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
13 -c Check the config, and print a copy to stdout. Don't start the
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
14 milter or do anything with the socket.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
15 -s Stress test by loading and deleting the current config in a loop.
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
16 -d level set the debug level
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
17 -e f|t Print the results of looking up from address f and to address
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
18 t in the current config
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
19
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 // from sendmail sample
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
24 #include <sys/types.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
25 #include <sys/stat.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
26 #include <errno.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
27 #include <sysexits.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
28 #include <unistd.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
29
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
30 // needed for socket io
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
31 #include <sys/ioctl.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
32 #include <net/if.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
33 #include <arpa/inet.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
34 #include <netinet/in.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
35 #include <netinet/tcp.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
36 #include <netdb.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
37 #include <sys/socket.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
38 #include <sys/un.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
39
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
40 // needed for thread
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
41 #include <pthread.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
42
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
43 // needed for std c++ collections
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
44 #include <set>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
45 #include <map>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
46 #include <list>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
47
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
48 // for the dns resolver
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
49 #include <netinet/in.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
50 #include <arpa/nameser.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
51 #include <resolv.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
52
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
53 // misc stuff needed here
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
54 #include <ctype.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
55 #include <syslog.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
56 #include <pwd.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
57 #include <sys/wait.h> /* header for waitpid() and various macros */
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
58 #include <signal.h> /* header for signal functions */
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
59
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
60 #include "includes.h"
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
61
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
62 static char* dnsbl_version="$Id$";
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
63
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
64
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
65 extern "C" {
148
9330b8d6a56b add documentation fixes, allow env_from target of inherit
carl
parents: 146
diff changeset
66 #include <libmilter/mfapi.h>
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
67 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
68 sfsistat mlfi_helo(SMFICTX * ctx, char *helohost);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
69 sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
70 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
71 sfsistat mlfi_header(SMFICTX* ctx, char* headerf, char* headerv);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
72 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
73 sfsistat mlfi_eom(SMFICTX *ctx);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
74 sfsistat mlfi_abort(SMFICTX *ctx);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
75 sfsistat mlfi_close(SMFICTX *ctx);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
76 void sig_chld(int signo);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
77 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
78
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
79 int debug_syslog = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
80 bool syslog_opened = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
81 bool use_syslog = true; // false to printf
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
82 bool loader_run = true; // used to stop the config loader thread
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
83 CONFIG *config = NULL; // protected by the config_mutex
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
84 int generation = 0; // protected by the config_mutex
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
85 const int maxlen = 1000; // used for snprintf buffers
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
86
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
87 pthread_mutex_t config_mutex;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
88 pthread_mutex_t syslog_mutex;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
89 pthread_mutex_t resolve_mutex;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
90 pthread_mutex_t fd_pool_mutex;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
91 pthread_mutex_t rate_mutex;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
92
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
93 std::set<int> fd_pool;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
94 int NULL_SOCKET = -1;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
95 const time_t ERROR_SOCKET_TIME = 60; // number of seconds between attempts to open a socket to the dns resolver process
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
96 char *resolver_port = NULL; // unix domain socket to talk to the dns resolver process
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
97 int resolver_socket = NULL_SOCKET; // socket used to listen for resolver requests
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
98 time_t last_error_time;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
99 int resolver_sock_count = 0; // protected with fd_pool_mutex
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
100 int resolver_pool_size = 0; // protected with fd_pool_mutex
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
101 rcpt_rates rcpt_counts; // protected with rate_mutex
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
102
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
103
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
104 struct ns_map {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
105 // all the strings are owned by the keys/values in the ns_host string map
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
106 string_map ns_host; // nameserver name -> host name that uses this name server
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
107 ns_mapper ns_ip; // nameserver name -> ip address of the name server
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
108 ~ns_map();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
109 void add(char *name, char *refer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
110 };
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
111
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
112
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
113 ns_map::~ns_map() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
114 for (string_map::iterator i=ns_host.begin(); i!=ns_host.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
115 char *x = (*i).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
116 char *y = (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
117 free(x);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
118 free(y);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
119 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
120 ns_ip.clear();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
121 ns_host.clear();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
122 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
123
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
124
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
125 void ns_map::add(char *name, char *refer) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
126 string_map::iterator i = ns_host.find(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
127 if (i != ns_host.end()) return;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
128 char *x = strdup(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
129 char *y = strdup(refer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
130 ns_ip[x] = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
131 ns_host[x] = y;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
132
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
133 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
134
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
135 // packed structure to allow a single socket write to dump the
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
136 // length and the following answer. The packing attribute is gcc specific.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
137 struct glommer {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
138 int length;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
139 #ifdef NS_PACKETSZ
115
07e5d4721213 use larger resolver buffer
carl
parents: 94
diff changeset
140 u_char answer[NS_PACKETSZ*4]; // with a resolver, we return resolver answers
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
141 #else
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
142 int answer; // without a resolver, we return a single ip4 address, 0 == no answer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
143 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
144 } __attribute__ ((packed));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
145
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
146
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
147 ////////////////////////////////////////////////
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
148 // helper to manipulate recipient counts
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
149 //
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
150 int incr_rcpt_count(char *user);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
151 int incr_rcpt_count(char *user) {
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
152 pthread_mutex_lock(&rate_mutex);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
153 rcpt_rates::iterator i = rcpt_counts.find(user);
138
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
154 int c = 1;
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
155 if (i == rcpt_counts.end()) {
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
156 user = strdup(user);
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
157 rcpt_counts[user] = c;
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
158 }
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
159 else {
139
003026deaed1 add smtp auth rate limits
carl
parents: 138
diff changeset
160 c = ++((*i).second);
138
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
161 }
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
162 pthread_mutex_unlock(&rate_mutex);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
163 return c;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
164 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
165
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
166 ////////////////////////////////////////////////
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
167 // helper to discard the strings held by a context_map
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
168 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
169 void discard(context_map &cm);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
170 void discard(context_map &cm) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
171 for (context_map::iterator i=cm.begin(); i!=cm.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
172 char *x = (*i).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
173 free(x);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
174 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
175 cm.clear();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
176 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
177
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
178
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
179 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
180 // helper to register a string in a context_map
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
181 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
182 void register_string(context_map &cm, char *name, CONTEXT *con);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
183 void register_string(context_map &cm, char *name, CONTEXT *con) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
184 context_map::iterator i = cm.find(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
185 if (i != cm.end()) return;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
186 char *x = strdup(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
187 cm[x] = con;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
188 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
189
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
190
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
191 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
192 // disconnect the fd from the dns resolver process
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
193 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
194 void my_disconnect(int sock, bool decrement = true);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
195 void my_disconnect(int sock, bool decrement) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
196 if (sock != NULL_SOCKET) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
197 if (decrement) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
198 pthread_mutex_lock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
199 resolver_sock_count--;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
200 pthread_mutex_unlock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
201 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
202 shutdown(sock, SHUT_RDWR);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
203 close(sock);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
204 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
205 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
206
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
207
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
208 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
209 // return fd connected to the dns resolver process
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
210 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
211 int my_connect();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
212 int my_connect() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
213 // if we have had recent errors, don't even try to open the socket
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 128
diff changeset
214 if ((time(NULL) - last_error_time) < ERROR_SOCKET_TIME) return NULL_SOCKET;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
215
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
216 // nothing recent, maybe this time it will work
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
217 int sock = NULL_SOCKET;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
218 sockaddr_un server;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
219 memset(&server, '\0', sizeof(server));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
220 server.sun_family = AF_UNIX;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
221 strncpy(server.sun_path, resolver_port, sizeof(server.sun_path)-1);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
222 sock = socket(AF_UNIX, SOCK_STREAM, 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
223 if (sock != NULL_SOCKET) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
224 bool rc = (connect(sock, (sockaddr *)&server, sizeof(server)) == 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
225 if (!rc) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
226 my_disconnect(sock, false);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
227 sock = NULL_SOCKET;
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 128
diff changeset
228 last_error_time = time(NULL);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
229 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
230 }
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 128
diff changeset
231 else last_error_time = time(NULL);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
232 if (sock != NULL_SOCKET) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
233 pthread_mutex_lock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
234 resolver_sock_count++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
235 pthread_mutex_unlock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
236 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
237 return sock;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
238 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
239
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
240
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
241 mlfiPriv::mlfiPriv() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
242 pthread_mutex_lock(&config_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
243 pc = config;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
244 pc->reference_count++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
245 pthread_mutex_unlock(&config_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
246 get_fd();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
247 ip = 0;
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
248 helo = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
249 mailaddr = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
250 queueid = NULL;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
251 authenticated = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
252 have_whites = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
253 only_whites = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
254 memory = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
255 scanner = NULL;
165
bf828f785407 fix unitialized variable
carl
parents: 164
diff changeset
256 assassin = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
257 content_suffix = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
258 content_message = NULL;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
259 uribl_suffix = NULL;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
260 uribl_message = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
261 content_host_ignore = NULL;
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 mlfiPriv::~mlfiPriv() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
265 return_fd();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
266 pthread_mutex_lock(&config_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
267 pc->reference_count--;
146
7278c9766e26 free old configs when last reference goes away
carl
parents: 143
diff changeset
268 bool last = (!pc->reference_count) && (pc != config);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
269 pthread_mutex_unlock(&config_mutex);
146
7278c9766e26 free old configs when last reference goes away
carl
parents: 143
diff changeset
270 if (last) delete pc; // free this config, since we were the last reference to it
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
271 if (helo) free(helo);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
272 reset(true);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
273 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
274
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
275 void mlfiPriv::reset(bool final) {
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
276 if (mailaddr) free(mailaddr);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
277 if (queueid) free(queueid);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
278 if (authenticated) free(authenticated);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
279 discard(env_to);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
280 if (memory) delete memory;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
281 if (scanner) delete scanner;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
282 if (assassin) delete assassin;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
283 if (!final) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
284 mailaddr = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
285 queueid = NULL;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
286 authenticated = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
287 have_whites = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
288 only_whites = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
289 memory = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
290 scanner = NULL;
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
291 assassin = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
292 content_suffix = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
293 content_message = NULL;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
294 uribl_suffix = NULL;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
295 uribl_message = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
296 content_host_ignore = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
297 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
298 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
299
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
300 void mlfiPriv::get_fd() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
301 err = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
302 fd = NULL_SOCKET;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
303 int result = pthread_mutex_lock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
304 if (!result) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
305 std::set<int>::iterator i;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
306 i = fd_pool.begin();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
307 if (i != fd_pool.end()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
308 // have at least one fd in the pool
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
309 err = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
310 fd = *i;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
311 fd_pool.erase(fd);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
312 resolver_pool_size--;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
313 pthread_mutex_unlock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
314 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
315 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
316 // pool is empty, get a new fd
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
317 pthread_mutex_unlock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
318 fd = my_connect();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
319 err = (fd == NULL_SOCKET);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
320 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
321 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
322 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
323 // cannot lock the pool, just get a new fd
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
324 fd = my_connect();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
325 err = (fd == NULL_SOCKET);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
326 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
327 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
328
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
329 void mlfiPriv::return_fd() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
330 if (err) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
331 // this fd got a socket error, so close it, rather than returning it to the pool
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
332 my_disconnect(fd);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
333 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
334 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
335 int result = pthread_mutex_lock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
336 if (!result) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
337 if ((resolver_sock_count > resolver_pool_size*5) || (resolver_pool_size < 5)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
338 // return the fd to the pool
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
339 fd_pool.insert(fd);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
340 resolver_pool_size++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
341 pthread_mutex_unlock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
342 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
343 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
344 // more than 20% of the open resolver sockets are in the pool, and the
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
345 // pool as at least 5 sockets. that is enough, so just close this one.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
346 pthread_mutex_unlock(&fd_pool_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
347 my_disconnect(fd);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
348 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
349 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
350 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
351 // could not lock the pool, so just close the fd
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
352 my_disconnect(fd);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
353 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
354 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
355 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
356
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
357 int mlfiPriv::my_write(char *buf, int len) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
358 if (err) return 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
359 int rs = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
360 while (len) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
361 int ws = write(fd, buf, len);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
362 if (ws > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
363 rs += ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
364 len -= ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
365 buf += ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
366 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
367 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
368 // peer closed the socket!
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
369 rs = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
370 err = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
371 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
372 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
373 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
374 return rs;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
375 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
376
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
377 int mlfiPriv::my_read(char *buf, int len) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
378 if (err) return 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
379 int rs = 0;
134
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
380 while (len) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
381 int ws = read(fd, buf, len);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
382 if (ws > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
383 rs += ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
384 len -= ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
385 buf += ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
386 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
387 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
388 // peer closed the socket!
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
389 rs = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
390 err = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
391 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
392 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
393 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
394 return rs;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
395 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
396
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
397 void mlfiPriv::need_content_filter(char *rcpt, CONTEXT &con) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
398 register_string(env_to, rcpt, &con);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
399 if (!memory) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
400 // first recipient that needs content filtering sets all
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
401 // the content filtering parameters
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
402 memory = new recorder(this, con.get_html_tags(), con.get_content_tlds(), con.get_content_cctlds());
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
403 scanner = new url_scanner(memory);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
404 content_suffix = con.get_content_suffix();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
405 content_message = con.get_content_message();
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
406 uribl_suffix = con.get_uribl_suffix();
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
407 uribl_message = con.get_uribl_message();
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
408 content_host_ignore = &con.get_content_host_ignore();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
409 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
410 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
411
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
412 #define MLFIPRIV ((struct mlfiPriv *) smfi_getpriv(ctx))
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
413
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
414
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
415 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
416 // syslog a message
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
417 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
418 void my_syslog(mlfiPriv *priv, char *text) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
419 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
420 if (priv) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
421 snprintf(buf, sizeof(buf), "%s: %s", priv->queueid, text);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
422 text = buf;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
423 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
424 if (use_syslog) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
425 pthread_mutex_lock(&syslog_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
426 if (!syslog_opened) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
427 openlog("dnsbl", LOG_PID, LOG_MAIL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
428 syslog_opened = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
429 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
430 syslog(LOG_NOTICE, "%s", text);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
431 pthread_mutex_unlock(&syslog_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
432 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
433 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
434 printf("%s \n", text);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
435 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
436 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
437
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
438 void my_syslog(mlfiPriv *priv, string text) {
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
439 if (debug_syslog > 3) {
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
440 char buf[maxlen];
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
441 strncpy(buf, text.c_str(), sizeof(buf));
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
442 buf[maxlen-1] = '\0'; // ensure null termination
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
443 my_syslog(priv, buf);
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
444 }
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
445 }
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
446
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
447 void my_syslog(char *text) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
448 my_syslog(NULL, text);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
449 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
450
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
451
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
452 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
453 // read a resolver request from the socket, process it, and
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
454 // write the result back to the socket.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
455
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
456 void process_resolver_requests(int socket);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
457 void process_resolver_requests(int socket) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
458 #ifdef NS_MAXDNAME
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
459 char question[NS_MAXDNAME];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
460 #else
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
461 char question[1000];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
462 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
463 glommer glom;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
464
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
465 int maxq = sizeof(question);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
466 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
467 // read a question
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
468 int rs = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
469 while (rs < maxq) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
470 int ns = read(socket, question+rs, maxq-rs);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
471 if (ns > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
472 rs += ns;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
473 if (question[rs-1] == '\0') {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
474 // last byte read was the null terminator, we are done
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
475 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
476 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
477 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
478 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
479 // peer closed the socket
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
480 #ifdef RESOLVER_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
481 my_syslog("process_resolver_requests() peer closed socket while reading question");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
482 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
483 shutdown(socket, SHUT_RDWR);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
484 close(socket);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
485 return;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
486 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
487 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
488 question[rs-1] = '\0'; // ensure null termination
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
489
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
490 // find the answer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
491 #ifdef NS_PACKETSZ
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
492 #ifdef RESOLVER_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
493 char text[1000];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
494 snprintf(text, sizeof(text), "process_resolver_requests() has a question %s", question);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
495 my_syslog(text);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
496 #endif
150
a23ef169d322 limit dns resolver timeouts and retry interval
carl
parents: 148
diff changeset
497 if ((_res.options & RES_INIT) == 0) res_init();
a23ef169d322 limit dns resolver timeouts and retry interval
carl
parents: 148
diff changeset
498 _res.retry = 2;
a23ef169d322 limit dns resolver timeouts and retry interval
carl
parents: 148
diff changeset
499 _res.retrans = RES_TIMEOUT;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
500 glom.length = res_search(question, ns_c_in, ns_t_a, glom.answer, sizeof(glom.answer));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
501 if (glom.length < 0) glom.length = 0; // represent all errors as zero length answers
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
502 #else
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
503 glom.length = sizeof(glom.answer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
504 glom.answer = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
505 struct hostent *host = gethostbyname(question);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
506 if (host && (host->h_addrtype == AF_INET)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
507 memcpy(&glom.answer, host->h_addr, sizeof(glom.answer));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
508 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
509 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
510
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
511 // write the answer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
512 char *buf = (char *)&glom;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
513 int len = glom.length + sizeof(glom.length);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
514 #ifdef RESOLVER_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
515 snprintf(text, sizeof(text), "process_resolver_requests() writing answer length %d for total %d", glom.length, len);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
516 my_syslog(text);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
517 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
518 int ws = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
519 while (len > ws) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
520 int ns = write(socket, buf+ws, len-ws);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
521 if (ns > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
522 ws += ns;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
523 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
524 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
525 // peer closed the socket!
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
526 #ifdef RESOLVER_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
527 my_syslog("process_resolver_requests() peer closed socket while writing answer");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
528 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
529 shutdown(socket, SHUT_RDWR);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
530 close(socket);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
531 return;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
532 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
533 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
534 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
535 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
536
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
537
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
538 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
539 // ask a dns question and get an A record answer - we don't try
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
540 // very hard, just using the default resolver retry settings.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
541 // If we cannot get an answer, we just accept the mail.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
542 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
543 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
544 int dns_interface(mlfiPriv &priv, char *question, bool maybe_ip, ns_map *nameservers);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
545 int dns_interface(mlfiPriv &priv, char *question, bool maybe_ip, ns_map *nameservers) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
546 // this part can be done without locking the resolver mutex. Each
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
547 // milter thread is talking over its own socket to a separate resolver
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
548 // process, which does the actual dns resolution.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
549 if (priv.err) return 0; // cannot ask more questions on this socket.
134
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
550 if (maybe_ip) {
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
551 // might be a bare ip address, try this first to avoid dns lookups that may not be needed
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
552 in_addr ip;
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
553 if (inet_aton(question, &ip)) {
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
554 return (int)ip.s_addr;
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
555 }
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
556 }
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
557 int n = strlen(question);
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
558 if (question[n-1] == '.') {
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
559 priv.my_write(question, n+1); // write the question including the null terminator
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
560 }
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
561 else {
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
562 priv.my_write(question, n); // write the question
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
563 priv.my_write(".", 2); // and the fully qualified . terminator and null string terminator
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
564 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
565 glommer glom;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
566 char *buf = (char *)&glom;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
567 priv.my_read(buf, sizeof(glom.length));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
568 buf += sizeof(glom.length);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
569 #ifdef RESOLVER_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
570 char text[1000];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
571 snprintf(text, sizeof(text), "dns_interface() wrote question %s and has answer length %d", question, glom.length);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
572 my_syslog(text);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
573 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
574 if ((glom.length < 0) || (glom.length > sizeof(glom.answer))) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
575 priv.err = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
576 return 0; // cannot process overlarge answers
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
577 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
578 priv.my_read(buf, glom.length);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
579
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
580 #ifdef NS_PACKETSZ
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
581 // now we need to lock the resolver mutex to keep the milter threads from
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
582 // stepping on each other while parsing the dns answer.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
583 int ret_address = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
584 pthread_mutex_lock(&resolve_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
585 if (glom.length > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
586 // parse the answer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
587 ns_msg handle;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
588 ns_rr rr;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
589 if (ns_initparse(glom.answer, glom.length, &handle) == 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
590 // look for ns names
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
591 if (nameservers) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
592 ns_map &ns = *nameservers;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
593 int rrnum = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
594 while (ns_parserr(&handle, ns_s_ns, rrnum++, &rr) == 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
595 if (ns_rr_type(rr) == ns_t_ns) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
596 char nam[NS_MAXDNAME+1];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
597 char *n = nam;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
598 const u_char *p = ns_rr_rdata(rr);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
599 while (((n-nam) < NS_MAXDNAME) && ((p-glom.answer) < glom.length) && *p) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
600 size_t s = *(p++);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
601 if (s > 191) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
602 // compression pointer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
603 s = (s-192)*256 + *(p++);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
604 if (s >= glom.length) break; // pointer outside bounds of answer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
605 p = glom.answer + s;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
606 s = *(p++);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
607 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
608 if (s > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
609 if ((n-nam) >= (NS_MAXDNAME-s)) break; // destination would overflow name buffer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
610 if ((p-glom.answer) >= (glom.length-s)) break; // source outside bounds of answer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
611 memcpy(n, p, s);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
612 n += s;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
613 p += s;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
614 *(n++) = '.';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
615 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
616 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
617 if (n-nam) n--; // remove trailing .
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
618 *n = '\0'; // null terminate it
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
619 ns.add(nam, question); // ns host to lookup later
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
620 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
621 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
622 rrnum = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
623 while (ns_parserr(&handle, ns_s_ar, rrnum++, &rr) == 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
624 if (ns_rr_type(rr) == ns_t_a) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
625 char* nam = (char*)ns_rr_name(rr);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
626 ns_mapper::iterator i = ns.ns_ip.find(nam);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
627 if (i != ns.ns_ip.end()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
628 // we want this ip address
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
629 int address;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
630 memcpy(&address, ns_rr_rdata(rr), sizeof(address));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
631 ns.ns_ip[nam] = address;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
632 }
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 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
636 int rrnum = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
637 while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
638 if (ns_rr_type(rr) == ns_t_a) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
639 int address;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
640 memcpy(&address, ns_rr_rdata(rr), sizeof(address));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
641 ret_address = address;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
642 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
643 }
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 pthread_mutex_unlock(&resolve_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
647 return ret_address;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
648 #else
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
649 return glom.answer;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
650 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
651 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
652
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
653
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
654 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
655 // check a single dnsbl
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
656 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
657 bool check_single(mlfiPriv &priv, int ip, char *suffix);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
658 bool check_single(mlfiPriv &priv, int ip, char *suffix) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
659 // make a dns question
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
660 const u_char *src = (const u_char *)&ip;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
661 if (src[0] == 127) return false; // don't do dns lookups on localhost
126
05ae49d37896 don't do dnsbl lookups on rfc1918 address space
carl
parents: 124
diff changeset
662 if (src[0] == 10) return false; // don't do dns lookups on rfc1918 space
05ae49d37896 don't do dnsbl lookups on rfc1918 address space
carl
parents: 124
diff changeset
663 if ((src[0] == 192) && (src[1] == 168)) return false;
05ae49d37896 don't do dnsbl lookups on rfc1918 address space
carl
parents: 124
diff changeset
664 if ((src[0] == 172) && (16 <= src[1]) && (src[1] <= 31)) return false;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
665 #ifdef NS_MAXDNAME
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
666 char question[NS_MAXDNAME];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
667 #else
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
668 char question[1000];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
669 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
670 snprintf(question, sizeof(question), "%u.%u.%u.%u.%s.", src[3], src[2], src[1], src[0], suffix);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
671 // ask the question, if we get an A record it implies a blacklisted ip address
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
672 return dns_interface(priv, question, false, NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
673 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
674
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
675
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
676 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
677 // check a single dnsbl
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
678 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
679 bool check_single(mlfiPriv &priv, int ip, DNSBL &bl);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
680 bool check_single(mlfiPriv &priv, int ip, DNSBL &bl) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
681 return check_single(priv, ip, bl.suffix);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
682 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
683
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
684
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
685 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
686 // check the dnsbls specified for this recipient
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
687 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
688 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
689 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
690 for (dnsblp_list::iterator i=dnsbll.begin(); i!=dnsbll.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
691 DNSBLP dp = *i; // non null by construction
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
692 bool st;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
693 map<DNSBLP, bool>::iterator f = priv.checked.find(dp);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
694 if (f == priv.checked.end()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
695 // have not checked this list yet
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
696 st = check_single(priv, priv.ip, *dp);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
697 rejectlist = dp;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
698 priv.checked[dp] = st;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
699 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
700 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
701 st = (*f).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
702 rejectlist = (*f).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
703 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
704 if (st) return st;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
705 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
706 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
707 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
708
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
709
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
710 ////////////////////////////////////////////////
134
f9917ce924a3 all dns lookups fully qualified, my_read() bug fix
carl
parents: 132
diff changeset
711 // lookup the domain name part of a hostname on the uribl
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
712 //
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
713 // if we find part of the hostname on the uribl, return
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
714 // true and point found to the part of the hostname that we found.
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
715 // otherwise, return false and preserve the value of found.
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
716 //
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
717 bool uriblookup(mlfiPriv &priv ,char *hostname, char *top, char *&found) ;
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
718 bool uriblookup(mlfiPriv &priv, char *hostname, char *top, char *&found) {
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
719 // top is pointer to '.' char at end of base domain, or null for ip address form
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
720 // so for hostname of www.fred.mydomain.co.uk
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
721 // top points to-----------------------^
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
722 // and we end up looking at only mydomain.co.uk, ignoring the www.fred stuff
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
723 char buf[maxlen];
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
724 if (top) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
725 // add one more component
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
726 *top = '\0';
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
727 char *x = strrchr(hostname, '.');
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
728 if (x) hostname = x+1;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
729 *top = '.';
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
730 }
131
df355d117199 uribl lookups fully qualified; allow two component host names
carl
parents: 129
diff changeset
731 snprintf(buf, sizeof(buf), "%s.%s.", hostname, priv.uribl_suffix);
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
732 if (dns_interface(priv, buf, false, NULL)) {
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
733 if (debug_syslog > 2) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
734 char tmp[maxlen];
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
735 snprintf(tmp, sizeof(tmp), "found %s on %s", hostname, priv.uribl_suffix);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
736 my_syslog(tmp);
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
737 }
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
738 found = hostname;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
739 return true;
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
740 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
741 return false;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
742 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
743
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
744
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
745 ////////////////////////////////////////////////
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
746 // uribl checker
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
747 // -------------
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
748 // hostname MUST not have a trailing dot
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
749 // If tld, two level lookup.
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
750 // Else, look up three level domain.
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
751 //
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
752 // if we find part of the hostname on the uribl, return
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
753 // true and point found to the part of the hostname that we found.
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
754 // otherwise, return false and preserve the value of found.
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
755 //
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
756 bool check_uribl(mlfiPriv &priv, char *hostname, char *&found) ;
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
757 bool check_uribl(mlfiPriv &priv, char *hostname, char *&found) {
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
758 in_addr ip;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
759 if (inet_aton(hostname, &ip)) {
120
1d9e6c1b8872 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 119
diff changeset
760 const u_char *src = (const u_char *)&ip.s_addr;
128
9ab51896447f don't do uribl lookups on rfc1918 address space
carl
parents: 127
diff changeset
761 if (src[0] == 127) return false; // don't do dns lookups on localhost
9ab51896447f don't do uribl lookups on rfc1918 address space
carl
parents: 127
diff changeset
762 if (src[0] == 10) return false; // don't do dns lookups on rfc1918 space
9ab51896447f don't do uribl lookups on rfc1918 address space
carl
parents: 127
diff changeset
763 if ((src[0] == 192) && (src[1] == 168)) return false;
9ab51896447f don't do uribl lookups on rfc1918 address space
carl
parents: 127
diff changeset
764 if ((src[0] == 172) && (16 <= src[1]) && (src[1] <= 31)) return false;
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
765 static char adr[sizeof "255.255.255.255"];
120
1d9e6c1b8872 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 119
diff changeset
766 snprintf(adr, sizeof(adr), "%u.%u.%u.%u", src[3], src[2], src[1], src[0]);
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
767 return (uriblookup(priv, adr, NULL, found));
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
768 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
769
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
770 char *top, *top2, *top3;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
771 top = strrchr(hostname, '.');
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
772 if (top) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
773 *top = '\0';
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
774 top2 = strrchr(hostname, '.');
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
775 *top = '.';
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
776
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
777 if (top2) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
778 string_set::iterator i = priv.memory->get_cctlds()->find(top2+1);
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
779 string_set::iterator x = priv.memory->get_cctlds()->end();
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
780 // if we have a 2-level-cctld, just look at top three levels of the name
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
781 if (i != x) return uriblookup(priv, hostname, top2, found);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
782
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
783 *top2 = '\0';
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
784 top3 = strrchr(hostname, '.');
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
785 *top2 = '.';
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
786
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
787 // if we have more than 3 levels in the name, look at the top three levels of the name
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
788 if (top3 && uriblookup(priv, hostname, top2, found)) return true;
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
789 // if that was not found, fall thru to looking at the top two levels
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
790 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
791 // look at the top two levels of the name
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
792 return uriblookup(priv, hostname, top, found);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
793 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
794 return false;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
795 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
796
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
797
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
798 ////////////////////////////////////////////////
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
799 // check the hosts from the body against the content filter and uribl dnsbls
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
800 //
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
801 //
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
802 bool check_hosts(mlfiPriv &priv, bool random, int limit, char *&msg, char *&host, int &ip, char *&found);
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
803 bool check_hosts(mlfiPriv &priv, bool random, int limit, char *&msg, char *&host, int &ip, char *&found) {
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
804 found = NULL; // normally ip address style
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
805 if (!priv.content_suffix && !priv.uribl_suffix) return false; // nothing to check
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
806 CONFIG &dc = *priv.pc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
807 string_set &hosts = priv.memory->get_hosts();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
808 string_set &ignore = *priv.content_host_ignore;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
809
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
810 int count = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
811 int cnt = hosts.size(); // number of hosts we could look at
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
812 int_set ips;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
813 ns_map nameservers;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
814 for (string_set::iterator i=hosts.begin(); i!=hosts.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
815 host = *i; // a reference into hosts, which will live until this smtp transaction is closed
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
816
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
817 // don't bother looking up hosts on the ignore list
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
818 string_set::iterator j = ignore.find(host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
819 if (j != ignore.end()) continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
820
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
821 // try to only look at limit/cnt fraction of the available cnt host names in random mode
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
822 if ((cnt > limit) && (limit > 0) && random) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
823 int r = rand() % cnt;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
824 if (r >= limit) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
825 if (debug_syslog > 2) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
826 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
827 snprintf(buf, sizeof(buf), "host %s skipped", host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
828 my_syslog(&priv, buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
829 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
830 continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
831 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
832 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
833 count++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
834 ip = dns_interface(priv, host, true, &nameservers);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
835 if (debug_syslog > 2) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
836 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
837 if (ip) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
838 char adr[sizeof "255.255.255.255"];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
839 adr[0] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
840 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
841 snprintf(buf, sizeof(buf), "host %s found at %s", host, adr);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
842 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
843 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
844 snprintf(buf, sizeof(buf), "host %s not found", host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
845 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
846 my_syslog(&priv, buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
847 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
848 if (ip) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
849 int_set::iterator i = ips.find(ip);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
850 if (i == ips.end()) {
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 115
diff changeset
851 // we haven't looked this up yet
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
852 ips.insert(ip);
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
853 // check dnsbl style list
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
854 if (priv.content_suffix && check_single(priv, ip, priv.content_suffix)) {
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
855 msg = priv.content_message;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
856 return true;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
857 }
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
858 // Check uribl & surbl style list
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
859 if (priv.uribl_suffix && check_uribl(priv, host, found)) {
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
860 msg = priv.uribl_message;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
861 return true;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
862 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
863 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
864 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
865 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
866 limit *= 4; // allow average of 3 ns per host name
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
867 for (ns_mapper::iterator i=nameservers.ns_ip.begin(); i!=nameservers.ns_ip.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
868 count++;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
869 if ((count > limit) && (limit > 0)) return false; // too many name servers to check them all
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
870 host = (*i).first; // a transient reference that needs to be replaced before we return it
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
871 ip = (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
872 if (!ip) ip = dns_interface(priv, host, false, NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
873 if (debug_syslog > 2) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
874 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
875 if (ip) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
876 char adr[sizeof "255.255.255.255"];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
877 adr[0] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
878 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
879 snprintf(buf, sizeof(buf), "ns %s found at %s", host, adr);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
880 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
881 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
882 snprintf(buf, sizeof(buf), "ns %s not found", host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
883 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
884 my_syslog(&priv, buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
885 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
886 if (ip) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
887 int_set::iterator i = ips.find(ip);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
888 if (i == ips.end()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
889 ips.insert(ip);
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
890 if (check_single(priv, ip, priv.content_suffix)) {
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
891 msg = priv.content_message;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
892 string_map::iterator j = nameservers.ns_host.find(host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
893 if (j != nameservers.ns_host.end()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
894 char *refer = (*j).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
895 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
896 snprintf(buf, sizeof(buf), "%s with nameserver %s", refer, host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
897 host = register_string(hosts, buf); // put a copy into hosts, and return that reference
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
898 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
899 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
900 host = register_string(hosts, host); // put a copy into hosts, and return that reference
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
901 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
902 return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
903 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
904 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
905 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
906 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
907 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
908 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
909
127
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
910
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
911 ////////////////////////////////////////////////
127
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
912 //
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
913 // this email address is passed in from sendmail, and will normally be
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
914 // enclosed in <>. I think older versions of sendmail supplied the <>
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
915 // 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
916 // that. So the <> wrapper is now optional. It may have mixed case, just
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
917 // as the mail client sent it. We dup the string and convert the duplicate
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
918 // to lower case.
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
919 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
920 char *to_lower_string(char *email);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
921 char *to_lower_string(char *email) {
127
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
922 int n = strlen(email);
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
923 if (*email == '<') {
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
924 // assume it also ends with >
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
925 n -= 2;
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
926 if (n < 1) return strdup(email); // return "<>"
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
927 email++;
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
928 }
2b1a4701e856 sendmail no longer guarantees <> wrapper on envelopes
carl
parents: 126
diff changeset
929 char *key = strdup(email);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
930 key[n] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
931 for (int i=0; i<n; i++) key[i] = tolower(key[i]);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
932 return key;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
933 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
934
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
935
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
936 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
937 // start of sendmail milter interfaces
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
938 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
939 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
940 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
941 // allocate some private memory
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
942 mlfiPriv *priv = new mlfiPriv;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
943 if (hostaddr->sa_family == AF_INET) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
944 priv->ip = ((struct sockaddr_in *)hostaddr)->sin_addr.s_addr;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
945 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
946 // save the private data
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
947 smfi_setpriv(ctx, (void*)priv);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
948
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
949 // continue processing
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
950 return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
951 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
952
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
953 sfsistat mlfi_helo(SMFICTX * ctx, char *helohost)
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
954 {
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
955 mlfiPriv &priv = *MLFIPRIV;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
956 priv.helo = strdup(helohost);
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
957 return SMFIS_CONTINUE;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
958 }
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
959
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
960 sfsistat mlfi_envfrom(SMFICTX *ctx, char **from)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
961 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
962 mlfiPriv &priv = *MLFIPRIV;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
963 priv.mailaddr = to_lower_string(from[0]);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
964 priv.queueid = strdup(smfi_getsymval(ctx, "i"));
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
965 priv.authenticated = smfi_getsymval(ctx, "{auth_authen}");
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
966 if (priv.authenticated) priv.authenticated = strdup(priv.authenticated);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
967 priv.assassin = new SpamAssassin;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
968 priv.assassin->mlfi_connect(&priv, priv.ip);
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
969 priv.assassin->mlfi_helo(priv.helo);
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
970 priv.assassin->mlfi_envfrom(priv.mailaddr, priv.queueid);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
971 return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
972 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
973
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
974 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **rcpt)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
975 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
976 DNSBLP rejectlist = NULL; // list that caused the reject
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
977 mlfiPriv &priv = *MLFIPRIV;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
978 CONFIG &dc = *priv.pc;
152
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
979 char *rcptaddr = rcpt[0];
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
980 char *loto = to_lower_string(rcptaddr);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
981 priv.assassin->mlfi_envrcpt(ctx, loto);
152
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
982 // priv.mailaddr sending original message to loto
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
983 CONTEXT &con = *(dc.find_context(loto)->find_context(priv.mailaddr));
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
984 VERIFYP ver = con.find_verify(loto);
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
985 char *fromvalue = con.find_from(priv.mailaddr);
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
986 // loto sending a reply back to priv.mailaddr
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
987 CONTEXT &con2 = *(dc.find_context(priv.mailaddr)->find_context(loto));
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
988 char *replyvalue = con2.find_from(loto);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
989 if (debug_syslog > 1) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
990 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
991 char msg[maxlen];
156
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
992 snprintf(msg, sizeof(msg), "from <%s> to <%s> using context %s state %s reply state %s", priv.mailaddr, loto, con.get_full_name(buf,maxlen), fromvalue, replyvalue);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
993 my_syslog(&priv, msg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
994 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
995 free(loto);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
996 status st;
152
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
997 if (replyvalue == token_black) {
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
998 smfi_setreply(ctx, "550", "5.7.1", "recipient can not reply due to blacklisting");
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
999 return SMFIS_REJECT;
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 150
diff changeset
1000 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1001 if (priv.authenticated) {
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1002 int c = incr_rcpt_count(priv.authenticated);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1003 int l = dc.default_context->find_rate(priv.authenticated);
142
b82e00146672 always log smth auth rate counts
carl
parents: 140
diff changeset
1004 if (debug_syslog > 1) {
b82e00146672 always log smth auth rate counts
carl
parents: 140
diff changeset
1005 char buf[maxlen];
b82e00146672 always log smth auth rate counts
carl
parents: 140
diff changeset
1006 char msg[maxlen];
b82e00146672 always log smth auth rate counts
carl
parents: 140
diff changeset
1007 snprintf(msg, sizeof(msg), "authenticated id %s (%d recipients, %d limit)", priv.authenticated, c, l);
b82e00146672 always log smth auth rate counts
carl
parents: 140
diff changeset
1008 my_syslog(&priv, msg);
b82e00146672 always log smth auth rate counts
carl
parents: 140
diff changeset
1009 }
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1010 if (c > l) {
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1011 smfi_setreply(ctx, "550", "5.7.1", "recipient rate limit exceeded");
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1012 return SMFIS_REJECT;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1013 }
142
b82e00146672 always log smth auth rate counts
carl
parents: 140
diff changeset
1014 st = white;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1015 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1016 else if (fromvalue == token_black) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1017 st = black;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1018 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1019 else if (fromvalue == token_white) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1020 st = white;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1021 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1022 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1023 // check the dns based lists
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1024 st = (check_dnsbl(priv, con.get_dnsbl_list(), rejectlist)) ? reject : oksofar;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1025 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1026 if (st == reject) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1027 // reject the recipient based on some dnsbl
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1028 char adr[sizeof "255.255.255.255"];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1029 adr[0] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1030 inet_ntop(AF_INET, (const u_char *)&priv.ip, adr, sizeof(adr));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1031 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1032 snprintf(buf, sizeof(buf), rejectlist->message, adr, adr);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1033 smfi_setreply(ctx, "550", "5.7.1", buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1034 return SMFIS_REJECT;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1035 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1036 if (st == black) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1037 // reject the recipient based on blacklisting either from or to
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1038 smfi_setreply(ctx, "550", "5.7.1", "no such user");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1039 return SMFIS_REJECT;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1040 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1041 if (ver && (st != white)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1042 // try to verify this from/to pair of addresses since it is not explicitly whitelisted
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1043 char *loto = to_lower_string(rcptaddr);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1044 bool rc = ver->ok(priv.mailaddr, loto);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1045 free(loto);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1046 if (!rc) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1047 smfi_setreply(ctx, "550", "5.7.1", "no such user");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1048 return SMFIS_REJECT;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1049 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1050 }
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1051 // we will accept the recipient, but add an auto-whitelist entry
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1052 // if needed to ensure we can accept replies
162
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 159
diff changeset
1053 loto = to_lower_string(rcptaddr);
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 159
diff changeset
1054 WHITELISTERP w = con2.find_autowhite(loto, priv.mailaddr);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1055 if (w) {
156
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
1056 if (debug_syslog > 1) {
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
1057 char buf[maxlen];
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
1058 char msg[maxlen];
159
ea7c57a4a2d1 add auto whitelisting
carl
parents: 156
diff changeset
1059 snprintf(msg, sizeof(msg), "whitelist reply from <%s> in context %s", loto, con2.get_full_name(buf,maxlen));
156
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
1060 my_syslog(&priv, msg);
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
1061 }
154
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
1062 w->sent(loto); // don't free it, the whitelister takes ownership of the string
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1063 }
162
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 159
diff changeset
1064 else {
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 159
diff changeset
1065 free(loto);
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 159
diff changeset
1066 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1067 // accept the recipient
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1068 if (!con.get_content_filtering()) st = white;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1069 if (st == oksofar) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1070 // but remember the non-whites
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1071 priv.need_content_filter(rcptaddr, con);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1072 priv.only_whites = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1073 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1074 if (st == white) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1075 priv.have_whites = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1076 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1077 return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1078 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1079
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1080 sfsistat mlfi_header(SMFICTX* ctx, char* headerf, char* headerv)
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1081 {
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1082 mlfiPriv &priv = *MLFIPRIV;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1083 if (priv.authenticated) return SMFIS_CONTINUE;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1084 if (priv.only_whites) return SMFIS_CONTINUE;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1085 priv.assassin->mlfi_header(headerf, headerv);
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1086 return SMFIS_CONTINUE;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1087 }
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1088
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1089 sfsistat mlfi_eoh(SMFICTX* ctx)
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1090 {
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1091 mlfiPriv &priv = *MLFIPRIV;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1092 if (priv.authenticated) return SMFIS_CONTINUE;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1093 if (priv.only_whites) return SMFIS_CONTINUE;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1094 priv.assassin->mlfi_eoh();
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1095 return SMFIS_CONTINUE;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1096 }
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1097
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1098 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1099 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1100 mlfiPriv &priv = *MLFIPRIV;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1101 if (priv.authenticated) return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1102 if (priv.only_whites) return SMFIS_CONTINUE;
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1103 priv.assassin->mlfi_body(data, len);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1104 priv.scanner->scan(data, len);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1105 return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1106 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1107
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1108 sfsistat mlfi_eom(SMFICTX *ctx)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1109 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1110 sfsistat rc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1111 mlfiPriv &priv = *MLFIPRIV;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1112 CONFIG &dc = *priv.pc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1113 char *host = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1114 int ip;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1115 status st;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1116 // process end of message
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1117 if (priv.authenticated || priv.only_whites) rc = SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1118 else {
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1119 int score = priv.assassin->mlfi_eom();
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1120 // assert env_to not empty
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1121 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1122 char *msg = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1123 string_set alive;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1124 bool random = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1125 int limit = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1126 for (context_map::iterator i=priv.env_to.begin(); i!=priv.env_to.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1127 char *rcpt = (*i).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1128 CONTEXT &con = *((*i).second);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1129 if (!con.acceptable_content(*priv.memory, score, msg)) {
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1130 // bad html tags or excessive hosts or high spam assassin score
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1131 smfi_delrcpt(ctx, rcpt);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1132 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1133 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1134 alive.insert(rcpt);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1135 random |= con.get_host_random();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1136 limit = max(limit, con.get_host_limit());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1137 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1138 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1139 bool rejecting = alive.empty(); // if alive is empty, we must have set msg above in acceptable_content()
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1140 if (!rejecting) {
124
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1141 char *fmt, *found;
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1142 if (check_hosts(priv, random, limit, fmt, host, ip, found)) {
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1143 if (found) {
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1144 // uribl style
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1145 snprintf(buf, sizeof(buf), fmt, host, found);
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1146 }
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1147 else {
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1148 // dnsbl style
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1149 char adr[sizeof "255.255.255.255"];
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1150 adr[0] = '\0';
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1151 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1152 snprintf(buf, sizeof(buf), fmt, host, adr);
ea6f9c812faa put hostname in smtp message for uribl style lookups
carl
parents: 123
diff changeset
1153 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1154 msg = buf;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1155 rejecting = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1156 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1157 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1158 if (!rejecting) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1159 rc = SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1160 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1161 else if (!priv.have_whites) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1162 // can reject the entire message
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1163 smfi_setreply(ctx, "550", "5.7.1", msg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1164 rc = SMFIS_REJECT;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1165 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1166 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1167 // need to accept it but remove the recipients that don't want it
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1168 for (string_set::iterator i=alive.begin(); i!=alive.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1169 char *rcpt = *i;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1170 smfi_delrcpt(ctx, rcpt);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1171 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1172 rc = SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1173 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1174 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1175 // reset for a new message on the same connection
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1176 mlfi_abort(ctx);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1177 return rc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1178 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1179
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1180 sfsistat mlfi_abort(SMFICTX *ctx)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1181 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1182 mlfiPriv &priv = *MLFIPRIV;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1183 priv.reset();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1184 return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1185 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1186
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1187 sfsistat mlfi_close(SMFICTX *ctx)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1188 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1189 mlfiPriv *priv = MLFIPRIV;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1190 if (!priv) return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1191 delete priv;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1192 smfi_setpriv(ctx, NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1193 return SMFIS_CONTINUE;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1194 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1195
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1196 struct smfiDesc smfilter =
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1197 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1198 "DNSBL", // filter name
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1199 SMFI_VERSION, // version code -- do not change
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1200 SMFIF_DELRCPT, // flags
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1201 mlfi_connect, // connection info filter
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1202 mlfi_helo, // SMTP HELO command filter
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1203 mlfi_envfrom, // envelope sender filter
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1204 mlfi_envrcpt, // envelope recipient filter
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1205 mlfi_header, // header filter
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1206 mlfi_eoh, // end of header
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1207 mlfi_body, // body block filter
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1208 mlfi_eom, // end of message
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1209 mlfi_abort, // message aborted
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1210 mlfi_close, // connection cleanup
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1211 };
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1212
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1213
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1214 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1215 // reload the config
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1216 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1217 CONFIG* new_conf();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1218 CONFIG* new_conf() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1219 CONFIG *newc = new CONFIG;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1220 pthread_mutex_lock(&config_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1221 newc->generation = generation++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1222 pthread_mutex_unlock(&config_mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1223 if (debug_syslog) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1224 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1225 snprintf(buf, sizeof(buf), "loading configuration generation %d", newc->generation);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1226 my_syslog(buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1227 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1228 if (load_conf(*newc, "dnsbl.conf")) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1229 newc->load_time = time(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1230 return newc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1231 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1232 delete newc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1233 return NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1234 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1235
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1236
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1237 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1238 // thread to watch the old config files for changes
146
7278c9766e26 free old configs when last reference goes away
carl
parents: 143
diff changeset
1239 // and reload when needed.
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1240 // we also clear the SMTP AUTH recipient counts hourly
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1241 //
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1242 extern "C" {void* config_loader(void *arg);}
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1243 void* config_loader(void *arg) {
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1244 int loop = 0;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1245 while (loader_run) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1246 sleep(180); // look for modifications every 3 minutes
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1247 if (!loader_run) break;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1248 loop++;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1249 if (loop == 20) {
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1250 // three minutes thru each loop, 20 loops per hour
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1251 // clear the recipient counts
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1252 pthread_mutex_lock(&rate_mutex);
138
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
1253 for (rcpt_rates::iterator i=rcpt_counts.begin(); i!=rcpt_counts.end(); i++) {
140
4028de9b46dd cleanup smtp rate limit code
carl
parents: 139
diff changeset
1254 (*i).second = 0;
138
9d0bc30b4576 add smtp auth rate limits
carl
parents: 137
diff changeset
1255 }
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1256 pthread_mutex_unlock(&rate_mutex);
137
a6190f7798f4 add smtp auth rate limits
carl
parents: 136
diff changeset
1257 loop = 0;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 134
diff changeset
1258 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1259 CONFIG &dc = *config;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1260 time_t then = dc.load_time;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1261 struct stat st;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1262 bool reload = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1263 for (string_set::iterator i=dc.config_files.begin(); i!=dc.config_files.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1264 char *fn = *i;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1265 if (stat(fn, &st)) reload = true; // file disappeared
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1266 else if (st.st_mtime > then) reload = true; // file modified
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1267 if (reload) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1268 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1269 if (reload) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1270 CONFIG *newc = new_conf();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1271 if (newc) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1272 // replace the global config pointer
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1273 pthread_mutex_lock(&config_mutex);
146
7278c9766e26 free old configs when last reference goes away
carl
parents: 143
diff changeset
1274 CONFIG *pc = config;
7278c9766e26 free old configs when last reference goes away
carl
parents: 143
diff changeset
1275 bool last = pc && (!pc->reference_count);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1276 config = newc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1277 pthread_mutex_unlock(&config_mutex);
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1278 if (last) delete pc; // there were no references to this config
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1279 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1280 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1281 // failed to load new config
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1282 my_syslog("failed to load new configuration");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1283 system("echo 'failed to load new dnsbl configuration from /etc/dnsbl' | mail -s 'error in /etc/dnsbl configuration' root");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1284 // update the load time on the current config to prevent complaining every 3 minutes
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1285 dc.load_time = time(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1286 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1287 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1288 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1289 return NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1290 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1291
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1292
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1293 void usage(char *prog);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1294 void usage(char *prog)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1295 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1296 fprintf(stderr, "Usage: %s [-d [level]] [-c] [-s] [-e from|to] -r port -p sm-sock-addr [-t timeout]\n", prog);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1297 fprintf(stderr, "where port is for the connection to our own dns resolver processes\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1298 fprintf(stderr, " and should be local-domain-socket-file-name\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1299 fprintf(stderr, "where sm-sock-addr is for the connection to sendmail\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1300 fprintf(stderr, " and should be one of\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1301 fprintf(stderr, " inet:port@ip-address\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1302 fprintf(stderr, " local:local-domain-socket-file-name\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1303 fprintf(stderr, "-c will load and dump the config to stdout\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1304 fprintf(stderr, "-s will stress test the config loading code by repeating the load/free cycle\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1305 fprintf(stderr, " in an infinte loop.\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1306 fprintf(stderr, "-d will set the syslog message level, currently 0 to 3\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1307 fprintf(stderr, "-e will print the results of looking up the from and to addresses in the\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1308 fprintf(stderr, " current config. The | character is used to separate the from and to\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1309 fprintf(stderr, " addresses in the argument to the -e switch\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1310 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1311
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1312
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1313
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1314 void setup_socket(char *sock);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1315 void setup_socket(char *sock) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1316 unlink(sock);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1317 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1318
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1319
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1320 /*
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1321 * The signal handler function -- only gets called when a SIGCHLD
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1322 * is received, ie when a child terminates
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1323 */
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1324 void sig_chld(int signo)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1325 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1326 int status;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1327 /* Wait for any child without blocking */
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1328 while (waitpid(-1, &status, WNOHANG) > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1329 // ignore child exit status, we only do this to cleanup zombies
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1330 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1331 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1332
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1333
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1334 int main(int argc, char**argv)
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1335 {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1336 token_init();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1337 bool check = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1338 bool stress = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1339 bool setconn = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1340 bool setreso = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1341 char *email = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1342 int c;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1343 const char *args = "r:p:t:e:d:chs";
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1344 extern char *optarg;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1345
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1346 // Process command line options
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1347 while ((c = getopt(argc, argv, args)) != -1) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1348 switch (c) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1349 case 'r':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1350 if (optarg == NULL || *optarg == '\0') {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1351 fprintf(stderr, "Illegal resolver socket: %s\n", optarg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1352 exit(EX_USAGE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1353 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1354 resolver_port = strdup(optarg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1355 setup_socket(resolver_port);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1356 setreso = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1357 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1358
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1359 case 'p':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1360 if (optarg == NULL || *optarg == '\0') {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1361 fprintf(stderr, "Illegal sendmail socket: %s\n", optarg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1362 exit(EX_USAGE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1363 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1364 if (smfi_setconn(optarg) == MI_FAILURE) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1365 fprintf(stderr, "smfi_setconn failed\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1366 exit(EX_SOFTWARE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1367 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1368 if (strncasecmp(optarg, "unix:", 5) == 0) setup_socket(optarg + 5);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1369 else if (strncasecmp(optarg, "local:", 6) == 0) setup_socket(optarg + 6);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1370 setconn = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1371 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1372
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1373 case 't':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1374 if (optarg == NULL || *optarg == '\0') {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1375 fprintf(stderr, "Illegal timeout: %s\n", optarg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1376 exit(EX_USAGE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1377 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1378 if (smfi_settimeout(atoi(optarg)) == MI_FAILURE) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1379 fprintf(stderr, "smfi_settimeout failed\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1380 exit(EX_SOFTWARE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1381 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1382 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1383
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1384 case 'e':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1385 if (email) free(email);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1386 email = strdup(optarg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1387 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1388
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1389 case 'c':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1390 check = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1391 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1392
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1393 case 's':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1394 stress = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1395 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1396
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1397 case 'd':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1398 if (optarg == NULL || *optarg == '\0') debug_syslog = 1;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1399 else debug_syslog = atoi(optarg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1400 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1401
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1402 case 'h':
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1403 default:
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1404 usage(argv[0]);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1405 exit(EX_USAGE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1406 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1407 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1408
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1409 if (check) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1410 use_syslog = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1411 debug_syslog = 10;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1412 CONFIG *conf = new_conf();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1413 if (conf) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1414 conf->dump();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1415 delete conf;
164
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1416 clear_strings(); // for valgrind checking
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1417 return 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1418 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1419 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1420 return 1; // config failed to load
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1421 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1422 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1423
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1424 if (stress) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1425 fprintf(stdout, "stress testing\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1426 while (1) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1427 for (int i=0; i<10; i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1428 CONFIG *conf = new_conf();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1429 if (conf) delete conf;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1430 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1431 fprintf(stdout, ".");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1432 fflush(stdout);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1433 sleep(1);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1434 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1435 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1436
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1437 if (email) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1438 char *x = strchr(email, '|');
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1439 if (x) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1440 *x = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1441 char *from = strdup(email);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1442 char *to = strdup(x+1);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1443 use_syslog = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1444 CONFIG *conf = new_conf();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1445 if (conf) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1446 CONTEXTP con = conf->find_context(to);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1447 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1448 fprintf(stdout, "envelope to <%s> finds context %s\n", to, con->get_full_name(buf,maxlen));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1449 CONTEXTP fc = con->find_context(from);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1450 fprintf(stdout, "envelope from <%s> finds context %s\n", from, fc->get_full_name(buf,maxlen));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1451 char *st = fc->find_from(from);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1452 fprintf(stdout, "envelope from <%s> finds status %s\n", from, st);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1453 delete conf;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1454 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1455 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1456 return 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1457 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1458
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1459 if (!setconn) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1460 fprintf(stderr, "%s: Missing required -p argument\n", argv[0]);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1461 usage(argv[0]);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1462 exit(EX_USAGE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1463 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1464
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1465 if (!setreso) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1466 fprintf(stderr, "%s: Missing required -r argument\n", argv[0]);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1467 usage(argv[0]);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1468 exit(EX_USAGE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1469 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1470
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1471 if (smfi_register(smfilter) == MI_FAILURE) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1472 fprintf(stderr, "smfi_register failed\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1473 exit(EX_UNAVAILABLE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1474 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1475
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1476 // switch to background mode
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1477 if (daemon(1,0) < 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1478 fprintf(stderr, "daemon() call failed\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1479 exit(EX_UNAVAILABLE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1480 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1481
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1482 // write the pid
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1483 const char *pidpath = "/var/run/dnsbl.pid";
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1484 unlink(pidpath);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1485 FILE *f = fopen(pidpath, "w");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1486 if (f) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1487 #ifdef linux
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1488 // from a comment in the DCC source code:
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1489 // Linux threads are broken. Signals given the
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1490 // original process are delivered to only the
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1491 // thread that happens to have that PID. The
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1492 // sendmail libmilter thread that needs to hear
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1493 // SIGINT and other signals does not, and that breaks
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1494 // scripts that need to stop milters.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1495 // However, signaling the process group works.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1496 fprintf(f, "-%d\n", (u_int)getpgrp());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1497 #else
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1498 fprintf(f, "%d\n", (u_int)getpid());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1499 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1500 fclose(f);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1501 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1502
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1503 // initialize the thread sync objects
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1504 pthread_mutex_init(&config_mutex, 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1505 pthread_mutex_init(&syslog_mutex, 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1506 pthread_mutex_init(&resolve_mutex, 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1507 pthread_mutex_init(&fd_pool_mutex, 0);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1508 pthread_mutex_init(&verifier_mutex, 0);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1509 pthread_mutex_init(&whitelister_mutex, 0);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1510
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1511 // drop root privs
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1512 struct passwd *pw = getpwnam("dnsbl");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1513 if (pw) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1514 if (setgid(pw->pw_gid) == -1) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1515 my_syslog("failed to switch to group dnsbl");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1516 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1517 if (setuid(pw->pw_uid) == -1) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1518 my_syslog("failed to switch to user dnsbl");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1519 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1520 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1521
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1522 // load the initial config
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1523 config = new_conf();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1524 if (!config) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1525 my_syslog("failed to load initial configuration, quitting");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1526 exit(1);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1527 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1528
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1529 // fork off the resolver listener process
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1530 pid_t child = fork();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1531 if (child < 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1532 my_syslog("failed to create resolver listener process");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1533 exit(0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1534 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1535 if (child == 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1536 // we are the child - dns resolver listener process
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1537 resolver_socket = socket(AF_UNIX, SOCK_STREAM, 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1538 if (resolver_socket < 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1539 my_syslog("child failed to create resolver socket");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1540 exit(0); // failed
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1541 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1542 sockaddr_un server;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1543 memset(&server, '\0', sizeof(server));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1544 server.sun_family = AF_UNIX;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1545 strncpy(server.sun_path, resolver_port, sizeof(server.sun_path)-1);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1546 //try to bind the address to the socket.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1547 if (bind(resolver_socket, (sockaddr *)&server, sizeof(server)) < 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1548 // bind failed
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1549 shutdown(resolver_socket, SHUT_RDWR);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1550 close(resolver_socket);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1551 my_syslog("child failed to bind resolver socket");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1552 exit(0); // failed
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1553 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1554 //listen on the socket.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1555 if (listen(resolver_socket, 10) < 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1556 // listen failed
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1557 shutdown(resolver_socket, SHUT_RDWR);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1558 close(resolver_socket);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1559 my_syslog("child failed to listen to resolver socket");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1560 exit(0); // failed
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1561 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1562 // setup sigchld handler to prevent zombies
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1563 struct sigaction act;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1564 act.sa_handler = sig_chld; // Assign sig_chld as our SIGCHLD handler
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1565 sigemptyset(&act.sa_mask); // We don't want to block any other signals in this example
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1566 act.sa_flags = SA_NOCLDSTOP; // only want children that have terminated
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1567 if (sigaction(SIGCHLD, &act, NULL) < 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1568 my_syslog("child failed to setup SIGCHLD handler");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1569 exit(0); // failed
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1570 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1571 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1572 sockaddr_un client;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1573 socklen_t clientlen = sizeof(client);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1574 int s = accept(resolver_socket, (sockaddr *)&client, &clientlen);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1575 if (s > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1576 // accept worked, it did not get cancelled before we could accept it
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1577 // fork off a process to handle this connection
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1578 int newchild = fork();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1579 if (newchild == 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1580 // this is the worker process
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1581 // child does not need the listening socket
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1582 close(resolver_socket);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1583 process_resolver_requests(s);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1584 exit(0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1585 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1586 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1587 // this is the parent
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1588 // parent does not need the accepted socket
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1589 close(s);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1590 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1591 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1592 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1593 exit(0); // make sure we don't fall thru.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1594 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1595 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1596 sleep(2); // allow child to get started
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1597 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1598
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1599 // only create threads after the fork() in daemon
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1600 pthread_t tid;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1601 if (pthread_create(&tid, 0, config_loader, 0))
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1602 my_syslog("failed to create config loader thread");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1603 if (pthread_detach(tid))
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1604 my_syslog("failed to detach config loader thread");
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1605
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1606 if (pthread_create(&tid, 0, verify_closer, 0))
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1607 my_syslog("failed to create verify closer thread");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1608 if (pthread_detach(tid))
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1609 my_syslog("failed to detach verify closer thread");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1610
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1611 if (pthread_create(&tid, 0, whitelister_writer, 0))
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1612 my_syslog("failed to create autowhite writer thread");
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1613 if (pthread_detach(tid))
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1614 my_syslog("failed to detach autowhite writer thread");
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1615
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1616 time_t starting = time(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1617 int rc = smfi_main();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1618 if ((rc != MI_SUCCESS) && (time(NULL) > starting+5*60)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1619 my_syslog("trying to restart after smfi_main()");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1620 loader_run = false; // eventually the config loader thread will terminate
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1621 execvp(argv[0], argv);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1622 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1623 exit((rc == MI_SUCCESS) ? 0 : EX_UNAVAILABLE);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1624 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1625