Mercurial > dnsbl
annotate src/dnsbl.cpp @ 81:db85c53e3d90
start coding on new config syntax
| author | carl |
|---|---|
| date | Sun, 17 Jul 2005 07:34:28 -0700 |
| parents | 091d3fe3db46 |
| children | c1280cd3e248 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
3 Copyright (c) 2004, 2005 Carl Byington - 510 Software Group, released |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
4 under the GPL version 2 or any later version at your choice available at |
| 0 | 5 http://www.fsf.org/licenses/gpl.txt |
| 6 | |
| 7 Based on a sample milter Copyright (c) 2000-2003 Sendmail, Inc. and its | |
| 8 suppliers. Inspired by the DCC by Rhyolite Software | |
| 9 | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
10 -r port The port used to talk to our internal dns resolver processes |
| 0 | 11 -p port The port through which the MTA will connect to this milter. |
| 12 -t sec The timeout value. | |
| 9 | 13 -c Check the config, and print a copy to stdout. Don't start the |
| 4 | 14 milter or do anything with the socket. |
| 76 | 15 -s Stress test by loading and deleting the current config in a loop. |
| 16 | 16 -d Add debug syslog entries |
| 76 | 17 -e f|t Print the results of looking up from address f and to address |
| 18 t in the current config | |
| 16 | 19 |
| 0 | 20 |
| 13 | 21 TODO: |
| 22 | |
| 76 | 23 1) Add option for using smtp connections to verify addresses from backup |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
24 mx machines. This allows the backup mx to learn the valid addresses |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
25 on the primary machine. |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
26 |
| 0 | 27 */ |
| 28 | |
| 29 | |
| 30 // from sendmail sample | |
| 31 #include <sys/types.h> | |
| 32 #include <sys/stat.h> | |
| 33 #include <errno.h> | |
| 34 #include <sysexits.h> | |
| 35 #include <unistd.h> | |
| 36 | |
| 37 // needed for socket io | |
| 38 #include <sys/ioctl.h> | |
| 39 #include <net/if.h> | |
| 40 #include <arpa/inet.h> | |
| 41 #include <netinet/in.h> | |
| 42 #include <netinet/tcp.h> | |
| 43 #include <netdb.h> | |
| 44 #include <sys/socket.h> | |
| 42 | 45 #include <sys/un.h> |
| 0 | 46 |
| 47 // needed for thread | |
| 48 #include <pthread.h> | |
| 49 | |
| 50 // needed for std c++ collections | |
| 51 #include <set> | |
| 52 #include <map> | |
| 53 #include <list> | |
| 54 | |
| 55 // for the dns resolver | |
| 56 #include <netinet/in.h> | |
| 57 #include <arpa/nameser.h> | |
| 58 #include <resolv.h> | |
| 59 | |
| 60 // misc stuff needed here | |
| 61 #include <ctype.h> | |
| 62 #include <syslog.h> | |
| 42 | 63 #include <pwd.h> |
| 65 | 64 #include <sys/wait.h> /* header for waitpid() and various macros */ |
| 65 #include <signal.h> /* header for signal functions */ | |
| 0 | 66 |
| 72 | 67 #include "includes.h" |
| 8 | 68 |
| 73 | 69 static char* dnsbl_version="$Id$"; |
| 1 | 70 |
| 0 | 71 |
| 72 extern "C" { | |
| 73 #include "libmilter/mfapi.h" | |
| 74 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr); | |
| 75 sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv); | |
| 76 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv); | |
| 8 | 77 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len); |
| 78 sfsistat mlfi_eom(SMFICTX *ctx); | |
| 79 sfsistat mlfi_abort(SMFICTX *ctx); | |
| 0 | 80 sfsistat mlfi_close(SMFICTX *ctx); |
| 65 | 81 void sig_chld(int signo); |
| 0 | 82 } |
| 83 | |
| 72 | 84 bool debug_syslog = false; |
| 85 bool syslog_opened = false; | |
| 75 | 86 bool use_syslog = true; // false to printf |
| 87 bool loader_run = true; // used to stop the config loader thread | |
| 76 | 88 CONFIG *config = NULL; // protected by the config_mutex |
| 89 int generation = 0; // protected by the config_mutex | |
| 90 const int maxlen = 1000; // used for snprintf buffers | |
| 0 | 91 |
| 72 | 92 pthread_mutex_t config_mutex; |
| 93 pthread_mutex_t syslog_mutex; | |
| 94 pthread_mutex_t resolve_mutex; | |
| 95 pthread_mutex_t fd_pool_mutex; | |
| 0 | 96 |
| 72 | 97 std::set<int> fd_pool; |
| 98 int NULL_SOCKET = -1; | |
| 99 char *resolver_port = NULL; // unix domain socket to talk to the dns resolver process | |
| 100 int resolver_socket = NULL_SOCKET; // socket used to listen for resolver requests | |
| 101 time_t ERROR_SOCKET_TIME = 60; // number of seconds between attempts to open the spam filter socket | |
| 102 time_t last_error_time; | |
| 103 int resolver_sock_count = 0; // protected with fd_pool_mutex | |
| 104 int resolver_pool_size = 0; // protected with fd_pool_mutex | |
| 105 | |
|
53
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
106 |
|
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
107 struct ns_map { |
|
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
108 // all the strings are owned by the keys/values in the ns_host string map |
|
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
109 string_map ns_host; // nameserver name -> host name that uses this name server |
|
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
110 ns_mapper ns_ip; // nameserver name -> ip address of the name server |
| 72 | 111 ~ns_map(); |
| 112 void add(char *name, char *refer); | |
|
53
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
113 }; |
| 0 | 114 |
| 72 | 115 |
| 74 | 116 ns_map::~ns_map() { |
| 72 | 117 for (string_map::iterator i=ns_host.begin(); i!=ns_host.end(); i++) { |
| 118 char *x = (*i).first; | |
| 119 char *y = (*i).second; | |
| 120 free(x); | |
| 121 free(y); | |
| 0 | 122 } |
| 72 | 123 ns_ip.clear(); |
| 124 ns_host.clear(); | |
| 0 | 125 } |
| 126 | |
| 127 | |
| 72 | 128 void ns_map::add(char *name, char *refer) { |
| 129 string_map::iterator i = ns_host.find(name); | |
| 130 if (i != ns_host.end()) return; | |
| 131 char *x = strdup(name); | |
| 132 char *y = strdup(refer); | |
| 133 ns_ip[x] = 0; | |
| 134 ns_host[x] = y; | |
|
62
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
135 |
| 72 | 136 } |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
137 |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
138 // packed structure to allow a single socket write to dump the |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
139 // length and the following answer. The packing attribute is gcc specific. |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
140 struct glommer { |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
141 int length; |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
142 #ifdef NS_PACKETSZ |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
143 u_char answer[NS_PACKETSZ]; // with a resolver, we return resolver answers |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
144 #else |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
145 int answer; // without a resolver, we return a single ip4 address, 0 == no answer |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
146 #endif |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
147 } __attribute__ ((packed)); |
| 0 | 148 |
| 72 | 149 |
| 150 //////////////////////////////////////////////// | |
| 151 // helper to discard the strings held by a context_map | |
| 152 // | |
| 153 void discard(context_map &cm); | |
| 154 void discard(context_map &cm) { | |
| 155 for (context_map::iterator i=cm.begin(); i!=cm.end(); i++) { | |
| 156 char *x = (*i).first; | |
| 157 free(x); | |
| 158 } | |
| 76 | 159 cm.clear(); |
| 72 | 160 } |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
161 |
| 0 | 162 |
| 163 //////////////////////////////////////////////// | |
| 72 | 164 // helper to register a string in a context_map |
| 34 | 165 // |
| 72 | 166 void register_string(context_map &cm, char *name, CONTEXT *con); |
| 167 void register_string(context_map &cm, char *name, CONTEXT *con) { | |
| 168 context_map::iterator i = cm.find(name); | |
| 169 if (i != cm.end()) return; | |
| 34 | 170 char *x = strdup(name); |
| 72 | 171 cm[x] = con; |
| 34 | 172 } |
| 173 | |
| 12 | 174 |
| 0 | 175 //////////////////////////////////////////////// |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
176 // disconnect the fd from the dns resolver process |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
177 // |
|
64
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
178 void my_disconnect(int sock, bool decrement = true); |
| 72 | 179 void my_disconnect(int sock, bool decrement) { |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
180 if (sock != NULL_SOCKET) { |
|
64
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
181 if (decrement) { |
|
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
182 pthread_mutex_lock(&fd_pool_mutex); |
|
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
183 resolver_sock_count--; |
|
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
184 pthread_mutex_unlock(&fd_pool_mutex); |
|
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
185 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
186 shutdown(sock, SHUT_RDWR); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
187 close(sock); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
188 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
189 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
190 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
191 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
192 //////////////////////////////////////////////// |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
193 // return fd connected to the dns resolver process |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
194 // |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
195 int my_connect(); |
| 72 | 196 int my_connect() { |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
197 // if we have had recent errors, don't even try to open the socket |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
198 time_t now = time(NULL); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
199 if ((now - last_error_time) < ERROR_SOCKET_TIME) return NULL_SOCKET; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
200 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
201 // nothing recent, maybe this time it will work |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
202 int sock = NULL_SOCKET; |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
203 sockaddr_un server; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
204 memset(&server, '\0', sizeof(server)); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
205 server.sun_family = AF_UNIX; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
206 strncpy(server.sun_path, resolver_port, sizeof(server.sun_path)-1); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
207 sock = socket(AF_UNIX, SOCK_STREAM, 0); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
208 if (sock != NULL_SOCKET) { |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
209 bool rc = (connect(sock, (sockaddr *)&server, sizeof(server)) == 0); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
210 if (!rc) { |
|
64
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
211 my_disconnect(sock, false); |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
212 sock = NULL_SOCKET; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
213 last_error_time = now; |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
214 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
215 } |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
216 else last_error_time = now; |
|
62
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
217 if (sock != NULL_SOCKET) { |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
218 pthread_mutex_lock(&fd_pool_mutex); |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
219 resolver_sock_count++; |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
220 pthread_mutex_unlock(&fd_pool_mutex); |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
221 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
222 return sock; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
223 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
224 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
225 |
| 0 | 226 mlfiPriv::mlfiPriv() { |
| 227 pthread_mutex_lock(&config_mutex); | |
| 228 pc = config; | |
| 229 pc->reference_count++; | |
| 230 pthread_mutex_unlock(&config_mutex); | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
231 get_fd(); |
| 76 | 232 ip = 0; |
| 233 mailaddr = NULL; | |
| 234 queueid = NULL; | |
| 235 authenticated = false; | |
| 236 have_whites = false; | |
| 237 only_whites = true; | |
| 238 memory = NULL; | |
| 239 scanner = NULL; | |
| 240 content_suffix = NULL; | |
| 241 content_message = NULL; | |
| 242 content_host_ignore = NULL; | |
| 0 | 243 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
244 |
| 0 | 245 mlfiPriv::~mlfiPriv() { |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
246 return_fd(); |
| 0 | 247 pthread_mutex_lock(&config_mutex); |
| 248 pc->reference_count--; | |
| 249 pthread_mutex_unlock(&config_mutex); | |
| 8 | 250 reset(true); |
| 251 } | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
252 |
| 8 | 253 void mlfiPriv::reset(bool final) { |
| 0 | 254 if (mailaddr) free(mailaddr); |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
255 if (queueid) free(queueid); |
| 72 | 256 discard(env_to); |
| 76 | 257 if (memory) delete memory; |
| 258 if (scanner) delete scanner; | |
| 8 | 259 if (!final) { |
| 76 | 260 mailaddr = NULL; |
| 261 queueid = NULL; | |
| 262 authenticated = false; | |
| 263 have_whites = false; | |
| 264 only_whites = true; | |
| 265 memory = NULL; | |
| 266 scanner = NULL; | |
| 267 content_suffix = NULL; | |
| 268 content_message = NULL; | |
| 269 content_host_ignore = NULL; | |
| 8 | 270 } |
| 0 | 271 } |
| 272 | |
| 72 | 273 void mlfiPriv::get_fd() { |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
274 err = true; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
275 fd = NULL_SOCKET; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
276 int result = pthread_mutex_lock(&fd_pool_mutex); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
277 if (!result) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
278 std::set<int>::iterator i; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
279 i = fd_pool.begin(); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
280 if (i != fd_pool.end()) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
281 // have at least one fd in the pool |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
282 err = false; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
283 fd = *i; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
284 fd_pool.erase(fd); |
|
62
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
285 resolver_pool_size--; |
|
64
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
286 pthread_mutex_unlock(&fd_pool_mutex); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
287 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
288 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
289 // pool is empty, get a new fd |
|
64
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
290 pthread_mutex_unlock(&fd_pool_mutex); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
291 fd = my_connect(); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
292 err = (fd == NULL_SOCKET); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
293 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
294 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
295 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
296 // cannot lock the pool, just get a new fd |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
297 fd = my_connect(); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
298 err = (fd == NULL_SOCKET); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
299 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
300 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
301 |
| 72 | 302 void mlfiPriv::return_fd() { |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
303 if (err) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
304 // this fd got a socket error, so close it, rather than returning it to the pool |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
305 my_disconnect(fd); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
306 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
307 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
308 int result = pthread_mutex_lock(&fd_pool_mutex); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
309 if (!result) { |
|
63
579dc5955cbe
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
62
diff
changeset
|
310 if ((resolver_sock_count > resolver_pool_size*5) || (resolver_pool_size < 5)) { |
|
62
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
311 // return the fd to the pool |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
312 fd_pool.insert(fd); |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
313 resolver_pool_size++; |
|
64
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
314 pthread_mutex_unlock(&fd_pool_mutex); |
|
62
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
315 } |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
316 else { |
|
63
579dc5955cbe
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
62
diff
changeset
|
317 // more than 20% of the open resolver sockets are in the pool, and the |
|
579dc5955cbe
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
62
diff
changeset
|
318 // pool as at least 5 sockets. that is enough, so just close this one. |
|
64
6add229288a8
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
63
diff
changeset
|
319 pthread_mutex_unlock(&fd_pool_mutex); |
|
62
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
320 my_disconnect(fd); |
|
7ad7d8b100bf
only keep 20% of the open resolver sockets in the ready pool.
carl
parents:
61
diff
changeset
|
321 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
322 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
323 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
324 // could not lock the pool, so just close the fd |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
325 my_disconnect(fd); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
326 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
327 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
328 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
329 |
| 72 | 330 int mlfiPriv::my_write(char *buf, int len) { |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
331 if (err) return 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
332 int rs = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
333 while (len) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
334 int ws = write(fd, buf, len); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
335 if (ws > 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
336 rs += ws; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
337 len -= ws; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
338 buf += ws; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
339 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
340 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
341 // peer closed the socket! |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
342 rs = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
343 err = true; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
344 break; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
345 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
346 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
347 return rs; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
348 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
349 |
| 72 | 350 int mlfiPriv::my_read(char *buf, int len) { |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
351 if (err) return 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
352 int rs = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
353 while (len > 1) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
354 int ws = read(fd, buf, len); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
355 if (ws > 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
356 rs += ws; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
357 len -= ws; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
358 buf += ws; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
359 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
360 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
361 // peer closed the socket! |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
362 rs = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
363 err = true; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
364 break; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
365 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
366 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
367 return rs; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
368 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
369 |
| 72 | 370 void mlfiPriv::need_content_filter(char *rcpt, CONTEXT &con) { |
| 371 register_string(env_to, rcpt, &con); | |
| 76 | 372 if (!memory) { |
| 373 // first recipient that needs content filtering sets all | |
| 374 // the content filtering parameters | |
| 375 memory = new recorder(this, con.get_html_tags(), con.get_content_tlds()); | |
| 376 scanner = new url_scanner(memory); | |
| 377 content_suffix = con.get_content_suffix(); | |
| 378 content_message = con.get_content_message(); | |
| 379 content_host_ignore = &con.get_content_host_ignore(); | |
| 380 } | |
| 72 | 381 } |
| 382 | |
| 0 | 383 #define MLFIPRIV ((struct mlfiPriv *) smfi_getpriv(ctx)) |
| 384 | |
| 385 | |
| 386 //////////////////////////////////////////////// | |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
387 // syslog a message |
|
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
388 // |
| 72 | 389 void my_syslog(mlfiPriv *priv, char *text) { |
| 76 | 390 char buf[maxlen]; |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
391 if (priv) { |
| 42 | 392 snprintf(buf, sizeof(buf), "%s: %s", priv->queueid, text); |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
393 text = buf; |
|
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
394 } |
| 75 | 395 if (use_syslog) { |
| 396 pthread_mutex_lock(&syslog_mutex); | |
| 397 if (!syslog_opened) { | |
| 398 openlog("dnsbl", LOG_PID, LOG_MAIL); | |
| 399 syslog_opened = true; | |
| 400 } | |
| 401 syslog(LOG_NOTICE, "%s", text); | |
| 79 | 402 // closelog(); |
| 403 // syslog_opened = false; | |
| 75 | 404 pthread_mutex_unlock(&syslog_mutex); |
| 405 } | |
| 406 else { | |
| 407 printf("%s \n", text); | |
| 408 } | |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
409 } |
|
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
410 |
| 72 | 411 void my_syslog(char *text) { |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
412 my_syslog(NULL, text); |
|
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
413 } |
|
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
414 |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
415 |
| 0 | 416 //////////////////////////////////////////////// |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
417 // read a resolver request from the socket, process it, and |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
418 // write the result back to the socket. |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
419 |
| 72 | 420 void process_resolver_requests(int socket); |
| 421 void process_resolver_requests(int socket) { | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
422 #ifdef NS_MAXDNAME |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
423 char question[NS_MAXDNAME]; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
424 #else |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
425 char question[1000]; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
426 #endif |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
427 glommer glom; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
428 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
429 int maxq = sizeof(question); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
430 while (true) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
431 // read a question |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
432 int rs = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
433 while (true) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
434 int ns = read(socket, question+rs, maxq-rs); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
435 if (ns > 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
436 rs += ns; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
437 if (question[rs-1] == '\0') { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
438 // last byte read was the null terminator, we are done |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
439 break; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
440 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
441 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
442 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
443 // peer closed the socket |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
444 //my_syslog("!!child worker process, peer closed socket while reading question"); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
445 shutdown(socket, SHUT_RDWR); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
446 close(socket); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
447 return; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
448 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
449 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
450 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
451 // find the answer |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
452 #ifdef NS_PACKETSZ |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
453 //char text[1000]; |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
454 //snprintf(text, sizeof(text), "!!child worker process has a question %s", question); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
455 //my_syslog(text); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
456 glom.length = res_search(question, ns_c_in, ns_t_a, glom.answer, sizeof(glom.answer)); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
457 if (glom.length < 0) glom.length = 0; // represent all errors as zero length answers |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
458 #else |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
459 glom.length = sizeof(glom.answer); |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
460 glom.answer = 0; |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
461 struct hostent *host = gethostbyname(question); |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
462 if (host && (host->h_addrtype == AF_INET)) { |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
463 memcpy(&glom.answer, host->h_addr, sizeof(glom.answer)); |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
464 } |
|
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
465 #endif |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
466 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
467 // write the answer |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
468 char *buf = (char *)&glom; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
469 int len = glom.length + sizeof(glom.length); |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
470 //snprintf(text, sizeof(text), "!!child worker process writing answer length %d for total %d", glom.length, len); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
471 //my_syslog(text); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
472 int ws = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
473 while (len > ws) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
474 int ns = write(socket, buf+ws, len-ws); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
475 if (ns > 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
476 ws += ns; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
477 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
478 else { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
479 // peer closed the socket! |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
480 //my_syslog("!!child worker process, peer closed socket while writing answer"); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
481 shutdown(socket, SHUT_RDWR); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
482 close(socket); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
483 return; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
484 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
485 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
486 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
487 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
488 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
489 |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
490 //////////////////////////////////////////////// |
| 8 | 491 // ask a dns question and get an A record answer - we don't try |
| 492 // very hard, just using the default resolver retry settings. | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
493 // If we cannot get an answer, we just accept the mail. |
| 8 | 494 // |
| 0 | 495 // |
| 72 | 496 int dns_interface(mlfiPriv &priv, char *question, bool maybe_ip, ns_map *nameservers); |
| 497 int dns_interface(mlfiPriv &priv, char *question, bool maybe_ip, ns_map *nameservers) { | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
498 // this part can be done without locking the resolver mutex. Each |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
499 // milter thread is talking over its own socket to a separate resolver |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
500 // process, which does the actual dns resolution. |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
501 if (priv.err) return 0; // cannot ask more questions on this socket. |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
502 priv.my_write(question, strlen(question)+1); // write the question including the null terminator |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
503 glommer glom; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
504 char *buf = (char *)&glom; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
505 priv.my_read(buf, sizeof(glom.length)); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
506 buf += sizeof(glom.length); |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
507 ///char text[1000]; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
508 ///snprintf(text, sizeof(text), "!!milter thread wrote question %s and has answer length %d", question, glom.length); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
509 ///my_syslog(text); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
510 if ((glom.length < 0) || (glom.length > sizeof(glom.answer))) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
511 priv.err = true; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
512 return 0; // cannot process overlarge answers |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
513 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
514 priv.my_read(buf, glom.length); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
515 |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
516 #ifdef NS_PACKETSZ |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
517 // now we need to lock the resolver mutex to keep the milter threads from |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
518 // stepping on each other while parsing the dns answer. |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
519 int ret_address = 0; |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
520 pthread_mutex_lock(&resolve_mutex); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
521 if (glom.length > 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
522 // parse the answer |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
523 ns_msg handle; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
524 ns_rr rr; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
525 if (ns_initparse(glom.answer, glom.length, &handle) == 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
526 // look for ns names |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
527 if (nameservers) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
528 ns_map &ns = *nameservers; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
529 int rrnum = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
530 while (ns_parserr(&handle, ns_s_ns, rrnum++, &rr) == 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
531 if (ns_rr_type(rr) == ns_t_ns) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
532 char nam[NS_MAXDNAME+1]; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
533 char *n = nam; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
534 const u_char *p = ns_rr_rdata(rr); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
535 while (((n-nam) < NS_MAXDNAME) && ((p-glom.answer) < glom.length) && *p) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
536 size_t s = *(p++); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
537 if (s > 191) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
538 // compression pointer |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
539 s = (s-192)*256 + *(p++); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
540 if (s >= glom.length) break; // pointer outside bounds of answer |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
541 p = glom.answer + s; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
542 s = *(p++); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
543 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
544 if (s > 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
545 if ((n-nam) >= (NS_MAXDNAME-s)) break; // destination would overflow name buffer |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
546 if ((p-glom.answer) >= (glom.length-s)) break; // source outside bounds of answer |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
547 memcpy(n, p, s); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
548 n += s; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
549 p += s; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
550 *(n++) = '.'; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
551 } |
| 34 | 552 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
553 if (n-nam) n--; // remove trailing . |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
554 *n = '\0'; // null terminate it |
| 72 | 555 ns.add(nam, question); // ns host to lookup later |
| 34 | 556 } |
| 557 } | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
558 rrnum = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
559 while (ns_parserr(&handle, ns_s_ar, rrnum++, &rr) == 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
560 if (ns_rr_type(rr) == ns_t_a) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
561 char* nam = (char*)ns_rr_name(rr); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
562 ns_mapper::iterator i = ns.ns_ip.find(nam); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
563 if (i != ns.ns_ip.end()) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
564 // we want this ip address |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
565 int address; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
566 memcpy(&address, ns_rr_rdata(rr), sizeof(address)); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
567 ns.ns_ip[nam] = address; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
568 } |
| 34 | 569 } |
| 570 } | |
| 571 } | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
572 int rrnum = 0; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
573 while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
574 if (ns_rr_type(rr) == ns_t_a) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
575 int address; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
576 memcpy(&address, ns_rr_rdata(rr), sizeof(address)); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
577 ret_address = address; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
578 } |
|
23
06de5ab6a232
add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents:
22
diff
changeset
|
579 } |
|
06de5ab6a232
add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents:
22
diff
changeset
|
580 } |
|
06de5ab6a232
add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents:
22
diff
changeset
|
581 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
582 if (maybe_ip && !ret_address) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
583 // might be a bare ip address |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
584 in_addr ip; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
585 if (inet_aton(question, &ip)) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
586 ret_address = ip.s_addr; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
587 } |
| 8 | 588 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
589 pthread_mutex_unlock(&resolve_mutex); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
590 return ret_address; |
| 16 | 591 #else |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
592 return glom.answer; |
| 16 | 593 #endif |
| 8 | 594 } |
| 595 | |
| 596 | |
| 597 //////////////////////////////////////////////// | |
| 598 // check a single dnsbl | |
| 599 // | |
| 72 | 600 bool check_single(mlfiPriv &priv, int ip, char *suffix); |
| 601 bool check_single(mlfiPriv &priv, int ip, char *suffix) { | |
| 0 | 602 // make a dns question |
| 603 const u_char *src = (const u_char *)&ip; | |
| 75 | 604 if (src[0] == 127) return false; // don't do dns lookups on localhost |
| 16 | 605 #ifdef NS_MAXDNAME |
| 0 | 606 char question[NS_MAXDNAME]; |
| 16 | 607 #else |
| 608 char question[1000]; | |
| 609 #endif | |
| 8 | 610 snprintf(question, sizeof(question), "%u.%u.%u.%u.%s.", src[3], src[2], src[1], src[0], suffix); |
| 611 // ask the question, if we get an A record it implies a blacklisted ip address | |
| 72 | 612 return dns_interface(priv, question, false, NULL); |
| 8 | 613 } |
| 614 | |
| 615 | |
| 616 //////////////////////////////////////////////// | |
| 617 // check a single dnsbl | |
| 618 // | |
| 72 | 619 bool check_single(mlfiPriv &priv, int ip, DNSBL &bl); |
| 620 bool check_single(mlfiPriv &priv, int ip, DNSBL &bl) { | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
621 return check_single(priv, ip, bl.suffix); |
| 0 | 622 } |
| 623 | |
| 624 | |
| 625 //////////////////////////////////////////////// | |
| 626 // check the dnsbls specified for this recipient | |
| 627 // | |
| 72 | 628 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist); |
| 629 bool check_dnsbl(mlfiPriv &priv, dnsblp_list &dnsbll, DNSBLP &rejectlist) { | |
| 75 | 630 if (priv.authenticated) return false; |
| 72 | 631 for (dnsblp_list::iterator i=dnsbll.begin(); i!=dnsbll.end(); i++) { |
| 0 | 632 DNSBLP dp = *i; // non null by construction |
| 72 | 633 bool st; |
| 634 map<DNSBLP, bool>::iterator f = priv.checked.find(dp); | |
| 0 | 635 if (f == priv.checked.end()) { |
| 636 // have not checked this list yet | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
637 st = check_single(priv, priv.ip, *dp); |
| 0 | 638 rejectlist = dp; |
| 639 priv.checked[dp] = st; | |
| 640 } | |
| 641 else { | |
| 642 st = (*f).second; | |
| 643 rejectlist = (*f).first; | |
| 644 } | |
| 72 | 645 if (st) return st; |
| 0 | 646 } |
| 72 | 647 return false; |
| 0 | 648 } |
| 649 | |
| 650 | |
| 651 //////////////////////////////////////////////// | |
|
55
44babba1a9b9
updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents:
53
diff
changeset
|
652 // check the hosts from the body against the content dnsbl |
| 8 | 653 // |
| 78 | 654 bool check_hosts(mlfiPriv &priv, bool random, int limit, char *&host, int &ip); |
| 655 bool check_hosts(mlfiPriv &priv, bool random, int limit, char *&host, int &ip) { | |
| 75 | 656 CONFIG &dc = *priv.pc; |
| 74 | 657 string_set &hosts = priv.memory->get_hosts(); |
| 76 | 658 string_set &ignore = *priv.content_host_ignore; |
| 659 char *suffix = priv.content_suffix; | |
| 72 | 660 |
| 8 | 661 int count = 0; |
| 72 | 662 int cnt = hosts.size(); // number of hosts we could look at |
| 663 int_set ips; | |
| 664 ns_map nameservers; | |
| 665 for (string_set::iterator i=hosts.begin(); i!=hosts.end(); i++) { | |
| 666 host = *i; // a reference into hosts, which will live until this smtp transaction is closed | |
| 58 | 667 |
| 668 // don't bother looking up hosts on the ignore list | |
| 72 | 669 string_set::iterator j = ignore.find(host); |
| 670 if (j != ignore.end()) continue; | |
| 58 | 671 |
| 72 | 672 // try to only look at limit/cnt fraction of the available cnt host names in random mode |
| 673 if ((cnt > limit) && (limit > 0) && random) { | |
| 44 | 674 int r = rand() % cnt; |
| 72 | 675 if (r >= limit) { |
| 76 | 676 char buf[maxlen]; |
| 44 | 677 snprintf(buf, sizeof(buf), "host %s skipped", host); |
| 678 my_syslog(&priv, buf); | |
| 679 continue; | |
| 680 } | |
| 681 } | |
| 8 | 682 count++; |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
683 ip = dns_interface(priv, host, true, &nameservers); |
| 16 | 684 if (debug_syslog) { |
| 76 | 685 char buf[maxlen]; |
|
29
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
686 if (ip) { |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
687 char adr[sizeof "255.255.255.255"]; |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
688 adr[0] = '\0'; |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
689 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr)); |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
690 snprintf(buf, sizeof(buf), "host %s found at %s", host, adr); |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
691 } |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
692 else { |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
693 snprintf(buf, sizeof(buf), "host %s not found", host); |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
694 } |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
695 my_syslog(&priv, buf); |
| 16 | 696 } |
| 8 | 697 if (ip) { |
| 44 | 698 int_set::iterator i = ips.find(ip); |
| 699 if (i == ips.end()) { | |
| 700 ips.insert(ip); | |
| 75 | 701 if (check_single(priv, ip, suffix)) { |
| 72 | 702 return true; |
| 44 | 703 } |
| 34 | 704 } |
| 8 | 705 } |
| 706 } | |
| 72 | 707 limit *= 4; // allow average of 3 ns per host name |
|
53
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
708 for (ns_mapper::iterator i=nameservers.ns_ip.begin(); i!=nameservers.ns_ip.end(); i++) { |
| 34 | 709 count++; |
| 72 | 710 if ((count > limit) && (limit > 0)) { |
| 711 if (random) continue; // don't complain | |
| 712 return true; | |
| 34 | 713 } |
| 36 | 714 host = (*i).first; // a transient reference that needs to be replaced before we return it |
| 34 | 715 ip = (*i).second; |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
716 if (!ip) ip = dns_interface(priv, host, false, NULL); |
| 34 | 717 if (debug_syslog) { |
| 76 | 718 char buf[maxlen]; |
| 34 | 719 if (ip) { |
| 720 char adr[sizeof "255.255.255.255"]; | |
| 721 adr[0] = '\0'; | |
| 722 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr)); | |
| 723 snprintf(buf, sizeof(buf), "ns %s found at %s", host, adr); | |
| 724 } | |
| 725 else { | |
| 726 snprintf(buf, sizeof(buf), "ns %s not found", host); | |
| 727 } | |
|
41
d95af8129dfa
updates for 3.2, changing file layout, add queueid to messages
carl
parents:
40
diff
changeset
|
728 my_syslog(&priv, buf); |
| 34 | 729 } |
| 730 if (ip) { | |
| 44 | 731 int_set::iterator i = ips.find(ip); |
| 732 if (i == ips.end()) { | |
| 733 ips.insert(ip); | |
| 75 | 734 if (check_single(priv, ip, suffix)) { |
|
53
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
735 string_map::iterator j = nameservers.ns_host.find(host); |
|
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
736 if (j != nameservers.ns_host.end()) { |
|
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
737 char *refer = (*j).second; |
| 76 | 738 char buf[maxlen]; |
|
53
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
739 snprintf(buf, sizeof(buf), "%s with nameserver %s", refer, host); |
| 72 | 740 host = register_string(hosts, buf); // put a copy into hosts, and return that reference |
|
53
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
741 } |
|
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
742 else { |
| 72 | 743 host = register_string(hosts, host); // put a copy into hosts, and return that reference |
|
53
c2371bb6cf84
3.5 - better error message when rejecting based on ns records on the sbl
carl
parents:
48
diff
changeset
|
744 } |
| 72 | 745 return true; |
| 44 | 746 } |
| 34 | 747 } |
| 748 } | |
| 749 } | |
| 72 | 750 return false; |
| 8 | 751 } |
| 752 | |
| 753 | |
| 754 //////////////////////////////////////////////// | |
| 75 | 755 // this email address is passed in from sendmail, and will |
| 756 // always be enclosed in <>. It may have mixed case, just | |
| 757 // as the mail client sent it. We dup the string and convert | |
| 758 // the duplicate to lower case. | |
| 759 // | |
| 760 char *to_lower_string(char *email); | |
| 761 char *to_lower_string(char *email) { | |
| 762 int n = strlen(email)-2; | |
| 763 if (n < 1) return strdup(email); | |
| 764 char *key = strdup(email+1); | |
| 765 key[n] = '\0'; | |
| 766 for (int i=0; i<n; i++) key[i] = tolower(key[i]); | |
| 767 return key; | |
| 768 } | |
| 769 | |
| 770 | |
| 771 //////////////////////////////////////////////// | |
| 0 | 772 // start of sendmail milter interfaces |
| 773 // | |
| 774 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr) | |
| 775 { | |
| 776 // allocate some private memory | |
| 777 mlfiPriv *priv = new mlfiPriv; | |
| 778 if (hostaddr->sa_family == AF_INET) { | |
| 779 priv->ip = ((struct sockaddr_in *)hostaddr)->sin_addr.s_addr; | |
| 780 } | |
| 781 | |
| 782 // save the private data | |
| 783 smfi_setpriv(ctx, (void*)priv); | |
| 784 | |
| 785 // continue processing | |
| 786 return SMFIS_CONTINUE; | |
| 787 } | |
| 788 | |
| 789 sfsistat mlfi_envfrom(SMFICTX *ctx, char **from) | |
| 790 { | |
| 791 mlfiPriv &priv = *MLFIPRIV; | |
| 75 | 792 priv.mailaddr = to_lower_string(from[0]); |
| 0 | 793 priv.authenticated = (smfi_getsymval(ctx, "{auth_authen}") != NULL); |
| 794 return SMFIS_CONTINUE; | |
| 795 } | |
| 796 | |
| 797 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **rcpt) | |
| 798 { | |
| 799 DNSBLP rejectlist = NULL; // list that caused the reject | |
| 800 mlfiPriv &priv = *MLFIPRIV; | |
| 801 CONFIG &dc = *priv.pc; | |
| 42 | 802 if (!priv.queueid) priv.queueid = strdup(smfi_getsymval(ctx, "i")); |
| 75 | 803 char *rcptaddr = rcpt[0]; |
| 804 char *loto = to_lower_string(rcptaddr); | |
| 76 | 805 CONTEXT &con = *(dc.find_context(loto)->find_context(priv.mailaddr)); |
| 806 if (debug_syslog) { | |
| 807 char buf[maxlen]; | |
| 808 char msg[maxlen]; | |
| 809 snprintf(msg, sizeof(msg), "from <%s> to <%s> using context %s", priv.mailaddr, loto, con.get_full_name(buf,maxlen)); | |
| 810 my_syslog(&priv, msg); | |
| 811 } | |
| 72 | 812 char *fromvalue = con.find_from(priv.mailaddr); |
| 75 | 813 free(loto); |
| 72 | 814 status st; |
| 815 if (fromvalue == token_black) { | |
| 816 st = black; | |
| 0 | 817 } |
| 72 | 818 else if (fromvalue == token_white) { |
| 0 | 819 st = white; |
| 820 } | |
| 821 else { | |
| 72 | 822 // check the dns based lists |
| 78 | 823 st = (check_dnsbl(priv, con.get_dnsbl_list(), rejectlist)) ? reject : oksofar; |
| 0 | 824 } |
| 825 if (st == reject) { | |
| 826 // reject the recipient based on some dnsbl | |
| 827 char adr[sizeof "255.255.255.255"]; | |
| 828 adr[0] = '\0'; | |
| 8 | 829 inet_ntop(AF_INET, (const u_char *)&priv.ip, adr, sizeof(adr)); |
| 76 | 830 char buf[maxlen]; |
| 0 | 831 snprintf(buf, sizeof(buf), rejectlist->message, adr, adr); |
| 832 smfi_setreply(ctx, "550", "5.7.1", buf); | |
| 833 return SMFIS_REJECT; | |
| 834 } | |
| 835 else if (st == black) { | |
| 836 // reject the recipient based on blacklisting either from or to | |
| 837 smfi_setreply(ctx, "550", "5.7.1", "no such user"); | |
| 838 return SMFIS_REJECT; | |
| 839 } | |
| 840 else { | |
| 841 // accept the recipient | |
| 72 | 842 if (!con.get_content_filtering()) st = white; |
| 8 | 843 if (st == oksofar) { |
| 844 // but remember the non-whites | |
| 72 | 845 priv.need_content_filter(rcptaddr, con); |
| 8 | 846 priv.only_whites = false; |
| 847 } | |
| 848 if (st == white) { | |
| 849 priv.have_whites = true; | |
| 850 } | |
| 0 | 851 return SMFIS_CONTINUE; |
| 852 } | |
| 853 } | |
| 854 | |
| 8 | 855 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len) |
| 0 | 856 { |
| 857 mlfiPriv &priv = *MLFIPRIV; | |
|
55
44babba1a9b9
updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents:
53
diff
changeset
|
858 if (priv.authenticated) return SMFIS_CONTINUE; |
|
44babba1a9b9
updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents:
53
diff
changeset
|
859 if (priv.only_whites) return SMFIS_CONTINUE; |
| 8 | 860 priv.scanner->scan(data, len); |
| 11 | 861 return SMFIS_CONTINUE; |
| 8 | 862 } |
| 863 | |
| 864 sfsistat mlfi_eom(SMFICTX *ctx) | |
| 865 { | |
|
27
43a4f6b3e668
add configurable host name limit and bad html tag limits.
carl
parents:
26
diff
changeset
|
866 sfsistat rc; |
| 8 | 867 mlfiPriv &priv = *MLFIPRIV; |
| 72 | 868 CONFIG &dc = *priv.pc; |
|
27
43a4f6b3e668
add configurable host name limit and bad html tag limits.
carl
parents:
26
diff
changeset
|
869 char *host = NULL; |
|
43a4f6b3e668
add configurable host name limit and bad html tag limits.
carl
parents:
26
diff
changeset
|
870 int ip; |
|
43a4f6b3e668
add configurable host name limit and bad html tag limits.
carl
parents:
26
diff
changeset
|
871 status st; |
| 8 | 872 // process end of message |
| 72 | 873 if (priv.authenticated || priv.only_whites) rc = SMFIS_CONTINUE; |
| 8 | 874 else { |
| 76 | 875 // assert env_to not empty |
| 876 char buf[maxlen]; | |
| 72 | 877 char *msg = NULL; |
| 878 string_set alive; | |
| 879 bool random = false; | |
| 74 | 880 int limit = 0; |
| 881 for (context_map::iterator i=priv.env_to.begin(); i!=priv.env_to.end(); i++) { | |
| 72 | 882 char *rcpt = (*i).first; |
| 883 CONTEXT &con = *((*i).second); | |
| 74 | 884 if (!con.acceptable_content(*priv.memory, msg)) { |
| 72 | 885 // bad html tags or excessive hosts |
| 886 smfi_delrcpt(ctx, rcpt); | |
| 24 | 887 } |
| 888 else { | |
| 72 | 889 alive.insert(rcpt); |
| 890 random |= con.get_host_random(); | |
| 891 limit = max(limit, con.get_host_limit()); | |
| 892 } | |
| 893 } | |
| 76 | 894 bool rejecting = alive.empty(); // if alive is empty, we must have set msg above in acceptable_content() |
| 72 | 895 if (!rejecting) { |
| 76 | 896 if (check_hosts(priv, random, limit, host, ip)) { |
| 24 | 897 char adr[sizeof "255.255.255.255"]; |
| 898 adr[0] = '\0'; | |
| 899 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr)); | |
| 76 | 900 snprintf(buf, sizeof(buf), priv.content_message, host, adr); |
| 72 | 901 msg = buf; |
| 76 | 902 rejecting = true; |
| 24 | 903 } |
| 72 | 904 } |
| 905 if (!rejecting) { | |
| 906 rc = SMFIS_CONTINUE; | |
| 907 } | |
| 76 | 908 else if (!priv.have_whites) { |
| 72 | 909 // can reject the entire message |
| 910 smfi_setreply(ctx, "550", "5.7.1", msg); | |
| 8 | 911 rc = SMFIS_REJECT; |
| 912 } | |
| 913 else { | |
| 914 // need to accept it but remove the recipients that don't want it | |
| 72 | 915 for (string_set::iterator i=alive.begin(); i!=alive.end(); i++) { |
| 8 | 916 char *rcpt = *i; |
| 917 smfi_delrcpt(ctx, rcpt); | |
| 918 } | |
| 919 rc = SMFIS_CONTINUE; | |
| 920 } | |
| 0 | 921 } |
| 8 | 922 // reset for a new message on the same connection |
| 923 mlfi_abort(ctx); | |
| 924 return rc; | |
| 925 } | |
| 926 | |
| 927 sfsistat mlfi_abort(SMFICTX *ctx) | |
| 928 { | |
| 929 mlfiPriv &priv = *MLFIPRIV; | |
| 930 priv.reset(); | |
| 0 | 931 return SMFIS_CONTINUE; |
| 932 } | |
| 933 | |
| 934 sfsistat mlfi_close(SMFICTX *ctx) | |
| 935 { | |
| 936 mlfiPriv *priv = MLFIPRIV; | |
| 937 if (!priv) return SMFIS_CONTINUE; | |
| 938 delete priv; | |
| 939 smfi_setpriv(ctx, NULL); | |
| 940 return SMFIS_CONTINUE; | |
| 941 } | |
| 942 | |
| 943 struct smfiDesc smfilter = | |
| 944 { | |
| 945 "DNSBL", // filter name | |
| 946 SMFI_VERSION, // version code -- do not change | |
| 947 SMFIF_DELRCPT, // flags | |
| 948 mlfi_connect, // connection info filter | |
| 949 NULL, // SMTP HELO command filter | |
| 950 mlfi_envfrom, // envelope sender filter | |
| 951 mlfi_envrcpt, // envelope recipient filter | |
| 952 NULL, // header filter | |
| 953 NULL, // end of header | |
| 8 | 954 mlfi_body, // body block filter |
| 955 mlfi_eom, // end of message | |
| 956 mlfi_abort, // message aborted | |
| 0 | 957 mlfi_close, // connection cleanup |
| 958 }; | |
| 959 | |
| 960 | |
| 961 //////////////////////////////////////////////// | |
| 962 // reload the config | |
| 963 // | |
| 72 | 964 CONFIG* new_conf(); |
| 965 CONFIG* new_conf() { | |
| 0 | 966 CONFIG *newc = new CONFIG; |
|
29
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
967 pthread_mutex_lock(&config_mutex); |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
968 newc->generation = generation++; |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
969 pthread_mutex_unlock(&config_mutex); |
| 76 | 970 char buf[maxlen]; |
|
29
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
971 snprintf(buf, sizeof(buf), "loading configuration generation %d", newc->generation); |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
972 my_syslog(buf); |
| 74 | 973 if (load_conf(*newc, "dnsbl.conf")) { |
| 72 | 974 newc->load_time = time(NULL); |
| 975 return newc; | |
| 976 } | |
| 977 delete newc; | |
| 978 return NULL; | |
| 0 | 979 } |
| 980 | |
| 981 | |
| 982 //////////////////////////////////////////////// | |
| 983 // thread to watch the old config files for changes | |
| 984 // and reload when needed. we also cleanup old | |
| 985 // configs whose reference count has gone to zero. | |
| 986 // | |
| 72 | 987 void* config_loader(void *arg); |
| 988 void* config_loader(void *arg) { | |
| 0 | 989 typedef set<CONFIG *> configp_set; |
| 990 configp_set old_configs; | |
| 18 | 991 while (loader_run) { |
| 0 | 992 sleep(180); // look for modifications every 3 minutes |
| 18 | 993 if (!loader_run) break; |
| 0 | 994 CONFIG &dc = *config; |
| 995 time_t then = dc.load_time; | |
| 996 struct stat st; | |
| 997 bool reload = false; | |
| 74 | 998 for (string_set::iterator i=dc.config_files.begin(); i!=dc.config_files.end(); i++) { |
| 0 | 999 char *fn = *i; |
| 1000 if (stat(fn, &st)) reload = true; // file disappeared | |
| 1001 else if (st.st_mtime > then) reload = true; // file modified | |
| 1002 if (reload) break; | |
| 1003 } | |
| 1004 if (reload) { | |
| 1005 CONFIG *newc = new_conf(); | |
| 1006 // replace the global config pointer | |
| 1007 pthread_mutex_lock(&config_mutex); | |
| 1008 CONFIG *old = config; | |
| 1009 config = newc; | |
| 1010 pthread_mutex_unlock(&config_mutex); | |
| 1011 if (old) old_configs.insert(old); | |
| 1012 } | |
| 1013 // now look for old configs with zero ref counts | |
| 1014 for (configp_set::iterator i=old_configs.begin(); i!=old_configs.end(); ) { | |
| 1015 CONFIG *old = *i; | |
| 1016 if (!old->reference_count) { | |
| 76 | 1017 char buf[maxlen]; |
|
29
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
1018 snprintf(buf, sizeof(buf), "freeing memory for old configuration generation %d", old->generation); |
|
4dfdf33f1db0
add syslog msg freeing memory, use bare tld names without leading period
carl
parents:
28
diff
changeset
|
1019 my_syslog(buf); |
| 0 | 1020 delete old; // destructor does all the work |
| 1021 old_configs.erase(i++); | |
| 1022 } | |
| 1023 else i++; | |
| 1024 } | |
| 1025 } | |
| 18 | 1026 return NULL; |
| 0 | 1027 } |
| 1028 | |
| 1029 | |
| 72 | 1030 void usage(char *prog); |
| 1031 void usage(char *prog) | |
| 0 | 1032 { |
| 75 | 1033 fprintf(stderr, "Usage: %s [-d] [-c] [-s] [-e from|to] -r port -p sm-sock-addr [-t timeout]\n", prog); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1034 fprintf(stderr, "where port is for the connection to our own dns resolver processes\n"); |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1035 fprintf(stderr, " and should be local-domain-socket-file-name\n"); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1036 fprintf(stderr, "where sm-sock-addr is for the connection to sendmail\n"); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1037 fprintf(stderr, " and should be one of\n"); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1038 fprintf(stderr, " inet:port@ip-address\n"); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1039 fprintf(stderr, " local:local-domain-socket-file-name\n"); |
| 9 | 1040 fprintf(stderr, "-c will load and dump the config to stdout\n"); |
| 75 | 1041 fprintf(stderr, "-s will stress test the config loading code by repeating the load/free cycle\n"); |
| 1042 fprintf(stderr, " in an infinte loop.\n"); | |
| 16 | 1043 fprintf(stderr, "-d will add some syslog debug messages\n"); |
| 75 | 1044 fprintf(stderr, "-e will print the results of looking up the from and to addresses in the\n"); |
| 1045 fprintf(stderr, " current config. The | character is used to separate the from and to\n"); | |
| 1046 fprintf(stderr, " addresses in the argument to the -e switch\n"); | |
| 0 | 1047 } |
| 1048 | |
| 1049 | |
| 42 | 1050 |
| 72 | 1051 void setup_socket(char *sock); |
| 1052 void setup_socket(char *sock) { | |
| 42 | 1053 unlink(sock); |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1054 // sockaddr_un addr; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1055 // memset(&addr, '\0', sizeof addr); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1056 // addr.sun_family = AF_UNIX; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1057 // strncpy(addr.sun_path, sock, sizeof(addr.sun_path)-1); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1058 // int s = socket(AF_UNIX, SOCK_STREAM, 0); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1059 // bind(s, (sockaddr*)&addr, sizeof(addr)); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1060 // close(s); |
| 42 | 1061 } |
| 1062 | |
| 1063 | |
| 65 | 1064 /* |
| 1065 * The signal handler function -- only gets called when a SIGCHLD | |
| 1066 * is received, ie when a child terminates | |
| 1067 */ | |
| 1068 void sig_chld(int signo) | |
| 1069 { | |
| 1070 int status; | |
| 1071 /* Wait for any child without blocking */ | |
| 1072 while (waitpid(-1, &status, WNOHANG) > 0) { | |
| 1073 // ignore child exit status, we only do this to cleanup zombies | |
| 1074 } | |
| 1075 } | |
| 1076 | |
| 1077 | |
| 0 | 1078 int main(int argc, char**argv) |
| 1079 { | |
| 72 | 1080 token_init(); |
| 3 | 1081 bool check = false; |
| 75 | 1082 bool stress = false; |
| 3 | 1083 bool setconn = false; |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1084 bool setreso = false; |
| 75 | 1085 char *email = NULL; |
| 0 | 1086 int c; |
| 75 | 1087 const char *args = "r:p:t:e:cdhs"; |
| 0 | 1088 extern char *optarg; |
| 1089 | |
| 1090 // Process command line options | |
| 1091 while ((c = getopt(argc, argv, args)) != -1) { | |
| 1092 switch (c) { | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1093 case 'r': |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1094 if (optarg == NULL || *optarg == '\0') { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1095 fprintf(stderr, "Illegal resolver socket: %s\n", optarg); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1096 exit(EX_USAGE); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1097 } |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1098 resolver_port = strdup(optarg); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1099 setup_socket(resolver_port); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1100 setreso = true; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1101 break; |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1102 |
| 0 | 1103 case 'p': |
| 1104 if (optarg == NULL || *optarg == '\0') { | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1105 fprintf(stderr, "Illegal sendmail socket: %s\n", optarg); |
| 0 | 1106 exit(EX_USAGE); |
| 1107 } | |
| 1108 if (smfi_setconn(optarg) == MI_FAILURE) { | |
| 1109 fprintf(stderr, "smfi_setconn failed\n"); | |
| 1110 exit(EX_SOFTWARE); | |
| 1111 } | |
| 42 | 1112 if (strncasecmp(optarg, "unix:", 5) == 0) setup_socket(optarg + 5); |
| 1113 else if (strncasecmp(optarg, "local:", 6) == 0) setup_socket(optarg + 6); | |
| 3 | 1114 setconn = true; |
| 0 | 1115 break; |
| 1116 | |
| 1117 case 't': | |
| 1118 if (optarg == NULL || *optarg == '\0') { | |
| 1119 fprintf(stderr, "Illegal timeout: %s\n", optarg); | |
| 1120 exit(EX_USAGE); | |
| 1121 } | |
| 1122 if (smfi_settimeout(atoi(optarg)) == MI_FAILURE) { | |
| 1123 fprintf(stderr, "smfi_settimeout failed\n"); | |
| 1124 exit(EX_SOFTWARE); | |
| 1125 } | |
| 1126 break; | |
| 1127 | |
| 75 | 1128 case 'e': |
| 1129 if (email) free(email); | |
| 1130 email = strdup(optarg); | |
| 1131 break; | |
| 1132 | |
| 3 | 1133 case 'c': |
| 1134 check = true; | |
| 1135 break; | |
| 1136 | |
| 75 | 1137 case 's': |
| 1138 stress = true; | |
| 1139 break; | |
| 1140 | |
| 16 | 1141 case 'd': |
| 1142 debug_syslog = true; | |
| 1143 break; | |
| 1144 | |
| 0 | 1145 case 'h': |
| 1146 default: | |
| 1147 usage(argv[0]); | |
| 1148 exit(EX_USAGE); | |
| 1149 } | |
| 1150 } | |
| 5 | 1151 |
| 1152 if (check) { | |
| 76 | 1153 use_syslog = false; |
| 1154 debug_syslog = true; | |
| 72 | 1155 CONFIG *conf = new_conf(); |
| 1156 if (conf) { | |
| 1157 conf->dump(); | |
| 1158 delete conf; | |
| 1159 return 0; | |
| 1160 } | |
| 1161 else { | |
| 1162 return 1; // config failed to load | |
| 1163 } | |
| 5 | 1164 } |
| 1165 | |
| 75 | 1166 if (stress) { |
| 1167 fprintf(stdout, "stress testing\n"); | |
| 1168 while (1) { | |
| 1169 for (int i=0; i<10; i++) { | |
| 1170 CONFIG *conf = new_conf(); | |
| 1171 if (conf) delete conf; | |
| 1172 } | |
| 1173 fprintf(stdout, "."); | |
| 1174 fflush(stdout); | |
| 1175 sleep(1); | |
| 1176 } | |
| 1177 } | |
| 1178 | |
| 1179 if (email) { | |
| 1180 char *x = strchr(email, '|'); | |
| 1181 if (x) { | |
| 1182 *x = '\0'; | |
| 1183 char *from = strdup(email); | |
| 1184 char *to = strdup(x+1); | |
| 1185 use_syslog = false; | |
| 1186 CONFIG *conf = new_conf(); | |
| 1187 if (conf) { | |
| 1188 CONTEXTP con = conf->find_context(to); | |
| 1189 char buf[maxlen]; | |
| 1190 fprintf(stdout, "envelope to <%s> finds context %s\n", to, con->get_full_name(buf,maxlen)); | |
| 1191 CONTEXTP fc = con->find_context(from); | |
| 1192 fprintf(stdout, "envelope from <%s> finds context %s\n", from, fc->get_full_name(buf,maxlen)); | |
| 1193 char *st = fc->find_from(from); | |
| 1194 fprintf(stdout, "envelope from <%s> finds status %s\n", from, st); | |
| 1195 delete conf; | |
| 1196 } | |
| 1197 } | |
| 1198 return 0; | |
| 1199 } | |
| 1200 | |
| 0 | 1201 if (!setconn) { |
| 1202 fprintf(stderr, "%s: Missing required -p argument\n", argv[0]); | |
| 1203 usage(argv[0]); | |
| 1204 exit(EX_USAGE); | |
| 1205 } | |
| 5 | 1206 |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1207 if (!setreso) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1208 fprintf(stderr, "%s: Missing required -r argument\n", argv[0]); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1209 usage(argv[0]); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1210 exit(EX_USAGE); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1211 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1212 |
| 0 | 1213 if (smfi_register(smfilter) == MI_FAILURE) { |
| 1214 fprintf(stderr, "smfi_register failed\n"); | |
| 1215 exit(EX_UNAVAILABLE); | |
| 1216 } | |
| 1217 | |
| 1218 // switch to background mode | |
| 1219 if (daemon(1,0) < 0) { | |
| 1220 fprintf(stderr, "daemon() call failed\n"); | |
| 1221 exit(EX_UNAVAILABLE); | |
| 1222 } | |
| 1223 | |
| 1224 // write the pid | |
| 1225 const char *pidpath = "/var/run/dnsbl.pid"; | |
| 1226 unlink(pidpath); | |
| 1227 FILE *f = fopen(pidpath, "w"); | |
| 1228 if (f) { | |
| 22 | 1229 #ifdef linux |
| 1230 // from a comment in the DCC source code: | |
| 1231 // Linux threads are broken. Signals given the | |
| 1232 // original process are delivered to only the | |
| 1233 // thread that happens to have that PID. The | |
| 1234 // sendmail libmilter thread that needs to hear | |
| 1235 // SIGINT and other signals does not, and that breaks | |
| 1236 // scripts that need to stop milters. | |
| 1237 // However, signaling the process group works. | |
| 0 | 1238 fprintf(f, "-%d\n", (u_int)getpgrp()); |
| 22 | 1239 #else |
| 1240 fprintf(f, "%d\n", (u_int)getpid()); | |
| 1241 #endif | |
| 0 | 1242 fclose(f); |
| 1243 } | |
| 1244 | |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1245 // initialize the thread sync objects |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1246 pthread_mutex_init(&config_mutex, 0); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1247 pthread_mutex_init(&syslog_mutex, 0); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1248 pthread_mutex_init(&resolve_mutex, 0); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1249 pthread_mutex_init(&fd_pool_mutex, 0); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1250 |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1251 // drop root privs |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1252 struct passwd *pw = getpwnam("dnsbl"); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1253 if (pw) { |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1254 if (setgid(pw->pw_gid) == -1) { |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1255 my_syslog("failed to switch to group dnsbl"); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1256 } |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1257 if (setuid(pw->pw_uid) == -1) { |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1258 my_syslog("failed to switch to user dnsbl"); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1259 } |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1260 } |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1261 |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1262 // fork off the resolver listener process |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1263 pid_t child = fork(); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1264 if (child < 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1265 my_syslog("failed to create resolver listener process"); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1266 exit(0); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1267 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1268 if (child == 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1269 // we are the child - dns resolver listener process |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1270 resolver_socket = socket(AF_UNIX, SOCK_STREAM, 0); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1271 if (resolver_socket < 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1272 my_syslog("child failed to create resolver socket"); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1273 exit(0); // failed |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1274 } |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1275 sockaddr_un server; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1276 memset(&server, '\0', sizeof(server)); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1277 server.sun_family = AF_UNIX; |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1278 strncpy(server.sun_path, resolver_port, sizeof(server.sun_path)-1); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1279 //try to bind the address to the socket. |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1280 if (bind(resolver_socket, (sockaddr *)&server, sizeof(server)) < 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1281 // bind failed |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1282 shutdown(resolver_socket, SHUT_RDWR); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1283 close(resolver_socket); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1284 my_syslog("child failed to bind resolver socket"); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1285 exit(0); // failed |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1286 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1287 //listen on the socket. |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1288 if (listen(resolver_socket, 10) < 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1289 // listen failed |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1290 shutdown(resolver_socket, SHUT_RDWR); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1291 close(resolver_socket); |
| 65 | 1292 my_syslog("child failed to listen to resolver socket"); |
| 1293 exit(0); // failed | |
| 1294 } | |
| 1295 // setup sigchld handler to prevent zombies | |
| 1296 struct sigaction act; | |
| 1297 act.sa_handler = sig_chld; // Assign sig_chld as our SIGCHLD handler | |
| 1298 sigemptyset(&act.sa_mask); // We don't want to block any other signals in this example | |
| 1299 act.sa_flags = SA_NOCLDSTOP; // only want children that have terminated | |
| 1300 if (sigaction(SIGCHLD, &act, NULL) < 0) { | |
| 1301 my_syslog("child failed to setup SIGCHLD handler"); | |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1302 exit(0); // failed |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1303 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1304 while (true) { |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1305 sockaddr_un client; |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1306 socklen_t clientlen = sizeof(client); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1307 int s = accept(resolver_socket, (sockaddr *)&client, &clientlen); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1308 if (s > 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1309 // accept worked, it did not get cancelled before we could accept it |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1310 // fork off a process to handle this connection |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1311 int newchild = fork(); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1312 if (newchild == 0) { |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1313 // this is the worker process |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1314 // child does not need the listening socket |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1315 close(resolver_socket); |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
1316 //my_syslog("child forked a worker process"); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1317 process_resolver_requests(s); |
|
61
7f44a4974bf6
Use resolver processes even if we don't have the interfaces, and need to use gethostbyname.
carl
parents:
60
diff
changeset
|
1318 //my_syslog("child terminated a worker process"); |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1319 exit(0); |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1320 } |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1321 else { |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1322 // this is the parent |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1323 // parent does not need the accepted socket |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1324 close(s); |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1325 } |
|
59
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1326 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1327 } |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1328 exit(0); // make sure we don't fall thru. |
|
510a511ad554
Add resolver processes to allow better performance on busy machines
carl
parents:
58
diff
changeset
|
1329 } |
|
60
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1330 else { |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1331 sleep(2); // allow child to get started |
|
390ed250c5d2
use local unix domain socket for resolver process communication
carl
parents:
59
diff
changeset
|
1332 } |
| 48 | 1333 |
| 1334 // load the initial config | |
| 1335 config = new_conf(); | |
| 1336 | |
| 1337 // only create threads after the fork() in daemon | |
| 1338 pthread_t tid; | |
| 1339 if (pthread_create(&tid, 0, config_loader, 0)) | |
| 1340 my_syslog("failed to create config loader thread"); | |
| 1341 if (pthread_detach(tid)) | |
| 1342 my_syslog("failed to detach config loader thread"); | |
| 1343 | |
| 18 | 1344 time_t starting = time(NULL); |
| 1345 int rc = smfi_main(); | |
| 22 | 1346 if ((rc != MI_SUCCESS) && (time(NULL) > starting+5*60)) { |
| 18 | 1347 my_syslog("trying to restart after smfi_main()"); |
| 1348 loader_run = false; // eventually the config loader thread will terminate | |
| 1349 execvp(argv[0], argv); | |
| 1350 } | |
| 1351 exit((rc == MI_SUCCESS) ? 0 : EX_UNAVAILABLE); | |
| 0 | 1352 } |
| 8 | 1353 |