annotate src/dnsbl.cpp @ 23:06de5ab6a232

add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
author carl
date Wed, 12 May 2004 13:23:22 -0700
parents c21b888cc175
children 2e23b7184d2b
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
96a9758165cd Initial revision
carl
parents:
diff changeset
3 Copyright (c) 2004 Carl Byington - 510 Software Group, released under
96a9758165cd Initial revision
carl
parents:
diff changeset
4 the GPL version 2 or any later version at your choice available at
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
96a9758165cd Initial revision
carl
parents:
diff changeset
10 -p port The port through which the MTA will connect to this milter.
96a9758165cd Initial revision
carl
parents:
diff changeset
11 -t sec The timeout value.
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
12 -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
13 milter or do anything with the socket.
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
14 -d Add debug syslog entries
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
15
0
96a9758165cd Initial revision
carl
parents:
diff changeset
16
13
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
17 TODO:
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
18 1) Add config for max_recipients for each mail domain. Recipients in
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
19 excess of that limit will be rejected, and the entire data will be
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
20 rejected if it is sent.
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
21
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
22 2) Add config for poison addresses. If any recipient is poison, all
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
23 recipients are rejected even if they would be whitelisted, and the
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
24 data is rejected if sent.
2752e512fd32 finish documentation
carl
parents: 12
diff changeset
25
0
96a9758165cd Initial revision
carl
parents:
diff changeset
26 */
96a9758165cd Initial revision
carl
parents:
diff changeset
27
96a9758165cd Initial revision
carl
parents:
diff changeset
28
96a9758165cd Initial revision
carl
parents:
diff changeset
29 // from sendmail sample
96a9758165cd Initial revision
carl
parents:
diff changeset
30 #include <sys/types.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
31 #include <sys/stat.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
32 #include <errno.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
33 #include <sysexits.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
34 #include <unistd.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
35
96a9758165cd Initial revision
carl
parents:
diff changeset
36 // needed for socket io
96a9758165cd Initial revision
carl
parents:
diff changeset
37 #include <sys/ioctl.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
38 #include <net/if.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
39 #include <arpa/inet.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
40 #include <netinet/in.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
41 #include <netinet/tcp.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
42 #include <netdb.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
43 #include <sys/socket.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
44
96a9758165cd Initial revision
carl
parents:
diff changeset
45 // needed for thread
96a9758165cd Initial revision
carl
parents:
diff changeset
46 #include <pthread.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
47
96a9758165cd Initial revision
carl
parents:
diff changeset
48 // needed for std c++ collections
96a9758165cd Initial revision
carl
parents:
diff changeset
49 #include <set>
96a9758165cd Initial revision
carl
parents:
diff changeset
50 #include <map>
96a9758165cd Initial revision
carl
parents:
diff changeset
51 #include <list>
96a9758165cd Initial revision
carl
parents:
diff changeset
52
96a9758165cd Initial revision
carl
parents:
diff changeset
53 // for the dns resolver
96a9758165cd Initial revision
carl
parents:
diff changeset
54 #include <netinet/in.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
55 #include <arpa/nameser.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
56 #include <resolv.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
57
96a9758165cd Initial revision
carl
parents:
diff changeset
58 // misc stuff needed here
96a9758165cd Initial revision
carl
parents:
diff changeset
59 #include <ctype.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
60 #include <fstream>
96a9758165cd Initial revision
carl
parents:
diff changeset
61 #include <syslog.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
62
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
63 static char* dnsbl_version="$Id$";
0
96a9758165cd Initial revision
carl
parents:
diff changeset
64
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
65 #define DEFAULT "default"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
66 #define WHITE "white"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
67 #define BLACK "black"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
68 #define OK "ok"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
69 #define MANY "many"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
70
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
71 enum status {oksofar, // not rejected yet
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
72 white, // whitelisted by envelope from
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
73 black, // blacklisted by envelope from or to
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
74 reject}; // rejected by a dns list
1
bd0b1a153f67 no message
carl
parents: 0
diff changeset
75
0
96a9758165cd Initial revision
carl
parents:
diff changeset
76 using namespace std;
96a9758165cd Initial revision
carl
parents:
diff changeset
77
96a9758165cd Initial revision
carl
parents:
diff changeset
78 extern "C" {
96a9758165cd Initial revision
carl
parents:
diff changeset
79 #include "libmilter/mfapi.h"
96a9758165cd Initial revision
carl
parents:
diff changeset
80 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);
96a9758165cd Initial revision
carl
parents:
diff changeset
81 sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv);
96a9758165cd Initial revision
carl
parents:
diff changeset
82 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
83 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
84 sfsistat mlfi_eom(SMFICTX *ctx);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
85 sfsistat mlfi_abort(SMFICTX *ctx);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
86 sfsistat mlfi_close(SMFICTX *ctx);
96a9758165cd Initial revision
carl
parents:
diff changeset
87 }
96a9758165cd Initial revision
carl
parents:
diff changeset
88
96a9758165cd Initial revision
carl
parents:
diff changeset
89 struct ltstr {
96a9758165cd Initial revision
carl
parents:
diff changeset
90 bool operator()(char* s1, char* s2) const {
96a9758165cd Initial revision
carl
parents:
diff changeset
91 return strcmp(s1, s2) < 0;
96a9758165cd Initial revision
carl
parents:
diff changeset
92 }
96a9758165cd Initial revision
carl
parents:
diff changeset
93 };
96a9758165cd Initial revision
carl
parents:
diff changeset
94
96a9758165cd Initial revision
carl
parents:
diff changeset
95 struct DNSBL {
96a9758165cd Initial revision
carl
parents:
diff changeset
96 char *suffix; // blacklist suffix like blackholes.five-ten-sg.com
96a9758165cd Initial revision
carl
parents:
diff changeset
97 char *message; // error message with one or two %s operators for the ip address replacement
96a9758165cd Initial revision
carl
parents:
diff changeset
98 DNSBL(char *s, char *m);
96a9758165cd Initial revision
carl
parents:
diff changeset
99 };
96a9758165cd Initial revision
carl
parents:
diff changeset
100 DNSBL::DNSBL(char *s, char *m) {
96a9758165cd Initial revision
carl
parents:
diff changeset
101 suffix = s;
96a9758165cd Initial revision
carl
parents:
diff changeset
102 message = m;
96a9758165cd Initial revision
carl
parents:
diff changeset
103 }
96a9758165cd Initial revision
carl
parents:
diff changeset
104
96a9758165cd Initial revision
carl
parents:
diff changeset
105 typedef DNSBL * DNSBLP;
96a9758165cd Initial revision
carl
parents:
diff changeset
106 typedef list<DNSBLP> DNSBLL;
96a9758165cd Initial revision
carl
parents:
diff changeset
107 typedef DNSBLL * DNSBLLP;
96a9758165cd Initial revision
carl
parents:
diff changeset
108 typedef map<char *, char *, ltstr> string_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
109 typedef map<char *, string_map *, ltstr> from_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
110 typedef map<char *, DNSBLP, ltstr> dnsblp_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
111 typedef map<char *, DNSBLLP, ltstr> dnsbllp_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
112 typedef set<char *, ltstr> string_set;
96a9758165cd Initial revision
carl
parents:
diff changeset
113 typedef list<char *> string_list;
96a9758165cd Initial revision
carl
parents:
diff changeset
114
96a9758165cd Initial revision
carl
parents:
diff changeset
115 struct CONFIG {
96a9758165cd Initial revision
carl
parents:
diff changeset
116 // the only mutable stuff once it has been loaded from the config file
96a9758165cd Initial revision
carl
parents:
diff changeset
117 int reference_count; // protected by the global config_mutex
96a9758165cd Initial revision
carl
parents:
diff changeset
118 // all the rest is constant after loading from the config file
96a9758165cd Initial revision
carl
parents:
diff changeset
119 time_t load_time;
96a9758165cd Initial revision
carl
parents:
diff changeset
120 string_list config_files;
96a9758165cd Initial revision
carl
parents:
diff changeset
121 dnsblp_map dnsbls;
96a9758165cd Initial revision
carl
parents:
diff changeset
122 dnsbllp_map dnsblls;
96a9758165cd Initial revision
carl
parents:
diff changeset
123 from_map env_from;
96a9758165cd Initial revision
carl
parents:
diff changeset
124 string_map env_to_dnsbll; // map recipient to a named dnsbll
96a9758165cd Initial revision
carl
parents:
diff changeset
125 string_map env_to_chkfrom; // map recipient to a named from map
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
126 char * content_suffix; // for sbl url body filtering
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
127 char * content_message; // ""
0
96a9758165cd Initial revision
carl
parents:
diff changeset
128 CONFIG();
96a9758165cd Initial revision
carl
parents:
diff changeset
129 ~CONFIG();
96a9758165cd Initial revision
carl
parents:
diff changeset
130 };
96a9758165cd Initial revision
carl
parents:
diff changeset
131 CONFIG::CONFIG() {
96a9758165cd Initial revision
carl
parents:
diff changeset
132 reference_count = 0;
96a9758165cd Initial revision
carl
parents:
diff changeset
133 load_time = 0;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
134 content_suffix = NULL;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
135 content_message = NULL;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
136 }
96a9758165cd Initial revision
carl
parents:
diff changeset
137 CONFIG::~CONFIG() {
96a9758165cd Initial revision
carl
parents:
diff changeset
138 for (dnsblp_map::iterator i=dnsbls.begin(); i!=dnsbls.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
139 DNSBLP d = (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
140 delete d;
96a9758165cd Initial revision
carl
parents:
diff changeset
141 }
96a9758165cd Initial revision
carl
parents:
diff changeset
142 for (dnsbllp_map::iterator i=dnsblls.begin(); i!=dnsblls.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
143 DNSBLLP d = (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
144 delete d;
96a9758165cd Initial revision
carl
parents:
diff changeset
145 }
96a9758165cd Initial revision
carl
parents:
diff changeset
146 for (from_map::iterator i=env_from.begin(); i!=env_from.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
147 string_map *d = (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
148 delete d;
96a9758165cd Initial revision
carl
parents:
diff changeset
149 }
96a9758165cd Initial revision
carl
parents:
diff changeset
150 }
96a9758165cd Initial revision
carl
parents:
diff changeset
151
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
152 static bool debug_syslog = false;
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
153 static bool loader_run = true; // used to stop the config loader thread
0
96a9758165cd Initial revision
carl
parents:
diff changeset
154 static string_set all_strings; // owns all the strings, only modified by the config loader thread
96a9758165cd Initial revision
carl
parents:
diff changeset
155 static CONFIG * config = NULL; // protected by the config_mutex
96a9758165cd Initial revision
carl
parents:
diff changeset
156
96a9758165cd Initial revision
carl
parents:
diff changeset
157 static pthread_mutex_t config_mutex;
96a9758165cd Initial revision
carl
parents:
diff changeset
158 static pthread_mutex_t syslog_mutex;
96a9758165cd Initial revision
carl
parents:
diff changeset
159 static pthread_mutex_t resolve_mutex;
96a9758165cd Initial revision
carl
parents:
diff changeset
160
96a9758165cd Initial revision
carl
parents:
diff changeset
161
96a9758165cd Initial revision
carl
parents:
diff changeset
162 ////////////////////////////////////////////////
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
163 // helper to discard the strings held by a string_set
0
96a9758165cd Initial revision
carl
parents:
diff changeset
164 //
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
165 static void discard(string_set &s);
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
166 static void discard(string_set &s) {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
167 for (string_set::iterator i=s.begin(); i!=s.end(); i++) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
168 free(*i);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
169 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
170 s.clear();
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
171 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
172
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
173 ////////////////////////////////////////////////
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
174 // helper to register a string in a string set
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
175 //
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
176 static char* register_string(string_set &s, char *name);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
177 static char* register_string(string_set &s, char *name) {
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
178 string_set::iterator i = s.find(name);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
179 if (i != s.end()) return *i;
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
180 char *x = strdup(name);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
181 s.insert(x);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
182 return x;
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
183 }
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
184
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
185 ////////////////////////////////////////////////
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
186 // syslog a message
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
187 //
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
188 static void my_syslog(char *text);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
189 static void my_syslog(char *text) {
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
190 pthread_mutex_lock(&syslog_mutex);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
191 openlog("dnsbl", LOG_PID, LOG_MAIL);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
192 syslog(LOG_NOTICE, "%s", text);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
193 closelog();
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
194 pthread_mutex_unlock(&syslog_mutex);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
195 }
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
196
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
197
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
198 // include the content scanner
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
199 #include "scanner.cpp"
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
200
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
201
0
96a9758165cd Initial revision
carl
parents:
diff changeset
202 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
203 // mail filter private data, held for us by sendmail
96a9758165cd Initial revision
carl
parents:
diff changeset
204 //
96a9758165cd Initial revision
carl
parents:
diff changeset
205 struct mlfiPriv
96a9758165cd Initial revision
carl
parents:
diff changeset
206 {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
207 // connection specific data
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
208 CONFIG *pc; // global context with our maps
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
209 int ip; // ip4 address of the smtp client
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
210 map<DNSBLP, status> checked; // status from those lists
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
211 // message specific data
0
96a9758165cd Initial revision
carl
parents:
diff changeset
212 char *mailaddr; // envelope from value
96a9758165cd Initial revision
carl
parents:
diff changeset
213 bool authenticated; // client authenticated? if so, suppress all dnsbl checks
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
214 bool have_whites; // have at least one whitelisted recipient? need to accept content and remove all non-whitelisted recipients if it fails
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
215 bool only_whites; // every recipient is whitelisted?
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
216 url_scanner *scanner; // object to handle body scanning
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
217 string_set non_whites; // remember the non-whitelisted recipients so we can remove them if need be
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
218 string_set hosts; // remember the hosts that we have checked
0
96a9758165cd Initial revision
carl
parents:
diff changeset
219 mlfiPriv();
96a9758165cd Initial revision
carl
parents:
diff changeset
220 ~mlfiPriv();
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
221 void reset(bool final = false); // for a new message
0
96a9758165cd Initial revision
carl
parents:
diff changeset
222 };
96a9758165cd Initial revision
carl
parents:
diff changeset
223 mlfiPriv::mlfiPriv() {
96a9758165cd Initial revision
carl
parents:
diff changeset
224 pthread_mutex_lock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
225 pc = config;
96a9758165cd Initial revision
carl
parents:
diff changeset
226 pc->reference_count++;
96a9758165cd Initial revision
carl
parents:
diff changeset
227 pthread_mutex_unlock(&config_mutex);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
228 ip = 0;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
229 mailaddr = NULL;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
230 authenticated = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
231 have_whites = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
232 only_whites = true;
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
233 scanner = new url_scanner(&hosts);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
234 }
96a9758165cd Initial revision
carl
parents:
diff changeset
235 mlfiPriv::~mlfiPriv() {
96a9758165cd Initial revision
carl
parents:
diff changeset
236 pthread_mutex_lock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
237 pc->reference_count--;
96a9758165cd Initial revision
carl
parents:
diff changeset
238 pthread_mutex_unlock(&config_mutex);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
239 reset(true);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
240 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
241 void mlfiPriv::reset(bool final) {
0
96a9758165cd Initial revision
carl
parents:
diff changeset
242 if (mailaddr) free(mailaddr);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
243 delete scanner;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
244 discard(non_whites);
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
245 discard(hosts);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
246 if (!final) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
247 mailaddr = NULL;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
248 authenticated = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
249 have_whites = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
250 only_whites = true;
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
251 scanner = new url_scanner(&hosts);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
252 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
253 }
96a9758165cd Initial revision
carl
parents:
diff changeset
254
96a9758165cd Initial revision
carl
parents:
diff changeset
255 #define MLFIPRIV ((struct mlfiPriv *) smfi_getpriv(ctx))
96a9758165cd Initial revision
carl
parents:
diff changeset
256
96a9758165cd Initial revision
carl
parents:
diff changeset
257
96a9758165cd Initial revision
carl
parents:
diff changeset
258 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
259 // register a global string
96a9758165cd Initial revision
carl
parents:
diff changeset
260 //
96a9758165cd Initial revision
carl
parents:
diff changeset
261 static char* register_string(char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
262 static char* register_string(char *name) {
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
263 return register_string(all_strings, name);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
264 }
96a9758165cd Initial revision
carl
parents:
diff changeset
265
96a9758165cd Initial revision
carl
parents:
diff changeset
266
96a9758165cd Initial revision
carl
parents:
diff changeset
267 static char* next_token(char *delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
268 static char* next_token(char *delim) {
96a9758165cd Initial revision
carl
parents:
diff changeset
269 char *name = strtok(NULL, delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
270 if (!name) return name;
96a9758165cd Initial revision
carl
parents:
diff changeset
271 return register_string(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
272 }
96a9758165cd Initial revision
carl
parents:
diff changeset
273
96a9758165cd Initial revision
carl
parents:
diff changeset
274
96a9758165cd Initial revision
carl
parents:
diff changeset
275 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
276 // lookup an email address in the env_from or env_to maps
96a9758165cd Initial revision
carl
parents:
diff changeset
277 //
96a9758165cd Initial revision
carl
parents:
diff changeset
278 static char* lookup1(char *email, string_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
279 static char* lookup1(char *email, string_map map) {
96a9758165cd Initial revision
carl
parents:
diff changeset
280 string_map::iterator i = map.find(email);
96a9758165cd Initial revision
carl
parents:
diff changeset
281 if (i != map.end()) return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
282 char *x = strchr(email, '@');
96a9758165cd Initial revision
carl
parents:
diff changeset
283 if (!x) return DEFAULT;
96a9758165cd Initial revision
carl
parents:
diff changeset
284 x++;
96a9758165cd Initial revision
carl
parents:
diff changeset
285 i = map.find(x);
96a9758165cd Initial revision
carl
parents:
diff changeset
286 if (i != map.end()) return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
287 return DEFAULT;
96a9758165cd Initial revision
carl
parents:
diff changeset
288 }
96a9758165cd Initial revision
carl
parents:
diff changeset
289
96a9758165cd Initial revision
carl
parents:
diff changeset
290
96a9758165cd Initial revision
carl
parents:
diff changeset
291 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
292 // lookup an email address in the env_from or env_to maps
96a9758165cd Initial revision
carl
parents:
diff changeset
293 // this email address is passed in from sendmail, and will
96a9758165cd Initial revision
carl
parents:
diff changeset
294 // always be enclosed in <>. It may have mixed case, just
96a9758165cd Initial revision
carl
parents:
diff changeset
295 // as the mail client sent it.
96a9758165cd Initial revision
carl
parents:
diff changeset
296 //
96a9758165cd Initial revision
carl
parents:
diff changeset
297 static char* lookup(char* email, string_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
298 static char* lookup(char* email, string_map map) {
96a9758165cd Initial revision
carl
parents:
diff changeset
299 int n = strlen(email)-2;
96a9758165cd Initial revision
carl
parents:
diff changeset
300 if (n < 1) return DEFAULT; // malformed
96a9758165cd Initial revision
carl
parents:
diff changeset
301 char *key = strdup(email+1);
96a9758165cd Initial revision
carl
parents:
diff changeset
302 key[n] = '\0';
96a9758165cd Initial revision
carl
parents:
diff changeset
303 for (int i=0; i<n; i++) key[i] = tolower(key[i]);
96a9758165cd Initial revision
carl
parents:
diff changeset
304 char *rc = lookup1(key, map);
96a9758165cd Initial revision
carl
parents:
diff changeset
305 free(key);
96a9758165cd Initial revision
carl
parents:
diff changeset
306 return rc;
96a9758165cd Initial revision
carl
parents:
diff changeset
307 }
96a9758165cd Initial revision
carl
parents:
diff changeset
308
96a9758165cd Initial revision
carl
parents:
diff changeset
309
96a9758165cd Initial revision
carl
parents:
diff changeset
310 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
311 // find the dnsbl with a specific name
96a9758165cd Initial revision
carl
parents:
diff changeset
312 //
96a9758165cd Initial revision
carl
parents:
diff changeset
313 static DNSBLP find_dnsbl(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
314 static DNSBLP find_dnsbl(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
315 dnsblp_map::iterator i = dc.dnsbls.find(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
316 if (i == dc.dnsbls.end()) return NULL;
96a9758165cd Initial revision
carl
parents:
diff changeset
317 return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
318 }
96a9758165cd Initial revision
carl
parents:
diff changeset
319
96a9758165cd Initial revision
carl
parents:
diff changeset
320
96a9758165cd Initial revision
carl
parents:
diff changeset
321 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
322 // find the dnsbll with a specific name
96a9758165cd Initial revision
carl
parents:
diff changeset
323 //
96a9758165cd Initial revision
carl
parents:
diff changeset
324 static DNSBLLP find_dnsbll(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
325 static DNSBLLP find_dnsbll(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
326 dnsbllp_map::iterator i = dc.dnsblls.find(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
327 if (i == dc.dnsblls.end()) return NULL;
96a9758165cd Initial revision
carl
parents:
diff changeset
328 return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
329 }
96a9758165cd Initial revision
carl
parents:
diff changeset
330
96a9758165cd Initial revision
carl
parents:
diff changeset
331
96a9758165cd Initial revision
carl
parents:
diff changeset
332 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
333 // find the envfrom map with a specific name
96a9758165cd Initial revision
carl
parents:
diff changeset
334 //
96a9758165cd Initial revision
carl
parents:
diff changeset
335 static string_map* find_from_map(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
336 static string_map* find_from_map(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
337 from_map::iterator i = dc.env_from.find(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
338 if (i == dc.env_from.end()) return NULL;
96a9758165cd Initial revision
carl
parents:
diff changeset
339 return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
340 }
96a9758165cd Initial revision
carl
parents:
diff changeset
341
96a9758165cd Initial revision
carl
parents:
diff changeset
342
96a9758165cd Initial revision
carl
parents:
diff changeset
343 static string_map& really_find_from_map(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
344 static string_map& really_find_from_map(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
345 string_map *sm = find_from_map(dc, name);
96a9758165cd Initial revision
carl
parents:
diff changeset
346 if (!sm) {
96a9758165cd Initial revision
carl
parents:
diff changeset
347 sm = new string_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
348 dc.env_from[name] = sm;
96a9758165cd Initial revision
carl
parents:
diff changeset
349 }
96a9758165cd Initial revision
carl
parents:
diff changeset
350 return *sm;
96a9758165cd Initial revision
carl
parents:
diff changeset
351 }
96a9758165cd Initial revision
carl
parents:
diff changeset
352
96a9758165cd Initial revision
carl
parents:
diff changeset
353
96a9758165cd Initial revision
carl
parents:
diff changeset
354 ////////////////////////////////////////////////
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
355 //
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
356 // 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
357 // very hard, just using the default resolver retry settings.
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
358 // If we cannot get an answer, we just accept the mail. The
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
359 // caller must ensure thread safety.
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
360 //
0
96a9758165cd Initial revision
carl
parents:
diff changeset
361 //
23
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
362 static int dns_interface(char *question, bool maybe_ip);
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
363 static int dns_interface(char *question, bool maybe_ip) {
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
364 #ifdef NS_PACKETSZ
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
365 u_char answer[NS_PACKETSZ];
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
366 int length = res_search(question, ns_c_in, ns_t_a, answer, sizeof(answer));
23
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
367 if (length >= 0) { // no error yet
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
368 // parse the answer
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
369 ns_msg handle;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
370 ns_rr rr;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
371 if (ns_initparse(answer, length, &handle) == 0) {
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
372 int rrnum = 0;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
373 while (ns_parserr(&handle, ns_s_an, rrnum++, &rr) == 0) {
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
374 if (ns_rr_type(rr) == ns_t_a) {
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
375 int address;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
376 memcpy(&address, ns_rr_rdata(rr), sizeof(address));
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
377 return address;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
378 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
379 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
380 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
381 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
382 if (maybe_ip) {
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
383 // might be a bare ip address
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
384 in_addr ip;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
385 if (inet_aton(question, &ip)) {
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
386 return ip.s_addr;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
387 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
388 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
389 return 0;
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
390 #else
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
391 struct hostent *host = gethostbyname(question);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
392 if (!host) return 0;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
393 if (host->h_addrtype != AF_INET) return 0;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
394 int address;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
395 memcpy(&address, host->h_addr, sizeof(address));
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
396 return address;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
397 #endif
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
398 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
399
23
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
400 static int protected_dns_interface(char *question, bool maybe_ip);
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
401 static int protected_dns_interface(char *question, bool maybe_ip) {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
402 int ans;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
403 pthread_mutex_lock(&resolve_mutex);
23
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
404 ans = dns_interface(question, maybe_ip);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
405 pthread_mutex_unlock(&resolve_mutex);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
406 return ans;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
407
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
408 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
409
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
410 ////////////////////////////////////////////////
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
411 // check a single dnsbl
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
412 //
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
413 static status check_single(int ip, char *suffix);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
414 static status check_single(int ip, char *suffix) {
0
96a9758165cd Initial revision
carl
parents:
diff changeset
415 // make a dns question
96a9758165cd Initial revision
carl
parents:
diff changeset
416 const u_char *src = (const u_char *)&ip;
96a9758165cd Initial revision
carl
parents:
diff changeset
417 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
418 #ifdef NS_MAXDNAME
0
96a9758165cd Initial revision
carl
parents:
diff changeset
419 char question[NS_MAXDNAME];
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
420 #else
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
421 char question[1000];
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
422 #endif
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
423 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
424 // ask the question, if we get an A record it implies a blacklisted ip address
23
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
425 return (protected_dns_interface(question, false)) ? reject : oksofar;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
426 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
427
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
428
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
429 ////////////////////////////////////////////////
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
430 // check a single dnsbl
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
431 //
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
432 static status check_single(int ip, DNSBL &bl);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
433 static status check_single(int ip, DNSBL &bl) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
434 return check_single(ip, bl.suffix);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
435 }
96a9758165cd Initial revision
carl
parents:
diff changeset
436
96a9758165cd Initial revision
carl
parents:
diff changeset
437
96a9758165cd Initial revision
carl
parents:
diff changeset
438 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
439 // check the dnsbls specified for this recipient
96a9758165cd Initial revision
carl
parents:
diff changeset
440 //
96a9758165cd Initial revision
carl
parents:
diff changeset
441 static status check_dnsbl(mlfiPriv &priv, DNSBLLP dnsbllp, DNSBLP &rejectlist);
96a9758165cd Initial revision
carl
parents:
diff changeset
442 static status check_dnsbl(mlfiPriv &priv, DNSBLLP dnsbllp, DNSBLP &rejectlist) {
96a9758165cd Initial revision
carl
parents:
diff changeset
443 if (priv.authenticated) return oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
444 if (!dnsbllp) return oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
445 DNSBLL &dnsbll = *dnsbllp;
96a9758165cd Initial revision
carl
parents:
diff changeset
446 for (DNSBLL::iterator i=dnsbll.begin(); i!=dnsbll.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
447 DNSBLP dp = *i; // non null by construction
96a9758165cd Initial revision
carl
parents:
diff changeset
448 status st;
96a9758165cd Initial revision
carl
parents:
diff changeset
449 map<DNSBLP, status>::iterator f = priv.checked.find(dp);
96a9758165cd Initial revision
carl
parents:
diff changeset
450 if (f == priv.checked.end()) {
96a9758165cd Initial revision
carl
parents:
diff changeset
451 // have not checked this list yet
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
452 st = check_single(priv.ip, *dp);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
453 rejectlist = dp;
96a9758165cd Initial revision
carl
parents:
diff changeset
454 priv.checked[dp] = st;
96a9758165cd Initial revision
carl
parents:
diff changeset
455 }
96a9758165cd Initial revision
carl
parents:
diff changeset
456 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
457 st = (*f).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
458 rejectlist = (*f).first;
96a9758165cd Initial revision
carl
parents:
diff changeset
459 }
96a9758165cd Initial revision
carl
parents:
diff changeset
460 if (st == reject) return st;
96a9758165cd Initial revision
carl
parents:
diff changeset
461 }
96a9758165cd Initial revision
carl
parents:
diff changeset
462 return oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
463 }
96a9758165cd Initial revision
carl
parents:
diff changeset
464
96a9758165cd Initial revision
carl
parents:
diff changeset
465
96a9758165cd Initial revision
carl
parents:
diff changeset
466 ////////////////////////////////////////////////
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
467 // check the dnsbls specified for this recipient
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
468 //
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
469 static status check_hosts(mlfiPriv &priv, char *&host, int &ip);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
470 static status check_hosts(mlfiPriv &priv, char *&host, int &ip) {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
471 CONFIG &dc = *priv.pc;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
472 if (!dc.content_suffix) return oksofar;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
473 int count = 0;
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
474 for (string_set::iterator i=priv.hosts.begin(); i!=priv.hosts.end(); i++) {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
475 count++;
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
476 if (count > 20) return oksofar; // silly to check too many hosts
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
477 host = *i;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
478 if (debug_syslog) {
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
479 char buf[200];
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
480 snprintf(buf, sizeof(buf), "looking for host %s", host);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
481 my_syslog(buf);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
482 }
23
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
483 ip = protected_dns_interface(host, true);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
484 if (ip) {
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
485 if (debug_syslog) {
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
486 char adr[sizeof "255.255.255.255"];
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
487 adr[0] = '\0';
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
488 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
489 char buf[200];
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
490 snprintf(buf, sizeof(buf), "found host %s at %s", host, adr);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
491 my_syslog(buf);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
492 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
493 status st = check_single(ip, dc.content_suffix);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
494 if (st == reject) return st;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
495 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
496 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
497 return oksofar;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
498 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
499
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
500
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
501 ////////////////////////////////////////////////
0
96a9758165cd Initial revision
carl
parents:
diff changeset
502 // start of sendmail milter interfaces
96a9758165cd Initial revision
carl
parents:
diff changeset
503 //
96a9758165cd Initial revision
carl
parents:
diff changeset
504 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
96a9758165cd Initial revision
carl
parents:
diff changeset
505 {
96a9758165cd Initial revision
carl
parents:
diff changeset
506 // allocate some private memory
96a9758165cd Initial revision
carl
parents:
diff changeset
507 mlfiPriv *priv = new mlfiPriv;
96a9758165cd Initial revision
carl
parents:
diff changeset
508 if (hostaddr->sa_family == AF_INET) {
96a9758165cd Initial revision
carl
parents:
diff changeset
509 priv->ip = ((struct sockaddr_in *)hostaddr)->sin_addr.s_addr;
96a9758165cd Initial revision
carl
parents:
diff changeset
510 }
96a9758165cd Initial revision
carl
parents:
diff changeset
511
96a9758165cd Initial revision
carl
parents:
diff changeset
512 // save the private data
96a9758165cd Initial revision
carl
parents:
diff changeset
513 smfi_setpriv(ctx, (void*)priv);
96a9758165cd Initial revision
carl
parents:
diff changeset
514
96a9758165cd Initial revision
carl
parents:
diff changeset
515 // continue processing
96a9758165cd Initial revision
carl
parents:
diff changeset
516 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
517 }
96a9758165cd Initial revision
carl
parents:
diff changeset
518
96a9758165cd Initial revision
carl
parents:
diff changeset
519 sfsistat mlfi_envfrom(SMFICTX *ctx, char **from)
96a9758165cd Initial revision
carl
parents:
diff changeset
520 {
96a9758165cd Initial revision
carl
parents:
diff changeset
521 mlfiPriv &priv = *MLFIPRIV;
96a9758165cd Initial revision
carl
parents:
diff changeset
522 priv.mailaddr = strdup(from[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
523 priv.authenticated = (smfi_getsymval(ctx, "{auth_authen}") != NULL);
96a9758165cd Initial revision
carl
parents:
diff changeset
524 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
525 }
96a9758165cd Initial revision
carl
parents:
diff changeset
526
96a9758165cd Initial revision
carl
parents:
diff changeset
527 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **rcpt)
96a9758165cd Initial revision
carl
parents:
diff changeset
528 {
96a9758165cd Initial revision
carl
parents:
diff changeset
529 DNSBLP rejectlist = NULL; // list that caused the reject
96a9758165cd Initial revision
carl
parents:
diff changeset
530 status st = oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
531 mlfiPriv &priv = *MLFIPRIV;
96a9758165cd Initial revision
carl
parents:
diff changeset
532 CONFIG &dc = *priv.pc;
96a9758165cd Initial revision
carl
parents:
diff changeset
533 char *rcptaddr = rcpt[0];
96a9758165cd Initial revision
carl
parents:
diff changeset
534 char *dnsname = lookup(rcptaddr, dc.env_to_dnsbll);
96a9758165cd Initial revision
carl
parents:
diff changeset
535 char *fromname = lookup(rcptaddr, dc.env_to_chkfrom);
96a9758165cd Initial revision
carl
parents:
diff changeset
536 if ((strcmp(dnsname, BLACK) == 0) ||
96a9758165cd Initial revision
carl
parents:
diff changeset
537 (strcmp(fromname, BLACK) == 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
538 st = black; // two options to blacklist this recipient
96a9758165cd Initial revision
carl
parents:
diff changeset
539 }
96a9758165cd Initial revision
carl
parents:
diff changeset
540 else if (strcmp(fromname, WHITE) == 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
541 st = white;
96a9758165cd Initial revision
carl
parents:
diff changeset
542 }
96a9758165cd Initial revision
carl
parents:
diff changeset
543 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
544 // check an env_from map
96a9758165cd Initial revision
carl
parents:
diff changeset
545 string_map *sm = find_from_map(dc, fromname);
96a9758165cd Initial revision
carl
parents:
diff changeset
546 if (sm != NULL) {
96a9758165cd Initial revision
carl
parents:
diff changeset
547 fromname = lookup(priv.mailaddr, *sm); // returns default if name not in map
96a9758165cd Initial revision
carl
parents:
diff changeset
548 if (strcmp(fromname, BLACK) == 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
549 st = black; // blacklist this envelope from value
96a9758165cd Initial revision
carl
parents:
diff changeset
550 }
96a9758165cd Initial revision
carl
parents:
diff changeset
551 if (strcmp(fromname, WHITE) == 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
552 st = white; // blacklist this envelope from value
96a9758165cd Initial revision
carl
parents:
diff changeset
553 }
96a9758165cd Initial revision
carl
parents:
diff changeset
554 }
96a9758165cd Initial revision
carl
parents:
diff changeset
555 }
96a9758165cd Initial revision
carl
parents:
diff changeset
556 if ((st == oksofar) && (strcmp(dnsname, WHITE) != 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
557 // check dns lists
96a9758165cd Initial revision
carl
parents:
diff changeset
558 st = check_dnsbl(priv, find_dnsbll(dc, dnsname), rejectlist);
96a9758165cd Initial revision
carl
parents:
diff changeset
559 }
96a9758165cd Initial revision
carl
parents:
diff changeset
560
96a9758165cd Initial revision
carl
parents:
diff changeset
561 if (st == reject) {
96a9758165cd Initial revision
carl
parents:
diff changeset
562 // reject the recipient based on some dnsbl
96a9758165cd Initial revision
carl
parents:
diff changeset
563 char adr[sizeof "255.255.255.255"];
96a9758165cd Initial revision
carl
parents:
diff changeset
564 adr[0] = '\0';
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
565 inet_ntop(AF_INET, (const u_char *)&priv.ip, adr, sizeof(adr));
0
96a9758165cd Initial revision
carl
parents:
diff changeset
566 char buf[2000];
96a9758165cd Initial revision
carl
parents:
diff changeset
567 snprintf(buf, sizeof(buf), rejectlist->message, adr, adr);
96a9758165cd Initial revision
carl
parents:
diff changeset
568 smfi_setreply(ctx, "550", "5.7.1", buf);
96a9758165cd Initial revision
carl
parents:
diff changeset
569 return SMFIS_REJECT;
96a9758165cd Initial revision
carl
parents:
diff changeset
570 }
96a9758165cd Initial revision
carl
parents:
diff changeset
571 else if (st == black) {
96a9758165cd Initial revision
carl
parents:
diff changeset
572 // reject the recipient based on blacklisting either from or to
96a9758165cd Initial revision
carl
parents:
diff changeset
573 smfi_setreply(ctx, "550", "5.7.1", "no such user");
96a9758165cd Initial revision
carl
parents:
diff changeset
574 return SMFIS_REJECT;
96a9758165cd Initial revision
carl
parents:
diff changeset
575 }
96a9758165cd Initial revision
carl
parents:
diff changeset
576 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
577 // accept the recipient
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
578 if (st == oksofar) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
579 // but remember the non-whites
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
580 register_string(priv.non_whites, rcptaddr);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
581 priv.only_whites = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
582 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
583 if (st == white) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
584 priv.have_whites = true;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
585 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
586 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
587 }
96a9758165cd Initial revision
carl
parents:
diff changeset
588 }
96a9758165cd Initial revision
carl
parents:
diff changeset
589
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
590 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len)
0
96a9758165cd Initial revision
carl
parents:
diff changeset
591 {
96a9758165cd Initial revision
carl
parents:
diff changeset
592 mlfiPriv &priv = *MLFIPRIV;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
593 if (priv.authenticated) return SMFIS_CONTINUE;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
594 if (priv.only_whites) return SMFIS_CONTINUE;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
595 priv.scanner->scan(data, len);
11
2c206836b4cc integration work on url scanner
carl
parents: 9
diff changeset
596 return SMFIS_CONTINUE;
8
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 sfsistat mlfi_eom(SMFICTX *ctx)
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
600 {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
601 sfsistat rc;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
602 mlfiPriv &priv = *MLFIPRIV;
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
603 char *host = NULL;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
604 int ip;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
605 // process end of message
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
606 if (priv.authenticated ||
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
607 priv.only_whites ||
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
608 (check_hosts(priv, host, ip) == oksofar)) rc = SMFIS_CONTINUE;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
609 else {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
610 if (!priv.have_whites) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
611 // can reject the entire message
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
612 char adr[sizeof "255.255.255.255"];
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
613 adr[0] = '\0';
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
614 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
615 char buf[2000];
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
616 snprintf(buf, sizeof(buf), priv.pc->content_message, host, adr);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
617 smfi_setreply(ctx, "550", "5.7.1", buf);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
618 rc = SMFIS_REJECT;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
619 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
620 else {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
621 // need to accept it but remove the recipients that don't want it
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
622 for (string_set::iterator i=priv.non_whites.begin(); i!=priv.non_whites.end(); i++) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
623 char *rcpt = *i;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
624 smfi_delrcpt(ctx, rcpt);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
625 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
626 rc = SMFIS_CONTINUE;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
627 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
628 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
629 // reset for a new message on the same connection
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
630 mlfi_abort(ctx);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
631 return rc;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
632 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
633
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
634 sfsistat mlfi_abort(SMFICTX *ctx)
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
635 {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
636 mlfiPriv &priv = *MLFIPRIV;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
637 priv.reset();
0
96a9758165cd Initial revision
carl
parents:
diff changeset
638 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
639 }
96a9758165cd Initial revision
carl
parents:
diff changeset
640
96a9758165cd Initial revision
carl
parents:
diff changeset
641 sfsistat mlfi_close(SMFICTX *ctx)
96a9758165cd Initial revision
carl
parents:
diff changeset
642 {
96a9758165cd Initial revision
carl
parents:
diff changeset
643 mlfiPriv *priv = MLFIPRIV;
96a9758165cd Initial revision
carl
parents:
diff changeset
644 if (!priv) return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
645 delete priv;
96a9758165cd Initial revision
carl
parents:
diff changeset
646 smfi_setpriv(ctx, NULL);
96a9758165cd Initial revision
carl
parents:
diff changeset
647 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
648 }
96a9758165cd Initial revision
carl
parents:
diff changeset
649
96a9758165cd Initial revision
carl
parents:
diff changeset
650 struct smfiDesc smfilter =
96a9758165cd Initial revision
carl
parents:
diff changeset
651 {
96a9758165cd Initial revision
carl
parents:
diff changeset
652 "DNSBL", // filter name
96a9758165cd Initial revision
carl
parents:
diff changeset
653 SMFI_VERSION, // version code -- do not change
96a9758165cd Initial revision
carl
parents:
diff changeset
654 SMFIF_DELRCPT, // flags
96a9758165cd Initial revision
carl
parents:
diff changeset
655 mlfi_connect, // connection info filter
96a9758165cd Initial revision
carl
parents:
diff changeset
656 NULL, // SMTP HELO command filter
96a9758165cd Initial revision
carl
parents:
diff changeset
657 mlfi_envfrom, // envelope sender filter
96a9758165cd Initial revision
carl
parents:
diff changeset
658 mlfi_envrcpt, // envelope recipient filter
96a9758165cd Initial revision
carl
parents:
diff changeset
659 NULL, // header filter
96a9758165cd Initial revision
carl
parents:
diff changeset
660 NULL, // end of header
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
661 mlfi_body, // body block filter
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
662 mlfi_eom, // end of message
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
663 mlfi_abort, // message aborted
0
96a9758165cd Initial revision
carl
parents:
diff changeset
664 mlfi_close, // connection cleanup
96a9758165cd Initial revision
carl
parents:
diff changeset
665 };
96a9758165cd Initial revision
carl
parents:
diff changeset
666
96a9758165cd Initial revision
carl
parents:
diff changeset
667
96a9758165cd Initial revision
carl
parents:
diff changeset
668 static void dumpit(char *name, string_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
669 static void dumpit(char *name, string_map map) {
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
670 fprintf(stdout, "\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
671 for (string_map::iterator i=map.begin(); i!=map.end(); i++) {
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
672 fprintf(stdout, "%s %s->%s\n", name, (*i).first, (*i).second);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
673 }
96a9758165cd Initial revision
carl
parents:
diff changeset
674 }
96a9758165cd Initial revision
carl
parents:
diff changeset
675
96a9758165cd Initial revision
carl
parents:
diff changeset
676
96a9758165cd Initial revision
carl
parents:
diff changeset
677 static void dumpit(from_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
678 static void dumpit(from_map map) {
96a9758165cd Initial revision
carl
parents:
diff changeset
679 for (from_map::iterator i=map.begin(); i!=map.end(); i++) {
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
680 char buf[2000];
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
681 snprintf(buf, sizeof(buf), "envelope from map for %s", (*i).first);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
682 string_map *sm = (*i).second;
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
683 dumpit(buf, *sm);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
684 }
96a9758165cd Initial revision
carl
parents:
diff changeset
685 }
96a9758165cd Initial revision
carl
parents:
diff changeset
686
96a9758165cd Initial revision
carl
parents:
diff changeset
687
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
688 static void dumpit(CONFIG &dc);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
689 static void dumpit(CONFIG &dc) {
5
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
690 dumpit(dc.env_from);
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
691 dumpit("envelope to (dnsbl list)", dc.env_to_dnsbll);
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
692 dumpit("envelope to (from map)", dc.env_to_chkfrom);
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
693 fprintf(stdout, "\ndnsbls\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
694 for (dnsblp_map::iterator i=dc.dnsbls.begin(); i!=dc.dnsbls.end(); i++) {
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
695 fprintf(stdout, "%s %s %s\n", (*i).first, (*i).second->suffix, (*i).second->message);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
696 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
697 fprintf(stdout, "\ndnsbl_lists\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
698 for (dnsbllp_map::iterator i=dc.dnsblls.begin(); i!=dc.dnsblls.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
699 char *name = (*i).first;
96a9758165cd Initial revision
carl
parents:
diff changeset
700 DNSBLL &dl = *((*i).second);
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
701 fprintf(stdout, "%s", name);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
702 for (DNSBLL::iterator j=dl.begin(); j!=dl.end(); j++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
703 DNSBL &d = **j;
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
704 fprintf(stdout, " %s", d.suffix);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
705 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
706 fprintf(stdout, "\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
707 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
708 if (dc.content_suffix) {
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
709 fprintf(stdout, "\ncontent filtering enabled with %s %s\n", dc.content_suffix, dc.content_message);
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
710 }
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
711 fprintf(stdout, "\nfiles\n");
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
712 for (string_list::iterator i=dc.config_files.begin(); i!=dc.config_files.end(); i++) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
713 char *f = *i;
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
714 fprintf(stdout, "config includes %s\n", f);
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
715 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
716 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
717
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
718
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
719 ////////////////////////////////////////////////
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
720 // check for redundant or recursive include files
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
721 //
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
722 static bool ok_to_include(CONFIG &dc, char *fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
723 static bool ok_to_include(CONFIG &dc, char *fn) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
724 if (!fn) return false;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
725 bool ok = true;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
726 for (string_list::iterator i=dc.config_files.begin(); i!=dc.config_files.end(); i++) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
727 char *f = *i;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
728 if (strcmp(f, fn) == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
729 my_syslog("redundant or recursive include file detected");
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
730 ok = false;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
731 break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
732 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
733 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
734 return ok;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
735 }
96a9758165cd Initial revision
carl
parents:
diff changeset
736
96a9758165cd Initial revision
carl
parents:
diff changeset
737
96a9758165cd Initial revision
carl
parents:
diff changeset
738 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
739 // load a single config file
96a9758165cd Initial revision
carl
parents:
diff changeset
740 //
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
741 static void load_conf_dcc(CONFIG &dc, char *name, char *fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
742 static void load_conf_dcc(CONFIG &dc, char *name, char *fn) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
743 dc.config_files.push_back(fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
744 char *list = BLACK;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
745 const int LINE_SIZE = 2000;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
746 ifstream is(fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
747 if (is.fail()) return;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
748 char line[LINE_SIZE];
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
749 char *delim = " \t";
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
750 int curline = 0;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
751 while (!is.eof()) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
752 is.getline(line, LINE_SIZE);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
753 curline++;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
754 int n = strlen(line);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
755 if (!n) continue;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
756 for (int i=0; i<n; i++) line[i] = tolower(line[i]);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
757 if (line[0] == '#') continue;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
758 char *head = line;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
759 if (strspn(line, delim) == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
760 // have a leading ok/many tag to fetch
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
761 char *cmd = strtok(line, delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
762 if (strcmp(cmd, MANY) == 0) list = BLACK;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
763 else if (strcmp(cmd, OK) == 0) list = WHITE;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
764 head = cmd + strlen(cmd) + 1;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
765 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
766 char *cmd = strtok(head, delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
767 if (!cmd) continue;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
768 if (strcmp(cmd, "env_from") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
769 char *from = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
770 if (from) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
771 string_map &fm = really_find_from_map(dc, name);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
772 fm[from] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
773 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
774 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
775 else if (strcmp(cmd, "env_to") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
776 char *to = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
777 if (to) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
778 dc.env_to_dnsbll[to] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
779 dc.env_to_chkfrom[to] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
780 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
781 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
782 else if (strcmp(cmd, "substitute") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
783 char *tag = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
784 if (tag && (strcmp(tag, "mail_host") == 0)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
785 char *from = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
786 if (from) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
787 string_map &fm = really_find_from_map(dc, name);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
788 fm[from] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
789 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
790 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
791 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
792 else if (strcmp(cmd, "include") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
793 char *fn = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
794 if (ok_to_include(dc, fn)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
795 load_conf_dcc(dc, name, fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
796 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
797 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
798
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
799 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
800 is.close();
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
801 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
802
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
803
0
96a9758165cd Initial revision
carl
parents:
diff changeset
804 static void load_conf(CONFIG &dc, char *fn);
96a9758165cd Initial revision
carl
parents:
diff changeset
805 static void load_conf(CONFIG &dc, char *fn) {
96a9758165cd Initial revision
carl
parents:
diff changeset
806 dc.config_files.push_back(fn);
96a9758165cd Initial revision
carl
parents:
diff changeset
807 map<char*, int, ltstr> commands;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
808 enum {dummy, content, dnsbl, dnsbll, envfrom, envto, include, includedcc};
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
809 commands["content" ] = content;
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
810 commands["dnsbl" ] = dnsbl;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
811 commands["dnsbl_list" ] = dnsbll;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
812 commands["env_from" ] = envfrom;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
813 commands["env_to" ] = envto;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
814 commands["include" ] = include;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
815 commands["include_dcc"] = includedcc;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
816 const int LINE_SIZE = 2000;
96a9758165cd Initial revision
carl
parents:
diff changeset
817 ifstream is(fn);
96a9758165cd Initial revision
carl
parents:
diff changeset
818 if (is.fail()) return;
96a9758165cd Initial revision
carl
parents:
diff changeset
819 char line[LINE_SIZE];
96a9758165cd Initial revision
carl
parents:
diff changeset
820 char orig[LINE_SIZE];
96a9758165cd Initial revision
carl
parents:
diff changeset
821 char *delim = " \t";
96a9758165cd Initial revision
carl
parents:
diff changeset
822 int curline = 0;
96a9758165cd Initial revision
carl
parents:
diff changeset
823 while (!is.eof()) {
96a9758165cd Initial revision
carl
parents:
diff changeset
824 is.getline(line, LINE_SIZE);
96a9758165cd Initial revision
carl
parents:
diff changeset
825 snprintf(orig, sizeof(orig), "%s", line);
96a9758165cd Initial revision
carl
parents:
diff changeset
826 curline++;
96a9758165cd Initial revision
carl
parents:
diff changeset
827 int n = strlen(line);
96a9758165cd Initial revision
carl
parents:
diff changeset
828 for (int i=0; i<n; i++) line[i] = tolower(line[i]);
96a9758165cd Initial revision
carl
parents:
diff changeset
829 char *cmd = strtok(line, delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
830 if (cmd && (cmd[0] != '#') && (cmd[0] != '\0')) {
96a9758165cd Initial revision
carl
parents:
diff changeset
831 // have a decent command
96a9758165cd Initial revision
carl
parents:
diff changeset
832 bool processed = false;
96a9758165cd Initial revision
carl
parents:
diff changeset
833 switch (commands[cmd]) {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
834 case content: {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
835 char *suff = strtok(NULL, delim);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
836 if (!suff) break; // no dns suffic
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
837 char *msg = suff + strlen(suff);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
838 if ((msg - line) >= strlen(orig)) break; // line ended with the dns suffix
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
839 msg = strchr(msg+1, '\'');
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
840 if (!msg) break; // no reply message template
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
841 msg++; // move over the leading '
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
842 if ((msg - line) >= strlen(orig)) break; // line ended with the leading quote
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
843 char *last = strchr(msg, '\'');
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
844 if (!last) break; // no trailing quote
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
845 *last = '\0'; // make it a null terminator
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
846 dc.content_suffix = register_string(suff);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
847 dc.content_message = register_string(msg);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
848 processed = true;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
849 } break;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
850
0
96a9758165cd Initial revision
carl
parents:
diff changeset
851 case dnsbl: {
96a9758165cd Initial revision
carl
parents:
diff changeset
852 // have a new dnsbl to use
96a9758165cd Initial revision
carl
parents:
diff changeset
853 char *name = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
854 if (!name) break; // no name name
96a9758165cd Initial revision
carl
parents:
diff changeset
855 if (find_dnsbl(dc, name)) break; // duplicate entry
96a9758165cd Initial revision
carl
parents:
diff changeset
856 char *suff = strtok(NULL, delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
857 if (!suff) break; // no dns suffic
96a9758165cd Initial revision
carl
parents:
diff changeset
858 char *msg = suff + strlen(suff);
96a9758165cd Initial revision
carl
parents:
diff changeset
859 if ((msg - line) >= strlen(orig)) break; // line ended with the dns suffix
96a9758165cd Initial revision
carl
parents:
diff changeset
860 msg = strchr(msg+1, '\'');
96a9758165cd Initial revision
carl
parents:
diff changeset
861 if (!msg) break; // no reply message template
96a9758165cd Initial revision
carl
parents:
diff changeset
862 msg++; // move over the leading '
96a9758165cd Initial revision
carl
parents:
diff changeset
863 if ((msg - line) >= strlen(orig)) break; // line ended with the leading quote
96a9758165cd Initial revision
carl
parents:
diff changeset
864 char *last = strchr(msg, '\'');
96a9758165cd Initial revision
carl
parents:
diff changeset
865 if (!last) break; // no trailing quote
96a9758165cd Initial revision
carl
parents:
diff changeset
866 *last = '\0'; // make it a null terminator
96a9758165cd Initial revision
carl
parents:
diff changeset
867 dc.dnsbls[name] = new DNSBL(register_string(suff), register_string(msg));
96a9758165cd Initial revision
carl
parents:
diff changeset
868 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
869 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
870
96a9758165cd Initial revision
carl
parents:
diff changeset
871 case dnsbll: {
96a9758165cd Initial revision
carl
parents:
diff changeset
872 // define a new combination of dnsbls
96a9758165cd Initial revision
carl
parents:
diff changeset
873 char *name = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
874 if (!name) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
875 if (find_dnsbll(dc, name)) break; // duplicate entry
96a9758165cd Initial revision
carl
parents:
diff changeset
876 char *list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
877 if (!list || (*list == '\0') || (*list == '#')) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
878 DNSBLLP d = new DNSBLL;
96a9758165cd Initial revision
carl
parents:
diff changeset
879 DNSBLP p = find_dnsbl(dc, list);
96a9758165cd Initial revision
carl
parents:
diff changeset
880 if (p) d->push_back(p);
96a9758165cd Initial revision
carl
parents:
diff changeset
881 while (true) {
96a9758165cd Initial revision
carl
parents:
diff changeset
882 list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
883 if (!list || (*list == '\0') || (*list == '#')) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
884 DNSBLP p = find_dnsbl(dc, list);
96a9758165cd Initial revision
carl
parents:
diff changeset
885 if (p) d->push_back(p);
96a9758165cd Initial revision
carl
parents:
diff changeset
886 }
96a9758165cd Initial revision
carl
parents:
diff changeset
887 dc.dnsblls[name] = d;
96a9758165cd Initial revision
carl
parents:
diff changeset
888 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
889 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
890
96a9758165cd Initial revision
carl
parents:
diff changeset
891 case envfrom: {
96a9758165cd Initial revision
carl
parents:
diff changeset
892 // add an entry into the named string_map
96a9758165cd Initial revision
carl
parents:
diff changeset
893 char *name = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
894 if (!name) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
895 char *from = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
896 if (!from) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
897 char *list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
898 if (!list) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
899 if ((strcmp(list, WHITE) == 0) ||
96a9758165cd Initial revision
carl
parents:
diff changeset
900 (strcmp(list, BLACK) == 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
901 string_map &fm = really_find_from_map(dc, name);
96a9758165cd Initial revision
carl
parents:
diff changeset
902 fm[from] = list;
96a9758165cd Initial revision
carl
parents:
diff changeset
903 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
904 }
96a9758165cd Initial revision
carl
parents:
diff changeset
905 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
906 // list may be the name of a previously defined from_map
96a9758165cd Initial revision
carl
parents:
diff changeset
907 string_map *m = find_from_map(dc, list);
96a9758165cd Initial revision
carl
parents:
diff changeset
908 if (m && (strcmp(list,name) != 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
909 string_map &pm = *m;
96a9758165cd Initial revision
carl
parents:
diff changeset
910 string_map &fm = really_find_from_map(dc, name);
96a9758165cd Initial revision
carl
parents:
diff changeset
911 fm.insert(pm.begin(), pm.end());
96a9758165cd Initial revision
carl
parents:
diff changeset
912 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
913 }
96a9758165cd Initial revision
carl
parents:
diff changeset
914 }
96a9758165cd Initial revision
carl
parents:
diff changeset
915 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
916
96a9758165cd Initial revision
carl
parents:
diff changeset
917 case envto: {
96a9758165cd Initial revision
carl
parents:
diff changeset
918 // define the dnsbl_list and env_from maps to use for this recipient
96a9758165cd Initial revision
carl
parents:
diff changeset
919 char *to = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
920 if (!to) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
921 char *list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
922 if (!list) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
923 char *from = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
924 if (!from) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
925 dc.env_to_dnsbll[to] = list;
96a9758165cd Initial revision
carl
parents:
diff changeset
926 dc.env_to_chkfrom[to] = from;
96a9758165cd Initial revision
carl
parents:
diff changeset
927 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
928 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
929
96a9758165cd Initial revision
carl
parents:
diff changeset
930 case include: {
96a9758165cd Initial revision
carl
parents:
diff changeset
931 char *fn = next_token(delim);
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
932 if (ok_to_include(dc, fn)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
933 load_conf(dc, fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
934 processed = true;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
935 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
936 } break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
937
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
938 case includedcc: {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
939 char *name = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
940 if (!name) break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
941 char *fn = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
942 if (ok_to_include(dc, fn)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
943 load_conf_dcc(dc, name, fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
944 processed = true;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
945 }
96a9758165cd Initial revision
carl
parents:
diff changeset
946 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
947
96a9758165cd Initial revision
carl
parents:
diff changeset
948 default: {
96a9758165cd Initial revision
carl
parents:
diff changeset
949 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
950 }
96a9758165cd Initial revision
carl
parents:
diff changeset
951 if (!processed) {
96a9758165cd Initial revision
carl
parents:
diff changeset
952 pthread_mutex_lock(&syslog_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
953 openlog("dnsbl", LOG_PID, LOG_MAIL);
96a9758165cd Initial revision
carl
parents:
diff changeset
954 syslog(LOG_ERR, "ignoring file %s line %d : %s\n", fn, curline, orig);
96a9758165cd Initial revision
carl
parents:
diff changeset
955 closelog();
96a9758165cd Initial revision
carl
parents:
diff changeset
956 pthread_mutex_unlock(&syslog_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
957 }
96a9758165cd Initial revision
carl
parents:
diff changeset
958 }
96a9758165cd Initial revision
carl
parents:
diff changeset
959 }
96a9758165cd Initial revision
carl
parents:
diff changeset
960 is.close();
96a9758165cd Initial revision
carl
parents:
diff changeset
961 }
96a9758165cd Initial revision
carl
parents:
diff changeset
962
96a9758165cd Initial revision
carl
parents:
diff changeset
963
96a9758165cd Initial revision
carl
parents:
diff changeset
964 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
965 // reload the config
96a9758165cd Initial revision
carl
parents:
diff changeset
966 //
96a9758165cd Initial revision
carl
parents:
diff changeset
967 static CONFIG* new_conf();
96a9758165cd Initial revision
carl
parents:
diff changeset
968 static CONFIG* new_conf() {
96a9758165cd Initial revision
carl
parents:
diff changeset
969 my_syslog("loading new configuration");
96a9758165cd Initial revision
carl
parents:
diff changeset
970 CONFIG *newc = new CONFIG;
96a9758165cd Initial revision
carl
parents:
diff changeset
971 load_conf(*newc, "dnsbl.conf");
96a9758165cd Initial revision
carl
parents:
diff changeset
972 newc->load_time = time(NULL);
96a9758165cd Initial revision
carl
parents:
diff changeset
973 return newc;
96a9758165cd Initial revision
carl
parents:
diff changeset
974 }
96a9758165cd Initial revision
carl
parents:
diff changeset
975
96a9758165cd Initial revision
carl
parents:
diff changeset
976
96a9758165cd Initial revision
carl
parents:
diff changeset
977 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
978 // thread to watch the old config files for changes
96a9758165cd Initial revision
carl
parents:
diff changeset
979 // and reload when needed. we also cleanup old
96a9758165cd Initial revision
carl
parents:
diff changeset
980 // configs whose reference count has gone to zero.
96a9758165cd Initial revision
carl
parents:
diff changeset
981 //
96a9758165cd Initial revision
carl
parents:
diff changeset
982 static void* config_loader(void *arg);
96a9758165cd Initial revision
carl
parents:
diff changeset
983 static void* config_loader(void *arg) {
96a9758165cd Initial revision
carl
parents:
diff changeset
984 typedef set<CONFIG *> configp_set;
96a9758165cd Initial revision
carl
parents:
diff changeset
985 configp_set old_configs;
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
986 while (loader_run) {
0
96a9758165cd Initial revision
carl
parents:
diff changeset
987 sleep(180); // look for modifications every 3 minutes
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
988 if (!loader_run) break;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
989 CONFIG &dc = *config;
96a9758165cd Initial revision
carl
parents:
diff changeset
990 time_t then = dc.load_time;
96a9758165cd Initial revision
carl
parents:
diff changeset
991 struct stat st;
96a9758165cd Initial revision
carl
parents:
diff changeset
992 bool reload = false;
96a9758165cd Initial revision
carl
parents:
diff changeset
993 for (string_list::iterator i=dc.config_files.begin(); i!=dc.config_files.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
994 char *fn = *i;
96a9758165cd Initial revision
carl
parents:
diff changeset
995 if (stat(fn, &st)) reload = true; // file disappeared
96a9758165cd Initial revision
carl
parents:
diff changeset
996 else if (st.st_mtime > then) reload = true; // file modified
96a9758165cd Initial revision
carl
parents:
diff changeset
997 if (reload) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
998 }
96a9758165cd Initial revision
carl
parents:
diff changeset
999 if (reload) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1000 CONFIG *newc = new_conf();
96a9758165cd Initial revision
carl
parents:
diff changeset
1001 // replace the global config pointer
96a9758165cd Initial revision
carl
parents:
diff changeset
1002 pthread_mutex_lock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
1003 CONFIG *old = config;
96a9758165cd Initial revision
carl
parents:
diff changeset
1004 config = newc;
96a9758165cd Initial revision
carl
parents:
diff changeset
1005 pthread_mutex_unlock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
1006 if (old) old_configs.insert(old);
96a9758165cd Initial revision
carl
parents:
diff changeset
1007 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1008 // now look for old configs with zero ref counts
96a9758165cd Initial revision
carl
parents:
diff changeset
1009 for (configp_set::iterator i=old_configs.begin(); i!=old_configs.end(); ) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1010 CONFIG *old = *i;
96a9758165cd Initial revision
carl
parents:
diff changeset
1011 if (!old->reference_count) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1012 delete old; // destructor does all the work
96a9758165cd Initial revision
carl
parents:
diff changeset
1013 old_configs.erase(i++);
96a9758165cd Initial revision
carl
parents:
diff changeset
1014 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1015 else i++;
96a9758165cd Initial revision
carl
parents:
diff changeset
1016 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1017 }
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1018 return NULL;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1019 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1020
96a9758165cd Initial revision
carl
parents:
diff changeset
1021
96a9758165cd Initial revision
carl
parents:
diff changeset
1022 static void usage(char *prog);
96a9758165cd Initial revision
carl
parents:
diff changeset
1023 static void usage(char *prog)
96a9758165cd Initial revision
carl
parents:
diff changeset
1024 {
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1025 fprintf(stderr, "Usage: %s [-d] [-c] -p socket-addr [-t timeout]\n", prog);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1026 fprintf(stderr, "where socket-addr is for the connection to sendmail and should be one of\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1027 fprintf(stderr, " inet:port@local-ip-address\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1028 fprintf(stderr, " local:local-domain-socket-file-name\n");
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
1029 fprintf(stderr, "-c will load and dump the config to stdout\n");
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1030 fprintf(stderr, "-d will add some syslog debug messages\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1031 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1032
96a9758165cd Initial revision
carl
parents:
diff changeset
1033
96a9758165cd Initial revision
carl
parents:
diff changeset
1034 int main(int argc, char**argv)
96a9758165cd Initial revision
carl
parents:
diff changeset
1035 {
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1036 bool check = false;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1037 bool setconn = false;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1038 int c;
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1039 const char *args = "p:t:hcd";
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1040 extern char *optarg;
96a9758165cd Initial revision
carl
parents:
diff changeset
1041
96a9758165cd Initial revision
carl
parents:
diff changeset
1042 // Process command line options
96a9758165cd Initial revision
carl
parents:
diff changeset
1043 while ((c = getopt(argc, argv, args)) != -1) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1044 switch (c) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1045 case 'p':
96a9758165cd Initial revision
carl
parents:
diff changeset
1046 if (optarg == NULL || *optarg == '\0') {
96a9758165cd Initial revision
carl
parents:
diff changeset
1047 fprintf(stderr, "Illegal conn: %s\n", optarg);
96a9758165cd Initial revision
carl
parents:
diff changeset
1048 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1049 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1050 if (smfi_setconn(optarg) == MI_FAILURE) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1051 fprintf(stderr, "smfi_setconn failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1052 exit(EX_SOFTWARE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1053 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1054
96a9758165cd Initial revision
carl
parents:
diff changeset
1055 if (strncasecmp(optarg, "unix:", 5) == 0) unlink(optarg + 5);
96a9758165cd Initial revision
carl
parents:
diff changeset
1056 else if (strncasecmp(optarg, "local:", 6) == 0) unlink(optarg + 6);
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1057 setconn = true;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1058 break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1059
96a9758165cd Initial revision
carl
parents:
diff changeset
1060 case 't':
96a9758165cd Initial revision
carl
parents:
diff changeset
1061 if (optarg == NULL || *optarg == '\0') {
96a9758165cd Initial revision
carl
parents:
diff changeset
1062 fprintf(stderr, "Illegal timeout: %s\n", optarg);
96a9758165cd Initial revision
carl
parents:
diff changeset
1063 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1064 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1065 if (smfi_settimeout(atoi(optarg)) == MI_FAILURE) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1066 fprintf(stderr, "smfi_settimeout failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1067 exit(EX_SOFTWARE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1068 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1069 break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1070
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1071 case 'c':
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1072 check = true;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1073 break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1074
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1075 case 'd':
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1076 debug_syslog = true;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1077 break;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1078
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1079 case 'h':
96a9758165cd Initial revision
carl
parents:
diff changeset
1080 default:
96a9758165cd Initial revision
carl
parents:
diff changeset
1081 usage(argv[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
1082 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1083 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1084 }
5
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1085
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1086 if (check) {
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1087 CONFIG &dc = *new_conf();
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1088 dumpit(dc);
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1089 return 0;
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1090 }
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1091
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1092 if (!setconn) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1093 fprintf(stderr, "%s: Missing required -p argument\n", argv[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
1094 usage(argv[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
1095 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1096 }
5
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1097
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1098 if (smfi_register(smfilter) == MI_FAILURE) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1099 fprintf(stderr, "smfi_register failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1100 exit(EX_UNAVAILABLE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1101 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1102
96a9758165cd Initial revision
carl
parents:
diff changeset
1103 // switch to background mode
96a9758165cd Initial revision
carl
parents:
diff changeset
1104 if (daemon(1,0) < 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1105 fprintf(stderr, "daemon() call failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1106 exit(EX_UNAVAILABLE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1107 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1108
96a9758165cd Initial revision
carl
parents:
diff changeset
1109 // initialize the thread sync objects
96a9758165cd Initial revision
carl
parents:
diff changeset
1110 pthread_mutex_init(&config_mutex, 0);
96a9758165cd Initial revision
carl
parents:
diff changeset
1111 pthread_mutex_init(&syslog_mutex, 0);
96a9758165cd Initial revision
carl
parents:
diff changeset
1112 pthread_mutex_init(&resolve_mutex, 0);
96a9758165cd Initial revision
carl
parents:
diff changeset
1113
96a9758165cd Initial revision
carl
parents:
diff changeset
1114 // load the initial config
96a9758165cd Initial revision
carl
parents:
diff changeset
1115 config = new_conf();
96a9758165cd Initial revision
carl
parents:
diff changeset
1116
96a9758165cd Initial revision
carl
parents:
diff changeset
1117 // only create threads after the fork() in daemon
96a9758165cd Initial revision
carl
parents:
diff changeset
1118 pthread_t tid;
96a9758165cd Initial revision
carl
parents:
diff changeset
1119 if (pthread_create(&tid, 0, config_loader, 0))
96a9758165cd Initial revision
carl
parents:
diff changeset
1120 my_syslog("failed to create config loader thread");
96a9758165cd Initial revision
carl
parents:
diff changeset
1121 if (pthread_detach(tid))
96a9758165cd Initial revision
carl
parents:
diff changeset
1122 my_syslog("failed to detach config loader thread");
96a9758165cd Initial revision
carl
parents:
diff changeset
1123
96a9758165cd Initial revision
carl
parents:
diff changeset
1124 // write the pid
96a9758165cd Initial revision
carl
parents:
diff changeset
1125 const char *pidpath = "/var/run/dnsbl.pid";
96a9758165cd Initial revision
carl
parents:
diff changeset
1126 unlink(pidpath);
96a9758165cd Initial revision
carl
parents:
diff changeset
1127 FILE *f = fopen(pidpath, "w");
96a9758165cd Initial revision
carl
parents:
diff changeset
1128 if (f) {
22
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1129 #ifdef linux
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1130 // from a comment in the DCC source code:
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1131 // Linux threads are broken. Signals given the
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1132 // original process are delivered to only the
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1133 // thread that happens to have that PID. The
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1134 // sendmail libmilter thread that needs to hear
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1135 // SIGINT and other signals does not, and that breaks
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1136 // scripts that need to stop milters.
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1137 // However, signaling the process group works.
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1138 fprintf(f, "-%d\n", (u_int)getpgrp());
22
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1139 #else
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1140 fprintf(f, "%d\n", (u_int)getpid());
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1141 #endif
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1142 fclose(f);
96a9758165cd Initial revision
carl
parents:
diff changeset
1143 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1144
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1145 time_t starting = time(NULL);
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1146 int rc = smfi_main();
22
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1147 if ((rc != MI_SUCCESS) && (time(NULL) > starting+5*60)) {
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1148 my_syslog("trying to restart after smfi_main()");
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1149 loader_run = false; // eventually the config loader thread will terminate
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1150 execvp(argv[0], argv);
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1151 }
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1152 exit((rc == MI_SUCCESS) ? 0 : EX_UNAVAILABLE);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1153 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1154