annotate src/dnsbl.cpp @ 55:44babba1a9b9

updates for 3.6, better documentation on removing content filtering, missing some files in cvs
author carl
date Wed, 08 Sep 2004 14:16:49 -0700
parents c2371bb6cf84
children 419e00901570
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
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
26 3) Add option to only allow one recipient if the return path is empty.
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
27
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
28 4) Check if the envelope from domain name primary MX points 127.0.0.0/8
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
29
0
96a9758165cd Initial revision
carl
parents:
diff changeset
30 */
96a9758165cd Initial revision
carl
parents:
diff changeset
31
96a9758165cd Initial revision
carl
parents:
diff changeset
32
96a9758165cd Initial revision
carl
parents:
diff changeset
33 // from sendmail sample
96a9758165cd Initial revision
carl
parents:
diff changeset
34 #include <sys/types.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
35 #include <sys/stat.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
36 #include <errno.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
37 #include <sysexits.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
38 #include <unistd.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
39
96a9758165cd Initial revision
carl
parents:
diff changeset
40 // needed for socket io
96a9758165cd Initial revision
carl
parents:
diff changeset
41 #include <sys/ioctl.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
42 #include <net/if.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
43 #include <arpa/inet.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
44 #include <netinet/in.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
45 #include <netinet/tcp.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
46 #include <netdb.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
47 #include <sys/socket.h>
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
48 #include <sys/un.h>
0
96a9758165cd Initial revision
carl
parents:
diff changeset
49
96a9758165cd Initial revision
carl
parents:
diff changeset
50 // needed for thread
96a9758165cd Initial revision
carl
parents:
diff changeset
51 #include <pthread.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
52
96a9758165cd Initial revision
carl
parents:
diff changeset
53 // needed for std c++ collections
96a9758165cd Initial revision
carl
parents:
diff changeset
54 #include <set>
96a9758165cd Initial revision
carl
parents:
diff changeset
55 #include <map>
96a9758165cd Initial revision
carl
parents:
diff changeset
56 #include <list>
96a9758165cd Initial revision
carl
parents:
diff changeset
57
96a9758165cd Initial revision
carl
parents:
diff changeset
58 // for the dns resolver
96a9758165cd Initial revision
carl
parents:
diff changeset
59 #include <netinet/in.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
60 #include <arpa/nameser.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
61 #include <resolv.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
62
96a9758165cd Initial revision
carl
parents:
diff changeset
63 // misc stuff needed here
96a9758165cd Initial revision
carl
parents:
diff changeset
64 #include <ctype.h>
96a9758165cd Initial revision
carl
parents:
diff changeset
65 #include <fstream>
96a9758165cd Initial revision
carl
parents:
diff changeset
66 #include <syslog.h>
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
67 #include <pwd.h>
0
96a9758165cd Initial revision
carl
parents:
diff changeset
68
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
69 static char* dnsbl_version="$Id$";
0
96a9758165cd Initial revision
carl
parents:
diff changeset
70
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
71 #define DEFAULT "default"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
72 #define WHITE "white"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
73 #define BLACK "black"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
74 #define OK "ok"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
75 #define MANY "many"
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
76
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
77 enum status {oksofar, // not rejected yet
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
78 white, // whitelisted by envelope from
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
79 black, // blacklisted by envelope from or to
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
80 reject, // rejected by a dns list
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
81 reject_tag, // too many bad html tags
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
82 reject_host}; // too many hosts/urls in body
1
bd0b1a153f67 no message
carl
parents: 0
diff changeset
83
0
96a9758165cd Initial revision
carl
parents:
diff changeset
84 using namespace std;
96a9758165cd Initial revision
carl
parents:
diff changeset
85
96a9758165cd Initial revision
carl
parents:
diff changeset
86 extern "C" {
96a9758165cd Initial revision
carl
parents:
diff changeset
87 #include "libmilter/mfapi.h"
96a9758165cd Initial revision
carl
parents:
diff changeset
88 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr);
96a9758165cd Initial revision
carl
parents:
diff changeset
89 sfsistat mlfi_envfrom(SMFICTX *ctx, char **argv);
96a9758165cd Initial revision
carl
parents:
diff changeset
90 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **argv);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
91 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
92 sfsistat mlfi_eom(SMFICTX *ctx);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
93 sfsistat mlfi_abort(SMFICTX *ctx);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
94 sfsistat mlfi_close(SMFICTX *ctx);
96a9758165cd Initial revision
carl
parents:
diff changeset
95 }
96a9758165cd Initial revision
carl
parents:
diff changeset
96
96a9758165cd Initial revision
carl
parents:
diff changeset
97 struct ltstr {
96a9758165cd Initial revision
carl
parents:
diff changeset
98 bool operator()(char* s1, char* s2) const {
96a9758165cd Initial revision
carl
parents:
diff changeset
99 return strcmp(s1, s2) < 0;
96a9758165cd Initial revision
carl
parents:
diff changeset
100 }
96a9758165cd Initial revision
carl
parents:
diff changeset
101 };
96a9758165cd Initial revision
carl
parents:
diff changeset
102
96a9758165cd Initial revision
carl
parents:
diff changeset
103 struct DNSBL {
96a9758165cd Initial revision
carl
parents:
diff changeset
104 char *suffix; // blacklist suffix like blackholes.five-ten-sg.com
96a9758165cd Initial revision
carl
parents:
diff changeset
105 char *message; // error message with one or two %s operators for the ip address replacement
96a9758165cd Initial revision
carl
parents:
diff changeset
106 DNSBL(char *s, char *m);
96a9758165cd Initial revision
carl
parents:
diff changeset
107 };
96a9758165cd Initial revision
carl
parents:
diff changeset
108 DNSBL::DNSBL(char *s, char *m) {
96a9758165cd Initial revision
carl
parents:
diff changeset
109 suffix = s;
96a9758165cd Initial revision
carl
parents:
diff changeset
110 message = m;
96a9758165cd Initial revision
carl
parents:
diff changeset
111 }
96a9758165cd Initial revision
carl
parents:
diff changeset
112
96a9758165cd Initial revision
carl
parents:
diff changeset
113 typedef DNSBL * DNSBLP;
96a9758165cd Initial revision
carl
parents:
diff changeset
114 typedef list<DNSBLP> DNSBLL;
96a9758165cd Initial revision
carl
parents:
diff changeset
115 typedef DNSBLL * DNSBLLP;
96a9758165cd Initial revision
carl
parents:
diff changeset
116 typedef map<char *, char *, ltstr> string_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
117 typedef map<char *, string_map *, ltstr> from_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
118 typedef map<char *, DNSBLP, ltstr> dnsblp_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
119 typedef map<char *, DNSBLLP, ltstr> dnsbllp_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
120 typedef set<char *, ltstr> string_set;
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
121 typedef set<int> int_set;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
122 typedef list<char *> string_list;
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
123 typedef map<char *, int, ltstr> ns_mapper;
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
124
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
125 struct ns_map {
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
126 // all the strings are owned by the keys/values in the ns_host string map
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
127 string_map ns_host; // nameserver name -> host name that uses this name server
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
128 ns_mapper ns_ip; // nameserver name -> ip address of the name server
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
129 };
0
96a9758165cd Initial revision
carl
parents:
diff changeset
130
96a9758165cd Initial revision
carl
parents:
diff changeset
131 struct CONFIG {
96a9758165cd Initial revision
carl
parents:
diff changeset
132 // the only mutable stuff once it has been loaded from the config file
96a9758165cd Initial revision
carl
parents:
diff changeset
133 int reference_count; // protected by the global config_mutex
96a9758165cd Initial revision
carl
parents:
diff changeset
134 // all the rest is constant after loading from the config file
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
135 int generation;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
136 time_t load_time;
96a9758165cd Initial revision
carl
parents:
diff changeset
137 string_list config_files;
96a9758165cd Initial revision
carl
parents:
diff changeset
138 dnsblp_map dnsbls;
96a9758165cd Initial revision
carl
parents:
diff changeset
139 dnsbllp_map dnsblls;
96a9758165cd Initial revision
carl
parents:
diff changeset
140 from_map env_from;
96a9758165cd Initial revision
carl
parents:
diff changeset
141 string_map env_to_dnsbll; // map recipient to a named dnsbll
96a9758165cd Initial revision
carl
parents:
diff changeset
142 string_map env_to_chkfrom; // map recipient to a named from map
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
143 char * content_suffix; // for sbl url body filtering
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
144 char * content_message; // ""
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
145 char * host_limit_message; // error message for excessive host names
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
146 int host_limit; // limit on host names
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
147 bool host_random; // pick a random selection of host names rather than error for excessive hosts
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
148 char * tag_limit_message; // error message for excessive bad html tags
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
149 int tag_limit; // limit on bad html tags
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
150 string_set html_tags; // set of valid html tags
28
33e1e3910506 add configurable list of tlds
carl
parents: 27
diff changeset
151 string_set tlds; // set of valid tld components
0
96a9758165cd Initial revision
carl
parents:
diff changeset
152 CONFIG();
96a9758165cd Initial revision
carl
parents:
diff changeset
153 ~CONFIG();
96a9758165cd Initial revision
carl
parents:
diff changeset
154 };
96a9758165cd Initial revision
carl
parents:
diff changeset
155 CONFIG::CONFIG() {
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
156 reference_count = 0;
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
157 generation = 0;
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
158 load_time = 0;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
159 content_suffix = NULL;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
160 content_message = NULL;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
161 host_limit_message = NULL;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
162 host_limit = 0;
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
163 host_random = false;
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
164 tag_limit_message = NULL;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
165 tag_limit = 0;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
166 }
96a9758165cd Initial revision
carl
parents:
diff changeset
167 CONFIG::~CONFIG() {
96a9758165cd Initial revision
carl
parents:
diff changeset
168 for (dnsblp_map::iterator i=dnsbls.begin(); i!=dnsbls.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
169 DNSBLP d = (*i).second;
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
170 // delete the underlying DNSBL objects.
0
96a9758165cd Initial revision
carl
parents:
diff changeset
171 delete d;
96a9758165cd Initial revision
carl
parents:
diff changeset
172 }
96a9758165cd Initial revision
carl
parents:
diff changeset
173 for (dnsbllp_map::iterator i=dnsblls.begin(); i!=dnsblls.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
174 DNSBLLP d = (*i).second;
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
175 // *d is a list of pointers to DNSBL objects, but
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
176 // the underlying objects have already been deleted above.
0
96a9758165cd Initial revision
carl
parents:
diff changeset
177 delete d;
96a9758165cd Initial revision
carl
parents:
diff changeset
178 }
96a9758165cd Initial revision
carl
parents:
diff changeset
179 for (from_map::iterator i=env_from.begin(); i!=env_from.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
180 string_map *d = (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
181 delete d;
96a9758165cd Initial revision
carl
parents:
diff changeset
182 }
96a9758165cd Initial revision
carl
parents:
diff changeset
183 }
96a9758165cd Initial revision
carl
parents:
diff changeset
184
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
185 static bool debug_syslog = false;
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
186 static bool loader_run = true; // used to stop the config loader thread
0
96a9758165cd Initial revision
carl
parents:
diff changeset
187 static string_set all_strings; // owns all the strings, only modified by the config loader thread
96a9758165cd Initial revision
carl
parents:
diff changeset
188 static CONFIG * config = NULL; // protected by the config_mutex
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
189 static int generation = 0; // protected by the config_mutex
0
96a9758165cd Initial revision
carl
parents:
diff changeset
190
96a9758165cd Initial revision
carl
parents:
diff changeset
191 static pthread_mutex_t config_mutex;
96a9758165cd Initial revision
carl
parents:
diff changeset
192 static pthread_mutex_t syslog_mutex;
96a9758165cd Initial revision
carl
parents:
diff changeset
193 static pthread_mutex_t resolve_mutex;
96a9758165cd Initial revision
carl
parents:
diff changeset
194
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
195 struct mlfiPriv;
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
196
0
96a9758165cd Initial revision
carl
parents:
diff changeset
197
96a9758165cd Initial revision
carl
parents:
diff changeset
198 ////////////////////////////////////////////////
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
199 // helper to discard the strings and objects held by an ns_map
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
200 //
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
201 static void discard(ns_map &s);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
202 static void discard(ns_map &s) {
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
203 for (string_map::iterator i=s.ns_host.begin(); i!=s.ns_host.end(); i++) {
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
204 char *x = (*i).first;
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
205 char *y = (*i).second;
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
206 free(x);
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
207 free(y);
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
208 }
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
209 s.ns_ip.clear();
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
210 s.ns_host.clear();
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
211 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
212
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
213 ////////////////////////////////////////////////
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
214 // helper to register a string in an ns_map
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
215 //
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
216 static void register_string(ns_map &s, char *name, char *refer);
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
217 static void register_string(ns_map &s, char *name, char *refer) {
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
218 string_map::iterator i = s.ns_host.find(name);
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
219 if (i != s.ns_host.end()) return;
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
220 char *x = strdup(name);
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
221 char *y = strdup(refer);
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
222 s.ns_ip[x] = 0;
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
223 s.ns_host[x] = y;
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
224
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
225 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
226
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
227 ////////////////////////////////////////////////
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
228 // helper to discard the strings held by a string_set
0
96a9758165cd Initial revision
carl
parents:
diff changeset
229 //
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
230 static void discard(string_set &s);
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
231 static void discard(string_set &s) {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
232 for (string_set::iterator i=s.begin(); i!=s.end(); i++) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
233 free(*i);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
234 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
235 s.clear();
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
236 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
237
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
238 ////////////////////////////////////////////////
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
239 // helper to register a string in a string set
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
240 //
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
241 static char* register_string(string_set &s, char *name);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
242 static char* register_string(string_set &s, char *name) {
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
243 string_set::iterator i = s.find(name);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
244 if (i != s.end()) return *i;
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
245 char *x = strdup(name);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
246 s.insert(x);
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
247 return x;
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
248 }
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
249
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
250 ////////////////////////////////////////////////
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
251 // syslog a message
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
252 //
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
253 static void my_syslog(mlfiPriv *priv, char *text);
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
254
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
255
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
256 // include the content scanner
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
257 #include "scanner.cpp"
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
258
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
259
0
96a9758165cd Initial revision
carl
parents:
diff changeset
260 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
261 // mail filter private data, held for us by sendmail
96a9758165cd Initial revision
carl
parents:
diff changeset
262 //
96a9758165cd Initial revision
carl
parents:
diff changeset
263 struct mlfiPriv
96a9758165cd Initial revision
carl
parents:
diff changeset
264 {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
265 // connection specific data
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
266 CONFIG *pc; // global context with our maps
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
267 int ip; // ip4 address of the smtp client
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
268 map<DNSBLP, status> checked; // status from those lists
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
269 // message specific data
0
96a9758165cd Initial revision
carl
parents:
diff changeset
270 char *mailaddr; // envelope from value
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
271 char *queueid; // sendmail queue id
0
96a9758165cd Initial revision
carl
parents:
diff changeset
272 bool authenticated; // client authenticated? if so, suppress all dnsbl checks
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
273 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
274 bool only_whites; // every recipient is whitelisted?
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
275 string_set non_whites; // remember the non-whitelisted recipients so we can remove them if need be
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
276 recorder *memory; // memory for the content scanner
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
277 url_scanner *scanner; // object to handle body scanning
0
96a9758165cd Initial revision
carl
parents:
diff changeset
278 mlfiPriv();
96a9758165cd Initial revision
carl
parents:
diff changeset
279 ~mlfiPriv();
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
280 void reset(bool final = false); // for a new message
0
96a9758165cd Initial revision
carl
parents:
diff changeset
281 };
96a9758165cd Initial revision
carl
parents:
diff changeset
282 mlfiPriv::mlfiPriv() {
96a9758165cd Initial revision
carl
parents:
diff changeset
283 pthread_mutex_lock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
284 pc = config;
96a9758165cd Initial revision
carl
parents:
diff changeset
285 pc->reference_count++;
96a9758165cd Initial revision
carl
parents:
diff changeset
286 pthread_mutex_unlock(&config_mutex);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
287 ip = 0;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
288 mailaddr = NULL;
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
289 queueid = NULL;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
290 authenticated = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
291 have_whites = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
292 only_whites = true;
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
293 memory = new recorder(this, &pc->html_tags, &pc->tlds);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
294 scanner = new url_scanner(memory);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
295 }
96a9758165cd Initial revision
carl
parents:
diff changeset
296 mlfiPriv::~mlfiPriv() {
96a9758165cd Initial revision
carl
parents:
diff changeset
297 pthread_mutex_lock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
298 pc->reference_count--;
96a9758165cd Initial revision
carl
parents:
diff changeset
299 pthread_mutex_unlock(&config_mutex);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
300 reset(true);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
301 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
302 void mlfiPriv::reset(bool final) {
0
96a9758165cd Initial revision
carl
parents:
diff changeset
303 if (mailaddr) free(mailaddr);
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
304 if (queueid) free(queueid);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
305 discard(non_whites);
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
306 delete memory;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
307 delete scanner;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
308 if (!final) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
309 mailaddr = NULL;
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
310 queueid = NULL;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
311 authenticated = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
312 have_whites = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
313 only_whites = true;
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
314 memory = new recorder(this, &pc->html_tags, &pc->tlds);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
315 scanner = new url_scanner(memory);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
316 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
317 }
96a9758165cd Initial revision
carl
parents:
diff changeset
318
96a9758165cd Initial revision
carl
parents:
diff changeset
319 #define MLFIPRIV ((struct mlfiPriv *) smfi_getpriv(ctx))
96a9758165cd Initial revision
carl
parents:
diff changeset
320
96a9758165cd Initial revision
carl
parents:
diff changeset
321
96a9758165cd Initial revision
carl
parents:
diff changeset
322 ////////////////////////////////////////////////
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
323 // syslog a message
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
324 //
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
325 static void my_syslog(mlfiPriv *priv, char *text) {
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
326 char buf[1000];
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
327 if (priv) {
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
328 snprintf(buf, sizeof(buf), "%s: %s", priv->queueid, text);
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
329 text = buf;
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
330 }
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
331 pthread_mutex_lock(&syslog_mutex);
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
332 openlog("dnsbl", LOG_PID, LOG_MAIL);
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
333 syslog(LOG_NOTICE, "%s", text);
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
334 closelog();
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
335 pthread_mutex_unlock(&syslog_mutex);
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
336 }
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
337
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
338 static void my_syslog(char *text);
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
339 static void my_syslog(char *text) {
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
340 my_syslog(NULL, text);
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
341 }
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
342
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
343 ////////////////////////////////////////////////
0
96a9758165cd Initial revision
carl
parents:
diff changeset
344 // register a global string
96a9758165cd Initial revision
carl
parents:
diff changeset
345 //
96a9758165cd Initial revision
carl
parents:
diff changeset
346 static char* register_string(char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
347 static char* register_string(char *name) {
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
348 return register_string(all_strings, name);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
349 }
96a9758165cd Initial revision
carl
parents:
diff changeset
350
96a9758165cd Initial revision
carl
parents:
diff changeset
351
96a9758165cd Initial revision
carl
parents:
diff changeset
352 static char* next_token(char *delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
353 static char* next_token(char *delim) {
96a9758165cd Initial revision
carl
parents:
diff changeset
354 char *name = strtok(NULL, delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
355 if (!name) return name;
96a9758165cd Initial revision
carl
parents:
diff changeset
356 return register_string(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
357 }
96a9758165cd Initial revision
carl
parents:
diff changeset
358
96a9758165cd Initial revision
carl
parents:
diff changeset
359
96a9758165cd Initial revision
carl
parents:
diff changeset
360 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
361 // lookup an email address in the env_from or env_to maps
96a9758165cd Initial revision
carl
parents:
diff changeset
362 //
96a9758165cd Initial revision
carl
parents:
diff changeset
363 static char* lookup1(char *email, string_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
364 static char* lookup1(char *email, string_map map) {
96a9758165cd Initial revision
carl
parents:
diff changeset
365 string_map::iterator i = map.find(email);
96a9758165cd Initial revision
carl
parents:
diff changeset
366 if (i != map.end()) return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
367 char *x = strchr(email, '@');
96a9758165cd Initial revision
carl
parents:
diff changeset
368 if (!x) return DEFAULT;
96a9758165cd Initial revision
carl
parents:
diff changeset
369 x++;
96a9758165cd Initial revision
carl
parents:
diff changeset
370 i = map.find(x);
96a9758165cd Initial revision
carl
parents:
diff changeset
371 if (i != map.end()) return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
372 return DEFAULT;
96a9758165cd Initial revision
carl
parents:
diff changeset
373 }
96a9758165cd Initial revision
carl
parents:
diff changeset
374
96a9758165cd Initial revision
carl
parents:
diff changeset
375
96a9758165cd Initial revision
carl
parents:
diff changeset
376 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
377 // lookup an email address in the env_from or env_to maps
96a9758165cd Initial revision
carl
parents:
diff changeset
378 // this email address is passed in from sendmail, and will
96a9758165cd Initial revision
carl
parents:
diff changeset
379 // always be enclosed in <>. It may have mixed case, just
96a9758165cd Initial revision
carl
parents:
diff changeset
380 // as the mail client sent it.
96a9758165cd Initial revision
carl
parents:
diff changeset
381 //
96a9758165cd Initial revision
carl
parents:
diff changeset
382 static char* lookup(char* email, string_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
383 static char* lookup(char* email, string_map map) {
96a9758165cd Initial revision
carl
parents:
diff changeset
384 int n = strlen(email)-2;
96a9758165cd Initial revision
carl
parents:
diff changeset
385 if (n < 1) return DEFAULT; // malformed
96a9758165cd Initial revision
carl
parents:
diff changeset
386 char *key = strdup(email+1);
96a9758165cd Initial revision
carl
parents:
diff changeset
387 key[n] = '\0';
96a9758165cd Initial revision
carl
parents:
diff changeset
388 for (int i=0; i<n; i++) key[i] = tolower(key[i]);
96a9758165cd Initial revision
carl
parents:
diff changeset
389 char *rc = lookup1(key, map);
96a9758165cd Initial revision
carl
parents:
diff changeset
390 free(key);
96a9758165cd Initial revision
carl
parents:
diff changeset
391 return rc;
96a9758165cd Initial revision
carl
parents:
diff changeset
392 }
96a9758165cd Initial revision
carl
parents:
diff changeset
393
96a9758165cd Initial revision
carl
parents:
diff changeset
394
96a9758165cd Initial revision
carl
parents:
diff changeset
395 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
396 // find the dnsbl with a specific name
96a9758165cd Initial revision
carl
parents:
diff changeset
397 //
96a9758165cd Initial revision
carl
parents:
diff changeset
398 static DNSBLP find_dnsbl(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
399 static DNSBLP find_dnsbl(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
400 dnsblp_map::iterator i = dc.dnsbls.find(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
401 if (i == dc.dnsbls.end()) return NULL;
96a9758165cd Initial revision
carl
parents:
diff changeset
402 return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
403 }
96a9758165cd Initial revision
carl
parents:
diff changeset
404
96a9758165cd Initial revision
carl
parents:
diff changeset
405
96a9758165cd Initial revision
carl
parents:
diff changeset
406 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
407 // find the dnsbll with a specific name
96a9758165cd Initial revision
carl
parents:
diff changeset
408 //
96a9758165cd Initial revision
carl
parents:
diff changeset
409 static DNSBLLP find_dnsbll(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
410 static DNSBLLP find_dnsbll(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
411 dnsbllp_map::iterator i = dc.dnsblls.find(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
412 if (i == dc.dnsblls.end()) return NULL;
96a9758165cd Initial revision
carl
parents:
diff changeset
413 return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
414 }
96a9758165cd Initial revision
carl
parents:
diff changeset
415
96a9758165cd Initial revision
carl
parents:
diff changeset
416
96a9758165cd Initial revision
carl
parents:
diff changeset
417 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
418 // find the envfrom map with a specific name
96a9758165cd Initial revision
carl
parents:
diff changeset
419 //
96a9758165cd Initial revision
carl
parents:
diff changeset
420 static string_map* find_from_map(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
421 static string_map* find_from_map(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
422 from_map::iterator i = dc.env_from.find(name);
96a9758165cd Initial revision
carl
parents:
diff changeset
423 if (i == dc.env_from.end()) return NULL;
96a9758165cd Initial revision
carl
parents:
diff changeset
424 return (*i).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
425 }
96a9758165cd Initial revision
carl
parents:
diff changeset
426
96a9758165cd Initial revision
carl
parents:
diff changeset
427
96a9758165cd Initial revision
carl
parents:
diff changeset
428 static string_map& really_find_from_map(CONFIG &dc, char *name);
96a9758165cd Initial revision
carl
parents:
diff changeset
429 static string_map& really_find_from_map(CONFIG &dc, char *name) {
96a9758165cd Initial revision
carl
parents:
diff changeset
430 string_map *sm = find_from_map(dc, name);
96a9758165cd Initial revision
carl
parents:
diff changeset
431 if (!sm) {
96a9758165cd Initial revision
carl
parents:
diff changeset
432 sm = new string_map;
96a9758165cd Initial revision
carl
parents:
diff changeset
433 dc.env_from[name] = sm;
96a9758165cd Initial revision
carl
parents:
diff changeset
434 }
96a9758165cd Initial revision
carl
parents:
diff changeset
435 return *sm;
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 ////////////////////////////////////////////////
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
440 //
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
441 // 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
442 // very hard, just using the default resolver retry settings.
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
443 // If we cannot get an answer, we just accept the mail. The
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
444 // caller must ensure thread safety.
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
445 //
0
96a9758165cd Initial revision
carl
parents:
diff changeset
446 //
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
447 static int dns_interface(char *question, bool maybe_ip, ns_map *nameservers);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
448 static int dns_interface(char *question, bool maybe_ip, ns_map *nameservers) {
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
449 #ifdef NS_PACKETSZ
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
450 u_char answer[NS_PACKETSZ];
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
451 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
452 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
453 // parse the answer
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
454 ns_msg handle;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
455 ns_rr rr;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
456 if (ns_initparse(answer, length, &handle) == 0) {
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
457 // look for ns names
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
458 if (nameservers) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
459 ns_map &ns = *nameservers;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
460 int rrnum = 0;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
461 while (ns_parserr(&handle, ns_s_ns, rrnum++, &rr) == 0) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
462 if (ns_rr_type(rr) == ns_t_ns) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
463 char nam[NS_MAXDNAME+1];
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
464 char *n = nam;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
465 const u_char *p = ns_rr_rdata(rr);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
466 while (((n-nam) < NS_MAXDNAME) && ((p-answer) < length) && *p) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
467 size_t s = *(p++);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
468 if (s > 191) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
469 // compression pointer
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
470 s = (s-192)*256 + *(p++);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
471 if (s >= length) break; // pointer outside bounds of answer
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
472 p = answer + s;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
473 s = *(p++);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
474 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
475 if (s > 0) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
476 if ((n-nam) >= (NS_MAXDNAME-s)) break; // destination would overflow name buffer
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
477 if ((p-answer) >= (length-s)) break; // source outside bounds of answer
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
478 memcpy(n, p, s);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
479 n += s;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
480 p += s;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
481 *(n++) = '.';
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
482 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
483 }
36
95607fbef608 no message
carl
parents: 35
diff changeset
484 if (n-nam) n--; // remove trailing .
95607fbef608 no message
carl
parents: 35
diff changeset
485 *n = '\0'; // null terminate it
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
486 register_string(ns, nam, question); // ns host to lookup later
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
487 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
488 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
489 rrnum = 0;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
490 while (ns_parserr(&handle, ns_s_ar, rrnum++, &rr) == 0) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
491 if (ns_rr_type(rr) == ns_t_a) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
492 char* nam = (char*)ns_rr_name(rr);
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
493 ns_mapper::iterator i = ns.ns_ip.find(nam);
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
494 if (i != ns.ns_ip.end()) {
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
495 // we want this ip address
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
496 int address;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
497 memcpy(&address, ns_rr_rdata(rr), sizeof(address));
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
498 ns.ns_ip[nam] = address;
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
499 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
500 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
501 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
502 }
23
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
503 int rrnum = 0;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
504 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
505 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
506 int address;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
507 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
508 return address;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
509 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
510 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
511 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
512 }
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
513 if (maybe_ip) {
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
514 // 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
515 in_addr ip;
06de5ab6a232 add url decoding stage, allow http:/ single / in yahoo redirector, allow ip address hostnames
carl
parents: 22
diff changeset
516 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
517 return ip.s_addr;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
518 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
519 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
520 return 0;
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
521 #else
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
522 struct hostent *host = gethostbyname(question);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
523 if (!host) return 0;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
524 if (host->h_addrtype != AF_INET) return 0;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
525 int address;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
526 memcpy(&address, host->h_addr, sizeof(address));
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
527 return address;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
528 #endif
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
529 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
530
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
531 static int protected_dns_interface(char *question, bool maybe_ip, ns_map *nameservers);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
532 static int protected_dns_interface(char *question, bool maybe_ip, ns_map *nameservers) {
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
533 int ans;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
534 pthread_mutex_lock(&resolve_mutex);
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
535 ans = dns_interface(question, maybe_ip, nameservers);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
536 pthread_mutex_unlock(&resolve_mutex);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
537 return ans;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
538
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
539 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
540
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
541 ////////////////////////////////////////////////
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
542 // check a single dnsbl
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
543 //
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
544 static status check_single(int ip, char *suffix);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
545 static status check_single(int ip, char *suffix) {
0
96a9758165cd Initial revision
carl
parents:
diff changeset
546 // make a dns question
96a9758165cd Initial revision
carl
parents:
diff changeset
547 const u_char *src = (const u_char *)&ip;
96a9758165cd Initial revision
carl
parents:
diff changeset
548 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
549 #ifdef NS_MAXDNAME
0
96a9758165cd Initial revision
carl
parents:
diff changeset
550 char question[NS_MAXDNAME];
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
551 #else
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
552 char question[1000];
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
553 #endif
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
554 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
555 // ask the question, if we get an A record it implies a blacklisted ip address
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
556 return (protected_dns_interface(question, false, NULL)) ? reject : oksofar;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
557 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
558
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
559
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
560 ////////////////////////////////////////////////
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
561 // check a single dnsbl
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
562 //
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
563 static status check_single(int ip, DNSBL &bl);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
564 static status check_single(int ip, DNSBL &bl) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
565 return check_single(ip, bl.suffix);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
566 }
96a9758165cd Initial revision
carl
parents:
diff changeset
567
96a9758165cd Initial revision
carl
parents:
diff changeset
568
96a9758165cd Initial revision
carl
parents:
diff changeset
569 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
570 // check the dnsbls specified for this recipient
96a9758165cd Initial revision
carl
parents:
diff changeset
571 //
96a9758165cd Initial revision
carl
parents:
diff changeset
572 static status check_dnsbl(mlfiPriv &priv, DNSBLLP dnsbllp, DNSBLP &rejectlist);
96a9758165cd Initial revision
carl
parents:
diff changeset
573 static status check_dnsbl(mlfiPriv &priv, DNSBLLP dnsbllp, DNSBLP &rejectlist) {
96a9758165cd Initial revision
carl
parents:
diff changeset
574 if (priv.authenticated) return oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
575 if (!dnsbllp) return oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
576 DNSBLL &dnsbll = *dnsbllp;
96a9758165cd Initial revision
carl
parents:
diff changeset
577 for (DNSBLL::iterator i=dnsbll.begin(); i!=dnsbll.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
578 DNSBLP dp = *i; // non null by construction
96a9758165cd Initial revision
carl
parents:
diff changeset
579 status st;
96a9758165cd Initial revision
carl
parents:
diff changeset
580 map<DNSBLP, status>::iterator f = priv.checked.find(dp);
96a9758165cd Initial revision
carl
parents:
diff changeset
581 if (f == priv.checked.end()) {
96a9758165cd Initial revision
carl
parents:
diff changeset
582 // have not checked this list yet
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
583 st = check_single(priv.ip, *dp);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
584 rejectlist = dp;
96a9758165cd Initial revision
carl
parents:
diff changeset
585 priv.checked[dp] = st;
96a9758165cd Initial revision
carl
parents:
diff changeset
586 }
96a9758165cd Initial revision
carl
parents:
diff changeset
587 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
588 st = (*f).second;
96a9758165cd Initial revision
carl
parents:
diff changeset
589 rejectlist = (*f).first;
96a9758165cd Initial revision
carl
parents:
diff changeset
590 }
96a9758165cd Initial revision
carl
parents:
diff changeset
591 if (st == reject) return st;
96a9758165cd Initial revision
carl
parents:
diff changeset
592 }
96a9758165cd Initial revision
carl
parents:
diff changeset
593 return oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
594 }
96a9758165cd Initial revision
carl
parents:
diff changeset
595
96a9758165cd Initial revision
carl
parents:
diff changeset
596
96a9758165cd Initial revision
carl
parents:
diff changeset
597 ////////////////////////////////////////////////
55
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
598 // check the hosts from the body against the content dnsbl
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
599 //
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
600 static status check_hosts(mlfiPriv &priv, char *&host, int &ip);
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
601 static status check_hosts(mlfiPriv &priv, char *&host, int &ip) {
55
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
602 CONFIG &dc = *priv.pc;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
603 int count = 0;
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
604 ns_map nameservers;
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
605 bool ran = priv.pc->host_random;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
606 int lim = priv.pc->host_limit; // we should not look at more than this many hosts
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
607 int cnt = priv.memory->hosts.size(); // number of hosts we could look at
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
608 int_set ips; // remove duplicate ip addresses
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
609 for (string_set::iterator i=priv.memory->hosts.begin(); i!=priv.memory->hosts.end(); i++) {
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
610 host = *i; // a reference into priv.memory->hosts, which will live until this smtp transaction is closed
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
611 if ((cnt > lim) && (lim > 0) && ran) {
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
612 // try to only look at lim/cnt fraction of the available cnt host names
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
613 int r = rand() % cnt;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
614 if (r >= lim) {
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
615 char buf[1000];
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
616 snprintf(buf, sizeof(buf), "host %s skipped", host);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
617 my_syslog(&priv, buf);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
618 continue;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
619 }
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
620 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
621 count++;
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
622 if ((count > lim) && (lim > 0) && (!ran)) {
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
623 discard(nameservers);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
624 return reject_host;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
625 }
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
626 ip = protected_dns_interface(host, true, &nameservers);
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
627 if (debug_syslog) {
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
628 char buf[1000];
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
629 if (ip) {
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
630 char adr[sizeof "255.255.255.255"];
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
631 adr[0] = '\0';
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
632 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
633 snprintf(buf, sizeof(buf), "host %s found at %s", host, adr);
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
634 }
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
635 else {
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
636 snprintf(buf, sizeof(buf), "host %s not found", host);
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
637 }
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
638 my_syslog(&priv, buf);
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
639 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
640 if (ip) {
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
641 int_set::iterator i = ips.find(ip);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
642 if (i == ips.end()) {
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
643 ips.insert(ip);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
644 status st = check_single(ip, dc.content_suffix);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
645 if (st == reject) {
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
646 discard(nameservers);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
647 return st;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
648 }
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
649 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
650 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
651 }
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
652 lim *= 4; // allow average of 3 ns per host name
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
653 for (ns_mapper::iterator i=nameservers.ns_ip.begin(); i!=nameservers.ns_ip.end(); i++) {
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
654 count++;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
655 if ((count > lim) && (lim > 0)) {
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
656 if (ran) continue; // don't complain
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
657 discard(nameservers);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
658 return reject_host;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
659 }
36
95607fbef608 no message
carl
parents: 35
diff changeset
660 host = (*i).first; // a transient reference that needs to be replaced before we return it
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
661 ip = (*i).second;
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
662 if (!ip) ip = protected_dns_interface(host, false, NULL);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
663 if (debug_syslog) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
664 char buf[200];
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
665 if (ip) {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
666 char adr[sizeof "255.255.255.255"];
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
667 adr[0] = '\0';
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
668 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
669 snprintf(buf, sizeof(buf), "ns %s found at %s", host, adr);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
670 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
671 else {
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
672 snprintf(buf, sizeof(buf), "ns %s not found", host);
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
673 }
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
674 my_syslog(&priv, buf);
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
675 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
676 if (ip) {
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
677 int_set::iterator i = ips.find(ip);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
678 if (i == ips.end()) {
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
679 ips.insert(ip);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
680 status st = check_single(ip, dc.content_suffix);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
681 if (st == reject) {
53
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
682 string_map::iterator j = nameservers.ns_host.find(host);
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
683 if (j != nameservers.ns_host.end()) {
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
684 char *refer = (*j).second;
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
685 char buf[1000];
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
686 snprintf(buf, sizeof(buf), "%s with nameserver %s", refer, host);
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
687 host = register_string(priv.memory->hosts, buf); // put a copy into priv.memory->hosts, and return that reference
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
688 }
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
689 else {
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
690 host = register_string(priv.memory->hosts, host); // put a copy into priv.memory->hosts, and return that reference
c2371bb6cf84 3.5 - better error message when rejecting based on ns records on the sbl
carl
parents: 48
diff changeset
691 }
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
692 discard(nameservers);
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
693 return st;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
694 }
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
695 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
696 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
697 }
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
698 discard(nameservers);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
699 host = NULL;
26
fdae7ab30cfc allow normal and terminator versions of tags
carl
parents: 24
diff changeset
700 int bin = priv.memory->binary_tags;
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
701 int bad = priv.memory->bad_html_tags;
34
fc7f8f3ea90f look for NS records on the SBL also
carl
parents: 29
diff changeset
702 lim = priv.pc->tag_limit;
41
d95af8129dfa updates for 3.2, changing file layout, add queueid to messages
carl
parents: 40
diff changeset
703 if (3*bin > bad) return oksofar; // probably .zip or .tar.gz with random content
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
704 if ((bad > lim) && (lim > 0)) return reject_tag;
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
705 return oksofar;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
706 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
707
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
708
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
709 ////////////////////////////////////////////////
0
96a9758165cd Initial revision
carl
parents:
diff changeset
710 // start of sendmail milter interfaces
96a9758165cd Initial revision
carl
parents:
diff changeset
711 //
96a9758165cd Initial revision
carl
parents:
diff changeset
712 sfsistat mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
96a9758165cd Initial revision
carl
parents:
diff changeset
713 {
96a9758165cd Initial revision
carl
parents:
diff changeset
714 // allocate some private memory
96a9758165cd Initial revision
carl
parents:
diff changeset
715 mlfiPriv *priv = new mlfiPriv;
96a9758165cd Initial revision
carl
parents:
diff changeset
716 if (hostaddr->sa_family == AF_INET) {
96a9758165cd Initial revision
carl
parents:
diff changeset
717 priv->ip = ((struct sockaddr_in *)hostaddr)->sin_addr.s_addr;
96a9758165cd Initial revision
carl
parents:
diff changeset
718 }
96a9758165cd Initial revision
carl
parents:
diff changeset
719
96a9758165cd Initial revision
carl
parents:
diff changeset
720 // save the private data
96a9758165cd Initial revision
carl
parents:
diff changeset
721 smfi_setpriv(ctx, (void*)priv);
96a9758165cd Initial revision
carl
parents:
diff changeset
722
96a9758165cd Initial revision
carl
parents:
diff changeset
723 // continue processing
96a9758165cd Initial revision
carl
parents:
diff changeset
724 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
725 }
96a9758165cd Initial revision
carl
parents:
diff changeset
726
96a9758165cd Initial revision
carl
parents:
diff changeset
727 sfsistat mlfi_envfrom(SMFICTX *ctx, char **from)
96a9758165cd Initial revision
carl
parents:
diff changeset
728 {
96a9758165cd Initial revision
carl
parents:
diff changeset
729 mlfiPriv &priv = *MLFIPRIV;
96a9758165cd Initial revision
carl
parents:
diff changeset
730 priv.mailaddr = strdup(from[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
731 priv.authenticated = (smfi_getsymval(ctx, "{auth_authen}") != NULL);
96a9758165cd Initial revision
carl
parents:
diff changeset
732 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
733 }
96a9758165cd Initial revision
carl
parents:
diff changeset
734
96a9758165cd Initial revision
carl
parents:
diff changeset
735 sfsistat mlfi_envrcpt(SMFICTX *ctx, char **rcpt)
96a9758165cd Initial revision
carl
parents:
diff changeset
736 {
96a9758165cd Initial revision
carl
parents:
diff changeset
737 DNSBLP rejectlist = NULL; // list that caused the reject
96a9758165cd Initial revision
carl
parents:
diff changeset
738 status st = oksofar;
96a9758165cd Initial revision
carl
parents:
diff changeset
739 mlfiPriv &priv = *MLFIPRIV;
96a9758165cd Initial revision
carl
parents:
diff changeset
740 CONFIG &dc = *priv.pc;
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
741 if (!priv.queueid) priv.queueid = strdup(smfi_getsymval(ctx, "i"));
0
96a9758165cd Initial revision
carl
parents:
diff changeset
742 char *rcptaddr = rcpt[0];
96a9758165cd Initial revision
carl
parents:
diff changeset
743 char *dnsname = lookup(rcptaddr, dc.env_to_dnsbll);
96a9758165cd Initial revision
carl
parents:
diff changeset
744 char *fromname = lookup(rcptaddr, dc.env_to_chkfrom);
96a9758165cd Initial revision
carl
parents:
diff changeset
745 if ((strcmp(dnsname, BLACK) == 0) ||
96a9758165cd Initial revision
carl
parents:
diff changeset
746 (strcmp(fromname, BLACK) == 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
747 st = black; // two options to blacklist this recipient
96a9758165cd Initial revision
carl
parents:
diff changeset
748 }
96a9758165cd Initial revision
carl
parents:
diff changeset
749 else if (strcmp(fromname, WHITE) == 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
750 st = white;
96a9758165cd Initial revision
carl
parents:
diff changeset
751 }
96a9758165cd Initial revision
carl
parents:
diff changeset
752 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
753 // check an env_from map
96a9758165cd Initial revision
carl
parents:
diff changeset
754 string_map *sm = find_from_map(dc, fromname);
96a9758165cd Initial revision
carl
parents:
diff changeset
755 if (sm != NULL) {
96a9758165cd Initial revision
carl
parents:
diff changeset
756 fromname = lookup(priv.mailaddr, *sm); // returns default if name not in map
96a9758165cd Initial revision
carl
parents:
diff changeset
757 if (strcmp(fromname, BLACK) == 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
758 st = black; // blacklist this envelope from value
96a9758165cd Initial revision
carl
parents:
diff changeset
759 }
96a9758165cd Initial revision
carl
parents:
diff changeset
760 if (strcmp(fromname, WHITE) == 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
761 st = white; // blacklist this envelope from value
96a9758165cd Initial revision
carl
parents:
diff changeset
762 }
96a9758165cd Initial revision
carl
parents:
diff changeset
763 }
96a9758165cd Initial revision
carl
parents:
diff changeset
764 }
96a9758165cd Initial revision
carl
parents:
diff changeset
765 if ((st == oksofar) && (strcmp(dnsname, WHITE) != 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
766 // check dns lists
96a9758165cd Initial revision
carl
parents:
diff changeset
767 st = check_dnsbl(priv, find_dnsbll(dc, dnsname), rejectlist);
96a9758165cd Initial revision
carl
parents:
diff changeset
768 }
96a9758165cd Initial revision
carl
parents:
diff changeset
769
96a9758165cd Initial revision
carl
parents:
diff changeset
770 if (st == reject) {
96a9758165cd Initial revision
carl
parents:
diff changeset
771 // reject the recipient based on some dnsbl
96a9758165cd Initial revision
carl
parents:
diff changeset
772 char adr[sizeof "255.255.255.255"];
96a9758165cd Initial revision
carl
parents:
diff changeset
773 adr[0] = '\0';
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
774 inet_ntop(AF_INET, (const u_char *)&priv.ip, adr, sizeof(adr));
0
96a9758165cd Initial revision
carl
parents:
diff changeset
775 char buf[2000];
96a9758165cd Initial revision
carl
parents:
diff changeset
776 snprintf(buf, sizeof(buf), rejectlist->message, adr, adr);
96a9758165cd Initial revision
carl
parents:
diff changeset
777 smfi_setreply(ctx, "550", "5.7.1", buf);
96a9758165cd Initial revision
carl
parents:
diff changeset
778 return SMFIS_REJECT;
96a9758165cd Initial revision
carl
parents:
diff changeset
779 }
96a9758165cd Initial revision
carl
parents:
diff changeset
780 else if (st == black) {
96a9758165cd Initial revision
carl
parents:
diff changeset
781 // reject the recipient based on blacklisting either from or to
96a9758165cd Initial revision
carl
parents:
diff changeset
782 smfi_setreply(ctx, "550", "5.7.1", "no such user");
96a9758165cd Initial revision
carl
parents:
diff changeset
783 return SMFIS_REJECT;
96a9758165cd Initial revision
carl
parents:
diff changeset
784 }
96a9758165cd Initial revision
carl
parents:
diff changeset
785 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
786 // accept the recipient
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
787 if (st == oksofar) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
788 // but remember the non-whites
12
6ac6d6b822ce fix memory leak with duplicate url host names,
carl
parents: 11
diff changeset
789 register_string(priv.non_whites, rcptaddr);
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
790 priv.only_whites = false;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
791 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
792 if (st == white) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
793 priv.have_whites = true;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
794 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
795 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
796 }
96a9758165cd Initial revision
carl
parents:
diff changeset
797 }
96a9758165cd Initial revision
carl
parents:
diff changeset
798
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
799 sfsistat mlfi_body(SMFICTX *ctx, u_char *data, size_t len)
0
96a9758165cd Initial revision
carl
parents:
diff changeset
800 {
96a9758165cd Initial revision
carl
parents:
diff changeset
801 mlfiPriv &priv = *MLFIPRIV;
55
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
802 if (priv.authenticated) return SMFIS_CONTINUE;
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
803 if (priv.only_whites) return SMFIS_CONTINUE;
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
804 if (!priv.pc->content_suffix) return SMFIS_CONTINUE;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
805 priv.scanner->scan(data, len);
11
2c206836b4cc integration work on url scanner
carl
parents: 9
diff changeset
806 return SMFIS_CONTINUE;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
807 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
808
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
809 sfsistat mlfi_eom(SMFICTX *ctx)
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
810 {
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
811 sfsistat rc;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
812 mlfiPriv &priv = *MLFIPRIV;
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
813 char *host = NULL;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
814 int ip;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
815 status st;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
816 // process end of message
55
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
817 if (priv.authenticated ||
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
818 priv.only_whites ||
44babba1a9b9 updates for 3.6, better documentation on removing content filtering, missing some files in cvs
carl
parents: 53
diff changeset
819 (!priv.pc->content_suffix) ||
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
820 ((st=check_hosts(priv, host, ip)) == oksofar)) rc = SMFIS_CONTINUE;
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
821 else {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
822 if (!priv.have_whites) {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
823 // can reject the entire message
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
824 char buf[2000];
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
825 if (st == reject_tag) {
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
826 // rejected due to excessive bad html tags
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
827 snprintf(buf, sizeof(buf), priv.pc->tag_limit_message);
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
828 }
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
829 else if (st == reject_host) {
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
830 // rejected due to excessive unique host/urls
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
831 snprintf(buf, sizeof(buf), priv.pc->host_limit_message);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
832 }
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
833 else {
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
834 char adr[sizeof "255.255.255.255"];
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
835 adr[0] = '\0';
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
836 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
837 snprintf(buf, sizeof(buf), priv.pc->content_message, host, adr);
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
838 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
839 smfi_setreply(ctx, "550", "5.7.1", buf);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
840 rc = SMFIS_REJECT;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
841 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
842 else {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
843 // need to accept it but remove the recipients that don't want it
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
844 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
845 char *rcpt = *i;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
846 smfi_delrcpt(ctx, rcpt);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
847 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
848 rc = SMFIS_CONTINUE;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
849 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
850 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
851 // reset for a new message on the same connection
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
852 mlfi_abort(ctx);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
853 return rc;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
854 }
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
855
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
856 sfsistat mlfi_abort(SMFICTX *ctx)
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
857 {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
858 mlfiPriv &priv = *MLFIPRIV;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
859 priv.reset();
0
96a9758165cd Initial revision
carl
parents:
diff changeset
860 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
861 }
96a9758165cd Initial revision
carl
parents:
diff changeset
862
96a9758165cd Initial revision
carl
parents:
diff changeset
863 sfsistat mlfi_close(SMFICTX *ctx)
96a9758165cd Initial revision
carl
parents:
diff changeset
864 {
96a9758165cd Initial revision
carl
parents:
diff changeset
865 mlfiPriv *priv = MLFIPRIV;
96a9758165cd Initial revision
carl
parents:
diff changeset
866 if (!priv) return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
867 delete priv;
96a9758165cd Initial revision
carl
parents:
diff changeset
868 smfi_setpriv(ctx, NULL);
96a9758165cd Initial revision
carl
parents:
diff changeset
869 return SMFIS_CONTINUE;
96a9758165cd Initial revision
carl
parents:
diff changeset
870 }
96a9758165cd Initial revision
carl
parents:
diff changeset
871
96a9758165cd Initial revision
carl
parents:
diff changeset
872 struct smfiDesc smfilter =
96a9758165cd Initial revision
carl
parents:
diff changeset
873 {
96a9758165cd Initial revision
carl
parents:
diff changeset
874 "DNSBL", // filter name
96a9758165cd Initial revision
carl
parents:
diff changeset
875 SMFI_VERSION, // version code -- do not change
96a9758165cd Initial revision
carl
parents:
diff changeset
876 SMFIF_DELRCPT, // flags
96a9758165cd Initial revision
carl
parents:
diff changeset
877 mlfi_connect, // connection info filter
96a9758165cd Initial revision
carl
parents:
diff changeset
878 NULL, // SMTP HELO command filter
96a9758165cd Initial revision
carl
parents:
diff changeset
879 mlfi_envfrom, // envelope sender filter
96a9758165cd Initial revision
carl
parents:
diff changeset
880 mlfi_envrcpt, // envelope recipient filter
96a9758165cd Initial revision
carl
parents:
diff changeset
881 NULL, // header filter
96a9758165cd Initial revision
carl
parents:
diff changeset
882 NULL, // end of header
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
883 mlfi_body, // body block filter
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
884 mlfi_eom, // end of message
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
885 mlfi_abort, // message aborted
0
96a9758165cd Initial revision
carl
parents:
diff changeset
886 mlfi_close, // connection cleanup
96a9758165cd Initial revision
carl
parents:
diff changeset
887 };
96a9758165cd Initial revision
carl
parents:
diff changeset
888
96a9758165cd Initial revision
carl
parents:
diff changeset
889
96a9758165cd Initial revision
carl
parents:
diff changeset
890 static void dumpit(char *name, string_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
891 static void dumpit(char *name, string_map map) {
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
892 fprintf(stdout, "\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
893 for (string_map::iterator i=map.begin(); i!=map.end(); i++) {
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
894 fprintf(stdout, "%s %s->%s\n", name, (*i).first, (*i).second);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
895 }
96a9758165cd Initial revision
carl
parents:
diff changeset
896 }
96a9758165cd Initial revision
carl
parents:
diff changeset
897
96a9758165cd Initial revision
carl
parents:
diff changeset
898
96a9758165cd Initial revision
carl
parents:
diff changeset
899 static void dumpit(from_map map);
96a9758165cd Initial revision
carl
parents:
diff changeset
900 static void dumpit(from_map map) {
96a9758165cd Initial revision
carl
parents:
diff changeset
901 for (from_map::iterator i=map.begin(); i!=map.end(); i++) {
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
902 char buf[2000];
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
903 snprintf(buf, sizeof(buf), "envelope from map for %s", (*i).first);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
904 string_map *sm = (*i).second;
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
905 dumpit(buf, *sm);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
906 }
96a9758165cd Initial revision
carl
parents:
diff changeset
907 }
96a9758165cd Initial revision
carl
parents:
diff changeset
908
96a9758165cd Initial revision
carl
parents:
diff changeset
909
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
910 static void dumpit(CONFIG &dc);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
911 static void dumpit(CONFIG &dc) {
5
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
912 dumpit(dc.env_from);
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
913 dumpit("envelope to (dnsbl list)", dc.env_to_dnsbll);
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
914 dumpit("envelope to (from map)", dc.env_to_chkfrom);
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
915 fprintf(stdout, "\ndnsbls\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
916 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
917 fprintf(stdout, "%s %s %s\n", (*i).first, (*i).second->suffix, (*i).second->message);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
918 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
919 fprintf(stdout, "\ndnsbl_lists\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
920 for (dnsbllp_map::iterator i=dc.dnsblls.begin(); i!=dc.dnsblls.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
921 char *name = (*i).first;
96a9758165cd Initial revision
carl
parents:
diff changeset
922 DNSBLL &dl = *((*i).second);
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
923 fprintf(stdout, "%s", name);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
924 for (DNSBLL::iterator j=dl.begin(); j!=dl.end(); j++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
925 DNSBL &d = **j;
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
926 fprintf(stdout, " %s", d.suffix);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
927 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
928 fprintf(stdout, "\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
929 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
930 if (dc.content_suffix) {
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
931 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
932 }
46
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
933 if (dc.host_limit && !dc.host_random) {
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
934 fprintf(stdout, "\ncontent filtering for host names hard limit %d %s\n", dc.host_limit, dc.host_limit_message);
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
935 }
46
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
936 if (dc.host_limit && dc.host_random) {
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
937 fprintf(stdout, "\ncontent filtering for host names soft limit %d\n", dc.host_limit);
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
938 }
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
939 if (dc.tag_limit) {
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
940 fprintf(stdout, "\ncontent filtering for excessive html tags enabled with limit %d %s\n", dc.tag_limit, dc.tag_limit_message);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
941 }
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
942 fprintf(stdout, "\nfiles\n");
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
943 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
944 char *f = *i;
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
945 fprintf(stdout, "config includes %s\n", f);
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
946 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
947 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
948
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
949
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
950 ////////////////////////////////////////////////
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
951 // check for redundant or recursive include files
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
952 //
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
953 static bool ok_to_include(CONFIG &dc, char *fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
954 static bool ok_to_include(CONFIG &dc, char *fn) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
955 if (!fn) return false;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
956 bool ok = true;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
957 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
958 char *f = *i;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
959 if (strcmp(f, fn) == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
960 my_syslog("redundant or recursive include file detected");
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
961 ok = false;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
962 break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
963 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
964 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
965 return ok;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
966 }
96a9758165cd Initial revision
carl
parents:
diff changeset
967
96a9758165cd Initial revision
carl
parents:
diff changeset
968
96a9758165cd Initial revision
carl
parents:
diff changeset
969 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
970 // load a single config file
96a9758165cd Initial revision
carl
parents:
diff changeset
971 //
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
972 static void load_conf_dcc(CONFIG &dc, char *name, char *fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
973 static void load_conf_dcc(CONFIG &dc, char *name, char *fn) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
974 ifstream is(fn);
40
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
975 if (is.fail()) {
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
976 char buf[1000];
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
977 snprintf(buf, sizeof(buf), "include file %s not found", fn);
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
978 my_syslog(buf);
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
979 return;
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
980 }
39
6e9d0b2d0720 fix handling of missing include files
carl
parents: 36
diff changeset
981 dc.config_files.push_back(fn);
6e9d0b2d0720 fix handling of missing include files
carl
parents: 36
diff changeset
982 const int LINE_SIZE = 2000;
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
983 char line[LINE_SIZE];
39
6e9d0b2d0720 fix handling of missing include files
carl
parents: 36
diff changeset
984 char *list = BLACK;
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
985 char *delim = " \t";
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
986 int curline = 0;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
987 while (!is.eof()) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
988 is.getline(line, LINE_SIZE);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
989 curline++;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
990 int n = strlen(line);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
991 if (!n) continue;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
992 for (int i=0; i<n; i++) line[i] = tolower(line[i]);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
993 if (line[0] == '#') continue;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
994 char *head = line;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
995 if (strspn(line, delim) == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
996 // have a leading ok/many tag to fetch
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
997 char *cmd = strtok(line, delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
998 if (strcmp(cmd, MANY) == 0) list = BLACK;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
999 else if (strcmp(cmd, OK) == 0) list = WHITE;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1000 head = cmd + strlen(cmd) + 1;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1001 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1002 char *cmd = strtok(head, delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1003 if (!cmd) continue;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1004 if (strcmp(cmd, "env_from") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1005 char *from = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1006 if (from) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1007 string_map &fm = really_find_from_map(dc, name);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1008 fm[from] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1009 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1010 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1011 else if (strcmp(cmd, "env_to") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1012 char *to = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1013 if (to) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1014 dc.env_to_dnsbll[to] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1015 dc.env_to_chkfrom[to] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1016 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1017 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1018 else if (strcmp(cmd, "substitute") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1019 char *tag = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1020 if (tag && (strcmp(tag, "mail_host") == 0)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1021 char *from = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1022 if (from) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1023 string_map &fm = really_find_from_map(dc, name);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1024 fm[from] = list;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1025 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1026 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1027 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1028 else if (strcmp(cmd, "include") == 0) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1029 char *fn = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1030 if (ok_to_include(dc, fn)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1031 load_conf_dcc(dc, name, fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1032 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1033 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1034
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1035 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1036 is.close();
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1037 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1038
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1039
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1040 static void load_conf(CONFIG &dc, char *fn);
96a9758165cd Initial revision
carl
parents:
diff changeset
1041 static void load_conf(CONFIG &dc, char *fn) {
39
6e9d0b2d0720 fix handling of missing include files
carl
parents: 36
diff changeset
1042 ifstream is(fn);
40
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
1043 if (is.fail()) {
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
1044 char buf[1000];
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
1045 snprintf(buf, sizeof(buf), "include file %s not found", fn);
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
1046 my_syslog(buf);
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
1047 return;
dc3d8d1aa2d2 fix handling of missing include files
carl
parents: 39
diff changeset
1048 }
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1049 dc.config_files.push_back(fn);
96a9758165cd Initial revision
carl
parents:
diff changeset
1050 map<char*, int, ltstr> commands;
46
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1051 enum {dummy, tld, content, hostlimit, hostslimit, htmllimit, htmltag, dnsbl, dnsbll, envfrom, envto, include, includedcc};
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1052 commands["tld" ] = tld;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1053 commands["content" ] = content;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1054 commands["host_limit" ] = hostlimit;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1055 commands["host_soft_limit"] = hostslimit;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1056 commands["html_limit" ] = htmllimit;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1057 commands["html_tag" ] = htmltag;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1058 commands["dnsbl" ] = dnsbl;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1059 commands["dnsbl_list" ] = dnsbll;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1060 commands["env_from" ] = envfrom;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1061 commands["env_to" ] = envto;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1062 commands["include" ] = include;
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1063 commands["include_dcc" ] = includedcc;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1064 const int LINE_SIZE = 2000;
96a9758165cd Initial revision
carl
parents:
diff changeset
1065 char line[LINE_SIZE];
96a9758165cd Initial revision
carl
parents:
diff changeset
1066 char orig[LINE_SIZE];
96a9758165cd Initial revision
carl
parents:
diff changeset
1067 char *delim = " \t";
96a9758165cd Initial revision
carl
parents:
diff changeset
1068 int curline = 0;
96a9758165cd Initial revision
carl
parents:
diff changeset
1069 while (!is.eof()) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1070 is.getline(line, LINE_SIZE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1071 snprintf(orig, sizeof(orig), "%s", line);
96a9758165cd Initial revision
carl
parents:
diff changeset
1072 curline++;
96a9758165cd Initial revision
carl
parents:
diff changeset
1073 int n = strlen(line);
96a9758165cd Initial revision
carl
parents:
diff changeset
1074 for (int i=0; i<n; i++) line[i] = tolower(line[i]);
96a9758165cd Initial revision
carl
parents:
diff changeset
1075 char *cmd = strtok(line, delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1076 if (cmd && (cmd[0] != '#') && (cmd[0] != '\0')) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1077 // have a decent command
96a9758165cd Initial revision
carl
parents:
diff changeset
1078 bool processed = false;
96a9758165cd Initial revision
carl
parents:
diff changeset
1079 switch (commands[cmd]) {
28
33e1e3910506 add configurable list of tlds
carl
parents: 27
diff changeset
1080 case tld: {
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1081 char *tld = next_token(delim);
28
33e1e3910506 add configurable list of tlds
carl
parents: 27
diff changeset
1082 if (!tld) break; // no tld value
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1083 dc.tlds.insert(tld);
28
33e1e3910506 add configurable list of tlds
carl
parents: 27
diff changeset
1084 processed = true;
33e1e3910506 add configurable list of tlds
carl
parents: 27
diff changeset
1085 } break;
33e1e3910506 add configurable list of tlds
carl
parents: 27
diff changeset
1086
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1087 case content: {
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1088 char *suff = strtok(NULL, delim);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1089 if (!suff) break; // no dns suffix
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1090 char *msg = suff + strlen(suff);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1091 if ((msg - line) >= strlen(orig)) break; // line ended with the dns suffix
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1092 msg = strchr(msg+1, '\'');
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1093 if (!msg) break; // no reply message template
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1094 msg++; // move over the leading '
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1095 if ((msg - line) >= strlen(orig)) break; // line ended with the leading quote
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1096 char *last = strchr(msg, '\'');
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1097 if (!last) break; // no trailing quote
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1098 *last = '\0'; // make it a null terminator
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1099 dc.content_suffix = register_string(suff);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1100 dc.content_message = register_string(msg);
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1101 processed = true;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1102 } break;
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1103
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1104 case hostlimit: {
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1105 char *limit = strtok(NULL, delim);
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1106 if (!limit) break; // no integer limit
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1107 char *msg = limit + strlen(limit);
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1108 if ((msg - line) >= strlen(orig)) break; // line ended with the limit
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1109 msg = strchr(msg+1, '\'');
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1110 if (!msg) break; // no reply message template
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1111 msg++; // move over the leading '
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1112 if ((msg - line) >= strlen(orig)) break; // line ended with the leading quote
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1113 char *last = strchr(msg, '\'');
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1114 if (!last) break; // no trailing quote
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1115 *last = '\0'; // make it a null terminator
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1116 dc.host_limit = atoi(limit);
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1117 dc.host_limit_message = register_string(msg);
46
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1118 dc.host_random = false;
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1119 processed = true;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1120 } break;
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1121
46
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1122 case hostslimit: {
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1123 char *limit = next_token(delim);
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1124 if (!limit) break; // no integer limit
66c66a6ee65f changes for 3.2
carl
parents: 44
diff changeset
1125 dc.host_limit = atoi(limit);
44
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
1126 dc.host_random = true;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
1127 processed = true;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
1128 } break;
6b79046b18c2 changes for 3.2
carl
parents: 43
diff changeset
1129
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1130 case htmllimit: {
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1131 char *limit = strtok(NULL, delim);
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1132 if (!limit) break; // no integer limit
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1133 char *msg = limit + strlen(limit);
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1134 if ((msg - line) >= strlen(orig)) break; // line ended with the limit
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1135 msg = strchr(msg+1, '\'');
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1136 if (!msg) break; // no reply message template
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1137 msg++; // move over the leading '
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1138 if ((msg - line) >= strlen(orig)) break; // line ended with the leading quote
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1139 char *last = strchr(msg, '\'');
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1140 if (!last) break; // no trailing quote
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1141 *last = '\0'; // make it a null terminator
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1142 dc.tag_limit = atoi(limit);
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1143 dc.tag_limit_message = register_string(msg);
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1144 processed = true;
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1145 } break;
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1146
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1147 case htmltag: {
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1148 char *tag = next_token(delim);
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1149 if (!tag) break; // no html tag value
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1150 dc.html_tags.insert(tag); // base version
26
fdae7ab30cfc allow normal and terminator versions of tags
carl
parents: 24
diff changeset
1151 char buf[200];
fdae7ab30cfc allow normal and terminator versions of tags
carl
parents: 24
diff changeset
1152 snprintf(buf, sizeof(buf), "/%s", tag);
27
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1153 dc.html_tags.insert(register_string(buf)); // leading /
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1154 snprintf(buf, sizeof(buf), "%s/", tag);
43a4f6b3e668 add configurable host name limit and bad html tag limits.
carl
parents: 26
diff changeset
1155 dc.html_tags.insert(register_string(buf)); // trailing /
24
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1156 processed = true;
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1157 } break;
2e23b7184d2b start coding for bad html tag detection
carl
parents: 23
diff changeset
1158
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1159 case dnsbl: {
96a9758165cd Initial revision
carl
parents:
diff changeset
1160 // have a new dnsbl to use
96a9758165cd Initial revision
carl
parents:
diff changeset
1161 char *name = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1162 if (!name) break; // no name name
96a9758165cd Initial revision
carl
parents:
diff changeset
1163 if (find_dnsbl(dc, name)) break; // duplicate entry
96a9758165cd Initial revision
carl
parents:
diff changeset
1164 char *suff = strtok(NULL, delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1165 if (!suff) break; // no dns suffic
96a9758165cd Initial revision
carl
parents:
diff changeset
1166 char *msg = suff + strlen(suff);
96a9758165cd Initial revision
carl
parents:
diff changeset
1167 if ((msg - line) >= strlen(orig)) break; // line ended with the dns suffix
96a9758165cd Initial revision
carl
parents:
diff changeset
1168 msg = strchr(msg+1, '\'');
96a9758165cd Initial revision
carl
parents:
diff changeset
1169 if (!msg) break; // no reply message template
96a9758165cd Initial revision
carl
parents:
diff changeset
1170 msg++; // move over the leading '
96a9758165cd Initial revision
carl
parents:
diff changeset
1171 if ((msg - line) >= strlen(orig)) break; // line ended with the leading quote
96a9758165cd Initial revision
carl
parents:
diff changeset
1172 char *last = strchr(msg, '\'');
96a9758165cd Initial revision
carl
parents:
diff changeset
1173 if (!last) break; // no trailing quote
96a9758165cd Initial revision
carl
parents:
diff changeset
1174 *last = '\0'; // make it a null terminator
96a9758165cd Initial revision
carl
parents:
diff changeset
1175 dc.dnsbls[name] = new DNSBL(register_string(suff), register_string(msg));
96a9758165cd Initial revision
carl
parents:
diff changeset
1176 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
1177 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1178
96a9758165cd Initial revision
carl
parents:
diff changeset
1179 case dnsbll: {
96a9758165cd Initial revision
carl
parents:
diff changeset
1180 // define a new combination of dnsbls
96a9758165cd Initial revision
carl
parents:
diff changeset
1181 char *name = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1182 if (!name) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1183 if (find_dnsbll(dc, name)) break; // duplicate entry
96a9758165cd Initial revision
carl
parents:
diff changeset
1184 char *list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1185 if (!list || (*list == '\0') || (*list == '#')) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1186 DNSBLLP d = new DNSBLL;
96a9758165cd Initial revision
carl
parents:
diff changeset
1187 DNSBLP p = find_dnsbl(dc, list);
96a9758165cd Initial revision
carl
parents:
diff changeset
1188 if (p) d->push_back(p);
96a9758165cd Initial revision
carl
parents:
diff changeset
1189 while (true) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1190 list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1191 if (!list || (*list == '\0') || (*list == '#')) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1192 DNSBLP p = find_dnsbl(dc, list);
96a9758165cd Initial revision
carl
parents:
diff changeset
1193 if (p) d->push_back(p);
96a9758165cd Initial revision
carl
parents:
diff changeset
1194 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1195 dc.dnsblls[name] = d;
96a9758165cd Initial revision
carl
parents:
diff changeset
1196 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
1197 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1198
96a9758165cd Initial revision
carl
parents:
diff changeset
1199 case envfrom: {
96a9758165cd Initial revision
carl
parents:
diff changeset
1200 // add an entry into the named string_map
96a9758165cd Initial revision
carl
parents:
diff changeset
1201 char *name = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1202 if (!name) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1203 char *from = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1204 if (!from) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1205 char *list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1206 if (!list) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1207 if ((strcmp(list, WHITE) == 0) ||
96a9758165cd Initial revision
carl
parents:
diff changeset
1208 (strcmp(list, BLACK) == 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1209 string_map &fm = really_find_from_map(dc, name);
96a9758165cd Initial revision
carl
parents:
diff changeset
1210 fm[from] = list;
96a9758165cd Initial revision
carl
parents:
diff changeset
1211 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
1212 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1213 else {
96a9758165cd Initial revision
carl
parents:
diff changeset
1214 // list may be the name of a previously defined from_map
96a9758165cd Initial revision
carl
parents:
diff changeset
1215 string_map *m = find_from_map(dc, list);
96a9758165cd Initial revision
carl
parents:
diff changeset
1216 if (m && (strcmp(list,name) != 0)) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1217 string_map &pm = *m;
96a9758165cd Initial revision
carl
parents:
diff changeset
1218 string_map &fm = really_find_from_map(dc, name);
96a9758165cd Initial revision
carl
parents:
diff changeset
1219 fm.insert(pm.begin(), pm.end());
96a9758165cd Initial revision
carl
parents:
diff changeset
1220 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
1221 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1222 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1223 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1224
96a9758165cd Initial revision
carl
parents:
diff changeset
1225 case envto: {
96a9758165cd Initial revision
carl
parents:
diff changeset
1226 // define the dnsbl_list and env_from maps to use for this recipient
96a9758165cd Initial revision
carl
parents:
diff changeset
1227 char *to = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1228 if (!to) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1229 char *list = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1230 if (!list) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1231 char *from = next_token(delim);
96a9758165cd Initial revision
carl
parents:
diff changeset
1232 if (!from) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1233 dc.env_to_dnsbll[to] = list;
96a9758165cd Initial revision
carl
parents:
diff changeset
1234 dc.env_to_chkfrom[to] = from;
96a9758165cd Initial revision
carl
parents:
diff changeset
1235 processed = true;
96a9758165cd Initial revision
carl
parents:
diff changeset
1236 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1237
96a9758165cd Initial revision
carl
parents:
diff changeset
1238 case include: {
96a9758165cd Initial revision
carl
parents:
diff changeset
1239 char *fn = next_token(delim);
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1240 if (ok_to_include(dc, fn)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1241 load_conf(dc, fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1242 processed = true;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1243 }
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1244 } break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1245
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1246 case includedcc: {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1247 char *name = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1248 if (!name) break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1249 char *fn = next_token(delim);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1250 if (ok_to_include(dc, fn)) {
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1251 load_conf_dcc(dc, name, fn);
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1252 processed = true;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1253 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1254 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1255
96a9758165cd Initial revision
carl
parents:
diff changeset
1256 default: {
96a9758165cd Initial revision
carl
parents:
diff changeset
1257 } break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1258 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1259 if (!processed) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1260 pthread_mutex_lock(&syslog_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
1261 openlog("dnsbl", LOG_PID, LOG_MAIL);
96a9758165cd Initial revision
carl
parents:
diff changeset
1262 syslog(LOG_ERR, "ignoring file %s line %d : %s\n", fn, curline, orig);
96a9758165cd Initial revision
carl
parents:
diff changeset
1263 closelog();
96a9758165cd Initial revision
carl
parents:
diff changeset
1264 pthread_mutex_unlock(&syslog_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
1265 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1266 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1267 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1268 is.close();
96a9758165cd Initial revision
carl
parents:
diff changeset
1269 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1270
96a9758165cd Initial revision
carl
parents:
diff changeset
1271
96a9758165cd Initial revision
carl
parents:
diff changeset
1272 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
1273 // reload the config
96a9758165cd Initial revision
carl
parents:
diff changeset
1274 //
96a9758165cd Initial revision
carl
parents:
diff changeset
1275 static CONFIG* new_conf();
96a9758165cd Initial revision
carl
parents:
diff changeset
1276 static CONFIG* new_conf() {
96a9758165cd Initial revision
carl
parents:
diff changeset
1277 CONFIG *newc = new CONFIG;
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1278 pthread_mutex_lock(&config_mutex);
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1279 newc->generation = generation++;
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1280 pthread_mutex_unlock(&config_mutex);
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1281 char buf[200];
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1282 snprintf(buf, sizeof(buf), "loading configuration generation %d", newc->generation);
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1283 my_syslog(buf);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1284 load_conf(*newc, "dnsbl.conf");
96a9758165cd Initial revision
carl
parents:
diff changeset
1285 newc->load_time = time(NULL);
96a9758165cd Initial revision
carl
parents:
diff changeset
1286 return newc;
96a9758165cd Initial revision
carl
parents:
diff changeset
1287 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1288
96a9758165cd Initial revision
carl
parents:
diff changeset
1289
96a9758165cd Initial revision
carl
parents:
diff changeset
1290 ////////////////////////////////////////////////
96a9758165cd Initial revision
carl
parents:
diff changeset
1291 // thread to watch the old config files for changes
96a9758165cd Initial revision
carl
parents:
diff changeset
1292 // and reload when needed. we also cleanup old
96a9758165cd Initial revision
carl
parents:
diff changeset
1293 // configs whose reference count has gone to zero.
96a9758165cd Initial revision
carl
parents:
diff changeset
1294 //
96a9758165cd Initial revision
carl
parents:
diff changeset
1295 static void* config_loader(void *arg);
96a9758165cd Initial revision
carl
parents:
diff changeset
1296 static void* config_loader(void *arg) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1297 typedef set<CONFIG *> configp_set;
96a9758165cd Initial revision
carl
parents:
diff changeset
1298 configp_set old_configs;
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1299 while (loader_run) {
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1300 sleep(180); // look for modifications every 3 minutes
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1301 if (!loader_run) break;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1302 CONFIG &dc = *config;
96a9758165cd Initial revision
carl
parents:
diff changeset
1303 time_t then = dc.load_time;
96a9758165cd Initial revision
carl
parents:
diff changeset
1304 struct stat st;
96a9758165cd Initial revision
carl
parents:
diff changeset
1305 bool reload = false;
96a9758165cd Initial revision
carl
parents:
diff changeset
1306 for (string_list::iterator i=dc.config_files.begin(); i!=dc.config_files.end(); i++) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1307 char *fn = *i;
96a9758165cd Initial revision
carl
parents:
diff changeset
1308 if (stat(fn, &st)) reload = true; // file disappeared
96a9758165cd Initial revision
carl
parents:
diff changeset
1309 else if (st.st_mtime > then) reload = true; // file modified
96a9758165cd Initial revision
carl
parents:
diff changeset
1310 if (reload) break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1311 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1312 if (reload) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1313 CONFIG *newc = new_conf();
96a9758165cd Initial revision
carl
parents:
diff changeset
1314 // replace the global config pointer
96a9758165cd Initial revision
carl
parents:
diff changeset
1315 pthread_mutex_lock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
1316 CONFIG *old = config;
96a9758165cd Initial revision
carl
parents:
diff changeset
1317 config = newc;
96a9758165cd Initial revision
carl
parents:
diff changeset
1318 pthread_mutex_unlock(&config_mutex);
96a9758165cd Initial revision
carl
parents:
diff changeset
1319 if (old) old_configs.insert(old);
96a9758165cd Initial revision
carl
parents:
diff changeset
1320 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1321 // now look for old configs with zero ref counts
96a9758165cd Initial revision
carl
parents:
diff changeset
1322 for (configp_set::iterator i=old_configs.begin(); i!=old_configs.end(); ) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1323 CONFIG *old = *i;
96a9758165cd Initial revision
carl
parents:
diff changeset
1324 if (!old->reference_count) {
29
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1325 char buf[200];
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1326 snprintf(buf, sizeof(buf), "freeing memory for old configuration generation %d", old->generation);
4dfdf33f1db0 add syslog msg freeing memory, use bare tld names without leading period
carl
parents: 28
diff changeset
1327 my_syslog(buf);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1328 delete old; // destructor does all the work
96a9758165cd Initial revision
carl
parents:
diff changeset
1329 old_configs.erase(i++);
96a9758165cd Initial revision
carl
parents:
diff changeset
1330 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1331 else i++;
96a9758165cd Initial revision
carl
parents:
diff changeset
1332 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1333 }
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1334 return NULL;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1335 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1336
96a9758165cd Initial revision
carl
parents:
diff changeset
1337
96a9758165cd Initial revision
carl
parents:
diff changeset
1338 static void usage(char *prog);
96a9758165cd Initial revision
carl
parents:
diff changeset
1339 static void usage(char *prog)
96a9758165cd Initial revision
carl
parents:
diff changeset
1340 {
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1341 fprintf(stderr, "Usage: %s [-d] [-c] -p socket-addr [-t timeout]\n", prog);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1342 fprintf(stderr, "where socket-addr is for the connection to sendmail and should be one of\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1343 fprintf(stderr, " inet:port@local-ip-address\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1344 fprintf(stderr, " local:local-domain-socket-file-name\n");
9
8c65411cd7ab integration work on url scanner
carl
parents: 8
diff changeset
1345 fprintf(stderr, "-c will load and dump the config to stdout\n");
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1346 fprintf(stderr, "-d will add some syslog debug messages\n");
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1347 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1348
96a9758165cd Initial revision
carl
parents:
diff changeset
1349
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1350
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1351 static void setup_socket(char *sock);
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1352 static void setup_socket(char *sock) {
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1353 unlink(sock);
43
acbe44bbba22 seems to drop root privs ok now
carl
parents: 42
diff changeset
1354 // sockaddr_un addr;
acbe44bbba22 seems to drop root privs ok now
carl
parents: 42
diff changeset
1355 // memset(&addr, '\0', sizeof addr);
acbe44bbba22 seems to drop root privs ok now
carl
parents: 42
diff changeset
1356 // addr.sun_family = AF_UNIX;
acbe44bbba22 seems to drop root privs ok now
carl
parents: 42
diff changeset
1357 // strncpy(addr.sun_path, sock, sizeof(addr.sun_path)-1);
acbe44bbba22 seems to drop root privs ok now
carl
parents: 42
diff changeset
1358 // int s = socket(AF_UNIX, SOCK_STREAM, 0);
acbe44bbba22 seems to drop root privs ok now
carl
parents: 42
diff changeset
1359 // bind(s, (sockaddr*)&addr, sizeof(addr));
acbe44bbba22 seems to drop root privs ok now
carl
parents: 42
diff changeset
1360 // close(s);
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1361 }
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1362
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1363
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1364 int main(int argc, char**argv)
96a9758165cd Initial revision
carl
parents:
diff changeset
1365 {
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1366 bool check = false;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1367 bool setconn = false;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1368 int c;
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1369 const char *args = "p:t:hcd";
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1370 extern char *optarg;
96a9758165cd Initial revision
carl
parents:
diff changeset
1371
96a9758165cd Initial revision
carl
parents:
diff changeset
1372 // Process command line options
96a9758165cd Initial revision
carl
parents:
diff changeset
1373 while ((c = getopt(argc, argv, args)) != -1) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1374 switch (c) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1375 case 'p':
96a9758165cd Initial revision
carl
parents:
diff changeset
1376 if (optarg == NULL || *optarg == '\0') {
96a9758165cd Initial revision
carl
parents:
diff changeset
1377 fprintf(stderr, "Illegal conn: %s\n", optarg);
96a9758165cd Initial revision
carl
parents:
diff changeset
1378 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1379 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1380 if (smfi_setconn(optarg) == MI_FAILURE) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1381 fprintf(stderr, "smfi_setconn failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1382 exit(EX_SOFTWARE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1383 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1384
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1385 if (strncasecmp(optarg, "unix:", 5) == 0) setup_socket(optarg + 5);
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1386 else if (strncasecmp(optarg, "local:", 6) == 0) setup_socket(optarg + 6);
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1387 setconn = true;
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1388 break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1389
96a9758165cd Initial revision
carl
parents:
diff changeset
1390 case 't':
96a9758165cd Initial revision
carl
parents:
diff changeset
1391 if (optarg == NULL || *optarg == '\0') {
96a9758165cd Initial revision
carl
parents:
diff changeset
1392 fprintf(stderr, "Illegal timeout: %s\n", optarg);
96a9758165cd Initial revision
carl
parents:
diff changeset
1393 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1394 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1395 if (smfi_settimeout(atoi(optarg)) == MI_FAILURE) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1396 fprintf(stderr, "smfi_settimeout failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1397 exit(EX_SOFTWARE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1398 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1399 break;
96a9758165cd Initial revision
carl
parents:
diff changeset
1400
3
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1401 case 'c':
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1402 check = true;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1403 break;
7e1eb343a825 updates to use dcc conf files
carl
parents: 2
diff changeset
1404
16
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1405 case 'd':
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1406 debug_syslog = true;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1407 break;
2ae8d953f1d0 add scanning for bare hostnames
carl
parents: 14
diff changeset
1408
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1409 case 'h':
96a9758165cd Initial revision
carl
parents:
diff changeset
1410 default:
96a9758165cd Initial revision
carl
parents:
diff changeset
1411 usage(argv[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
1412 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1413 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1414 }
5
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1415
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1416 if (check) {
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1417 CONFIG &dc = *new_conf();
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1418 dumpit(dc);
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1419 return 0;
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1420 }
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1421
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1422 if (!setconn) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1423 fprintf(stderr, "%s: Missing required -p argument\n", argv[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
1424 usage(argv[0]);
96a9758165cd Initial revision
carl
parents:
diff changeset
1425 exit(EX_USAGE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1426 }
5
793ac9cc114d updates to use dcc conf files
carl
parents: 4
diff changeset
1427
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1428 if (smfi_register(smfilter) == MI_FAILURE) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1429 fprintf(stderr, "smfi_register failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1430 exit(EX_UNAVAILABLE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1431 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1432
96a9758165cd Initial revision
carl
parents:
diff changeset
1433 // switch to background mode
96a9758165cd Initial revision
carl
parents:
diff changeset
1434 if (daemon(1,0) < 0) {
96a9758165cd Initial revision
carl
parents:
diff changeset
1435 fprintf(stderr, "daemon() call failed\n");
96a9758165cd Initial revision
carl
parents:
diff changeset
1436 exit(EX_UNAVAILABLE);
96a9758165cd Initial revision
carl
parents:
diff changeset
1437 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1438
96a9758165cd Initial revision
carl
parents:
diff changeset
1439 // write the pid
96a9758165cd Initial revision
carl
parents:
diff changeset
1440 const char *pidpath = "/var/run/dnsbl.pid";
96a9758165cd Initial revision
carl
parents:
diff changeset
1441 unlink(pidpath);
96a9758165cd Initial revision
carl
parents:
diff changeset
1442 FILE *f = fopen(pidpath, "w");
96a9758165cd Initial revision
carl
parents:
diff changeset
1443 if (f) {
22
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1444 #ifdef linux
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1445 // from a comment in the DCC source code:
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1446 // Linux threads are broken. Signals given the
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1447 // original process are delivered to only the
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1448 // thread that happens to have that PID. The
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1449 // sendmail libmilter thread that needs to hear
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1450 // SIGINT and other signals does not, and that breaks
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1451 // scripts that need to stop milters.
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1452 // However, signaling the process group works.
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1453 fprintf(f, "-%d\n", (u_int)getpgrp());
22
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1454 #else
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1455 fprintf(f, "%d\n", (u_int)getpid());
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1456 #endif
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1457 fclose(f);
96a9758165cd Initial revision
carl
parents:
diff changeset
1458 }
96a9758165cd Initial revision
carl
parents:
diff changeset
1459
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1460 // drop root privs
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1461 struct passwd *pw = getpwnam("dnsbl");
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1462 if (pw) {
48
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1463 if (setgid(pw->pw_gid) == -1) {
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1464 my_syslog("failed to switch to group dnsbl");
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1465 }
42
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1466 if (setuid(pw->pw_uid) == -1) {
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1467 my_syslog("failed to switch to user dnsbl");
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1468 }
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1469 }
afcf403709ef updates for 3.2, try to drop root privileges
carl
parents: 41
diff changeset
1470
48
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1471 // initialize the thread sync objects
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1472 pthread_mutex_init(&config_mutex, 0);
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1473 pthread_mutex_init(&syslog_mutex, 0);
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1474 pthread_mutex_init(&resolve_mutex, 0);
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1475
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1476 // load the initial config
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1477 config = new_conf();
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1478
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1479 // only create threads after the fork() in daemon
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1480 pthread_t tid;
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1481 if (pthread_create(&tid, 0, config_loader, 0))
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1482 my_syslog("failed to create config loader thread");
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1483 if (pthread_detach(tid))
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1484 my_syslog("failed to detach config loader thread");
5ef10dc14457 properly drop root privs
carl
parents: 46
diff changeset
1485
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1486 time_t starting = time(NULL);
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1487 int rc = smfi_main();
22
c21b888cc175 fix restart code, add ifdef for linux pid issues
carl
parents: 18
diff changeset
1488 if ((rc != MI_SUCCESS) && (time(NULL) > starting+5*60)) {
18
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1489 my_syslog("trying to restart after smfi_main()");
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1490 loader_run = false; // eventually the config loader thread will terminate
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1491 execvp(argv[0], argv);
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1492 }
041ea016b684 add scanning for bare hostnames
carl
parents: 16
diff changeset
1493 exit((rc == MI_SUCCESS) ? 0 : EX_UNAVAILABLE);
0
96a9758165cd Initial revision
carl
parents:
diff changeset
1494 }
8
dbe18921f741 integration work on url scanner
carl
parents: 5
diff changeset
1495