annotate src/dnsbl.cpp @ 74:b7449114ebb0

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