annotate src/context.cpp @ 308:12c4555af055

update tld from mozilla
author Carl Byington <carl@five-ten-sg.com>
date Fri, 27 May 2016 15:37:03 -0700
parents 368572c57013
children 802e2b779ed1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1 /*
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
2
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
3 Copyright (c) 2013 Carl Byington - 510 Software Group, released under
152
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 149
diff changeset
4 the GPL version 3 or any later version at your choice available at
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 149
diff changeset
5 http://www.gnu.org/licenses/gpl-3.0.txt
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
6
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
7 */
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
8
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
9 #include "includes.h"
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
10
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
11 #include <arpa/inet.h>
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
12 #include <net/if.h>
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
13 #include <netdb.h>
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
14 #include <netinet/in.h>
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
15 #include <netinet/tcp.h>
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
16 #include <sys/ioctl.h>
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
17 #include <sys/socket.h>
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
18 #include <sys/stat.h>
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
19 #include <sys/un.h>
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
20 #include <unistd.h>
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
21 #include <climits>
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
22
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
23 const char *token_asterisk;
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
24 const char *token_autowhite;
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
25 const char *token_bang;
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
26 const char *token_black;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
27 const char *token_content;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
28 const char *token_context;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
29 const char *token_dccbulk;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
30 const char *token_dccfrom;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
31 const char *token_dccgrey;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
32 const char *token_dccto;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
33 const char *token_default;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
34 const char *token_dnsbl;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
35 const char *token_dnsbll;
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
36 const char *token_dnswl;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
37 const char *token_dnswll;
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
38 const char *token_envfrom;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
39 const char *token_envto;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
40 const char *token_filter;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
41 const char *token_generic;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
42 const char *token_host_limit;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
43 const char *token_html_limit;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
44 const char *token_html_tags;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
45 const char *token_ignore;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
46 const char *token_include;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
47 const char *token_inherit;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
48 const char *token_lbrace;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
49 const char *token_mailhost;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
50 const char *token_many;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
51 const char *token_no;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
52 const char *token_off;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
53 const char *token_ok;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
54 const char *token_ok2;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
55 const char *token_on;
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
56 const char *token_period;
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
57 const char *token_rate;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
58 const char *token_rbrace;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
59 const char *token_require;
268
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
60 const char *token_requirerdns;
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
61 const char *token_semi;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
62 const char *token_soft;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
63 const char *token_spamassassin;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
64 const char *token_substitute;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
65 const char *token_tld;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
66 const char *token_unknown;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
67 const char *token_uribl;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
68 const char *token_verify;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
69 const char *token_white;
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
70 const char *token_white_regex;
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
71 const char *token_yes;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
72
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
73 const char *token_myhostname;
96
1edd4e8d3a60 fix missing include, not all systems define HOST_NAME_MAX
carl
parents: 94
diff changeset
74 #ifndef HOST_NAME_MAX
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
75 #define HOST_NAME_MAX 255
96
1edd4e8d3a60 fix missing include, not all systems define HOST_NAME_MAX
carl
parents: 94
diff changeset
76 #endif
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
77 char myhostname[HOST_NAME_MAX+1];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
78
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
79 pthread_mutex_t verifier_mutex; // protect the verifier map
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
80 verify_map verifiers;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
81
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
82 pthread_mutex_t whitelister_mutex; // protect the whitelisters map
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
83 whitelister_map whitelisters;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
84
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
85 string_set all_strings; // owns all the strings, only modified by the config loader thread
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
86 const int maxlen = 1000; // used for snprintf buffers
178
d6531c702be3 embedded dcc filtering
carl
parents: 175
diff changeset
87 const int maxsmtp_age = 60;// smtp verify sockets older than this are ancient
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
88 const int maxauto_age = 600;// auto whitelister delay before flushing to file
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
89 extern int NULL_SOCKET;
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 119
diff changeset
90 const time_t ERROR_SMTP_SOCKET_TIME = 600; // number of seconds between attempts to open a socket to an smtp server
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
91
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
92
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
93 int SMTP::writer() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
94 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
95 log("writer() sees buffer with %s", buffer);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
96 log("writer() sees error %d", (int)error);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
97 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
98 int rs = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
99 if (!error) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
100 int len = strlen(buffer);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
101 while (rs < len) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
102 int ws = write(fd, buffer+rs, len-rs);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
103 if (ws > 0) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
104 rs += ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
105 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
106 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
107 // peer closed the socket!
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
108 rs = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
109 error = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
110 break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
111 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
112 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
113 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
114 return rs;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
115 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
116
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
117
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
118 int SMTP::reader() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
119 // read some bytes terminated by lf or end of buffer.
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
120 // we may have a multi line response or part thereof in the buffer.
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
121 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
122 log("reader() sees error %d", (int)error);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
123 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
124 if (error) return 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
125 int len = maxlen-1; // room for null terminator
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
126 while (pending < len) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
127 int ws = read(fd, buffer+pending, len-pending);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
128 if (ws > 0) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
129 pending += ws;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
130 if (buffer[pending-1] == '\n') break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
131 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
132 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
133 // peer closed the socket!
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
134 pending = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
135 error = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
136 break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
137 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
138 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
139 buffer[pending] = '\0';
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
140 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
141 log("reader() sees buffer with %s", buffer);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
142 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
143 return pending;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
144 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
145
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
146
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
147 int SMTP::read_line() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
148 char *lf = strchr(buffer, '\n');
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
149 if (!lf) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
150 reader(); // get a lf
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
151 lf = strchr(buffer, '\n');
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
152 if (!lf) lf = buffer + pending - 1;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
153 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
154 return (lf-buffer)+1; // number of bytes in this line
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
155 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
156
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
157
97
cc3b79349c9c fix int function not returning value
carl
parents: 96
diff changeset
158 void SMTP::flush_line(int r) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
159 if (pending > r) memmove(buffer, buffer+r, pending-r);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
160 pending -= r;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
161 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
162
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
163
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
164 int SMTP::read_response() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
165 pending = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
166 buffer[pending] = '\0';
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
167 while (true) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
168 int r = read_line();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
169 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
170 log("read_response() sees line with %s", buffer);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
171 log("read_response() sees line length %d", r);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
172 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
173 if (r == 0) return 0; // failed to read any bytes
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
174 if ((r > 4) && (buffer[3] == '-')) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
175 flush_line(r);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
176 continue;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
177 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
178 return atoi(buffer);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
179 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
180 return 0;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
181 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
182
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
183
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
184 int SMTP::cmd(const char *c) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
185 if (c) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
186 init();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
187 append(c);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
188 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
189 append("\r\n");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
190 writer();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
191 return read_response();
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
192 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
193
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
194
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
195 int SMTP::helo() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
196 if (read_response() != 220) return 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
197 init();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
198 append("HELO ");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
199 append(token_myhostname);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
200 return cmd(NULL);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
201 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
202
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
203
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
204 int SMTP::rset() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
205 int rc = cmd("RSET");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
206 efrom[0] = '\0';
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
207 return rc;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
208 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
209
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
210
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
211 int SMTP::from(const char *f) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
212 // the mail from address was originally passed in from sendmail enclosed in
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
213 // <>. to_lower_string() removed the <> and converted the rest to lowercase,
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
214 // except in the case of an empty return path, which was left as the two
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
215 // character string <>.
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
216 if (strncmp(efrom, f, maxlen)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
217 rset();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
218 strncpy(efrom, f, maxlen);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
219 init();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
220 append("MAIL FROM:<");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
221 if (*f != '<') append(f);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
222 append(">");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
223 return cmd(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
224 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
225 return 250; // pretend it worked
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
226 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
227
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
228
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
229 int SMTP::rcpt(const char *t) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
230 init();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
231 append("RCPT TO:<");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
232 append(t);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
233 append(">");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
234 return cmd(NULL);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
235 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
236
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
237
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
238 int SMTP::quit() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
239 return cmd("QUIT");
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
240 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
241
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
242
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
243 void SMTP::closefd() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
244 shutdown(fd, SHUT_RDWR);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
245 close(fd);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
246 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
247
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
248
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
249 #ifdef VERIFY_DEBUG
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
250 void SMTP::log(const char *m, int v) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
251 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
252 snprintf(buf, maxlen, m, v);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
253 my_syslog(buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
254 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
255
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
256
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
257 void SMTP::log(const char *m, const char *v) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
258 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
259 snprintf(buf, maxlen, m, v);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
260 my_syslog(buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
261 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
262 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
263
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
264
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
265 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
266 // smtp verifier so backup mx machines can see the valid users
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
267 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
268 VERIFY::VERIFY(const char *h) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
269 host = h;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
270 last_err = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
271 pthread_mutex_init(&mutex, 0);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
272 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
273
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
274
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
275 void VERIFY::closer() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
276 bool ok = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
277 while (ok) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
278 SMTP *conn = NULL;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
279 pthread_mutex_lock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
280 if (connections.empty()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
281 ok = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
282 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
283 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
284 conn = connections.front();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
285 time_t now = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
286 if ((now - conn->get_stamp()) > maxsmtp_age) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
287 // this connection is ancient, remove it
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
288 connections.pop_front();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
289 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
290 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
291 ok = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
292 conn = NULL;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
293 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
294 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
295 pthread_mutex_unlock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
296 // avoid doing this work inside the mutex lock
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
297 if (conn) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
298 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
299 conn->log("closer() closes ancient %d", conn->get_fd());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
300 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
301 delete conn;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
302 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
303 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
304 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
305
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
306
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
307 SMTP* VERIFY::get_connection() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
308 SMTP *conn = NULL;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
309 pthread_mutex_lock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
310 if (!connections.empty()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
311 conn = connections.front();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
312 connections.pop_front();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
313 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
314 conn->log("get_connection() %d from cache", conn->get_fd());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
315 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
316 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
317 pthread_mutex_unlock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
318 if (conn) return conn;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
319 int sock = NULL_SOCKET;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
320 if ((time(NULL) - last_err) > ERROR_SMTP_SOCKET_TIME) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
321 // nothing recent, maybe this time it will work
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
322 hostent *h = gethostbyname(host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
323 if (h) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
324 sockaddr_in server;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
325 server.sin_family = h->h_addrtype;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
326 server.sin_port = htons(25);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
327 memcpy(&server.sin_addr, h->h_addr_list[0], h->h_length);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
328 sock = socket(PF_INET, SOCK_STREAM, 0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
329 if (sock != NULL_SOCKET) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
330 bool rc = (connect(sock, (sockaddr *)&server, sizeof(server)) == 0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
331 if (!rc) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
332 shutdown(sock, SHUT_RDWR);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
333 close(sock);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
334 sock = NULL_SOCKET;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
335 last_err = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
336 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
337 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
338 else last_err = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
339 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
340 else last_err = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
341 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
342 if (sock != NULL_SOCKET) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
343 conn = new SMTP(sock);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
344 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
345 conn->log("get_connection() %d new socket", conn->get_fd());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
346 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
347 if (conn->helo() == 250) return conn;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
348 delete conn;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
349 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
350 return NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
351 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
352
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
353
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
354 void VERIFY::put_connection(SMTP *conn) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
355 if (conn->err()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
356 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
357 conn->log("put_socket() %d with error, close it", conn->get_fd());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
358 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
359 delete conn;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
360 last_err = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
361 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
362 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
363 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
364 conn->log("put_socket() %d", conn->get_fd());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
365 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
366 conn->now();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
367 pthread_mutex_lock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
368 connections.push_back(conn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
369 pthread_mutex_unlock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
370 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
371 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
372
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
373
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
374 bool VERIFY::ok(const char *from, const char *to) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
375 if (host == token_myhostname) return true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
376 SMTP *conn = get_connection();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
377 if (!conn) return true; // cannot verify right now, we have socket errors
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
378 int rc;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
379 rc = conn->from(from);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
380 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
381 conn->log("verify::ok() from sees %d", rc);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
382 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
383 if (rc != 250) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
384 conn->rset();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
385 put_connection(conn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
386 return (rc >= 500) ? false : true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
387 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
388 rc = conn->rcpt(to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
389 #ifdef VERIFY_DEBUG
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
390 conn->log("verify::ok() rcpt sees %d", rc);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
391 #endif
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
392 put_connection(conn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
393 return (rc >= 500) ? false : true;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
394 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
395
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
396
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
397 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
398 // setup a new smtp verify host
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
399 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
400 VERIFYP add_verify_host(const char *host);
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
401 VERIFYP add_verify_host(const char *host) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
402 VERIFYP rc = NULL;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
403 pthread_mutex_lock(&verifier_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
404 verify_map::iterator i = verifiers.find(host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
405 if (i == verifiers.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
406 rc = new VERIFY(host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
407 verifiers[host] = rc;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
408 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
409 else rc = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
410 pthread_mutex_unlock(&verifier_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
411 return rc;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
412 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
413
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
414
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
415 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
416 // thread to check for verify hosts with old sockets that we can close
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
417 //
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
418 void* verify_closer(void *arg) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
419 while (true) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
420 sleep(maxsmtp_age);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
421 pthread_mutex_lock(&verifier_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
422 for (verify_map::iterator i=verifiers.begin(); i!=verifiers.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
423 VERIFYP v = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
424 v->closer();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
425 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
426 pthread_mutex_unlock(&verifier_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
427 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
428 return NULL;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
429 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
430
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
431
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
432 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
433 // automatic whitelister
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
434 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
435 WHITELISTER::WHITELISTER(const char *f, int d) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
436 fn = f;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
437 days = d;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
438 pthread_mutex_init(&mutex, 0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
439 need = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
440 loaded = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
441 merge();
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
442 }
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
443
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
444
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
445 void WHITELISTER::merge() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
446 time_t now = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
447 ifstream ifs;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
448 ifs.open(fn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
449 if (!ifs.fail()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
450 const int maxlen = 1000;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
451 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
452 while (ifs.getline(buf, maxlen)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
453 char *p = strchr(buf, ' ');
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
454 if (p) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
455 *p = '\0';
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
456 char *who = strdup(buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
457 time_t when = atoi(p+1);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
458 if ((when == 0) || (when > now)) when = now;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
459 autowhite_sent::iterator i = rcpts.find(who);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
460 if (i == rcpts.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
461 rcpts[who] = when;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
462 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
463 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
464 time_t wh = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
465 if ((when == 1) || (when > wh)) (*i).second = when;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
466 free(who);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
467 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
468 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
469 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
470 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
471 ifs.close();
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
472 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
473
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
474
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
475 void WHITELISTER::writer() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
476 pthread_mutex_lock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
477 time_t limit = time(NULL) - days*86400;
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
478
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
479 // check for manually modified autowhitelist file
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
480 struct stat st;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
481 if (stat(fn, &st)) need = true; // file has disappeared
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
482 else if (st.st_mtime > loaded) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
483 // file has been manually updated, merge new entries
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
484 merge();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
485 need = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
486 }
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
487
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
488 // purge old entries
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
489 for (autowhite_sent::iterator i=rcpts.begin(); i!=rcpts.end();) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
490 time_t when = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
491 if (when < limit) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
492 const char *who = (*i).first;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
493 free((void*)who);
195
797299e9fffc fix null dereference if missing _ macro
carl
parents: 192
diff changeset
494 rcpts.erase(i++);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
495 need = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
496 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
497 else i++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
498 }
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
499
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
500 if (need) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
501 // dump the file
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
502 ofstream ofs;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
503 ofs.open(fn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
504 if (!ofs.fail()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
505 for (autowhite_sent::iterator i=rcpts.begin(); i!=rcpts.end(); i++) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
506 const char *who = (*i).first;
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
507 int when = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
508 if (!strchr(who, ' ')) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
509 ofs << who << " " << when << endl;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
510 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
511 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
512 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
513 ofs.close();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
514 need = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
515 loaded = time(NULL); // update load time
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
516 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
517 pthread_mutex_unlock(&mutex);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
518 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
519
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
520
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
521 void WHITELISTER::sent(const char *to) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
522 // we take ownership of the string
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
523 pthread_mutex_lock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
524 need = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
525 autowhite_sent::iterator i = rcpts.find(to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
526 if (i == rcpts.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
527 rcpts[to] = time(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
528 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
529 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
530 (*i).second = time(NULL);
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
531 free((void*)to);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
532 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
533 pthread_mutex_unlock(&mutex);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
534 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
535
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
536
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
537 bool WHITELISTER::is_white(const char *from) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
538 pthread_mutex_lock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
539 autowhite_sent::iterator i = rcpts.find(from);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
540 bool rc = (i != rcpts.end());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
541 pthread_mutex_unlock(&mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
542 return rc;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
543 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
544
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
545
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
546 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
547 // setup a new auto whitelister file
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
548 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
549 WHITELISTERP add_whitelister_file(const char *fn, int days);
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
550 WHITELISTERP add_whitelister_file(const char *fn, int days) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
551 WHITELISTERP rc = NULL;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
552 pthread_mutex_lock(&whitelister_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
553 whitelister_map::iterator i = whitelisters.find(fn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
554 if (i == whitelisters.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
555 rc = new WHITELISTER(fn, days);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
556 whitelisters[fn] = rc;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
557 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
558 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
559 rc = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
560 rc->set_days(days);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
561 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
562 pthread_mutex_unlock(&whitelister_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
563 return rc;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
564 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
565
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
566
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
567 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
568 // thread to check for whitelister hosts with old sockets that we can close
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
569 //
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
570 void* whitelister_writer(void *arg) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
571 while (true) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
572 sleep(maxauto_age);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
573 pthread_mutex_lock(&whitelister_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
574 for (whitelister_map::iterator i=whitelisters.begin(); i!=whitelisters.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
575 WHITELISTERP v = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
576 v->writer();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
577 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
578 pthread_mutex_unlock(&whitelister_mutex);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
579 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
580 return NULL;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
581 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
582
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
583
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
584 DELAYWHITE::DELAYWHITE(const char *loto_, WHITELISTERP w_, CONTEXTP con_) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
585 loto = loto_;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
586 w = w_;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
587 con = con_;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
588 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
589
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
590
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
591 DNSBL::DNSBL(const char *n, const char *s, const char *m) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
592 name = n;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
593 suffix = s;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
594 message = m;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
595 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
596
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
597
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
598 bool DNSBL::operator==(const DNSBL &rhs) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
599 return (strcmp(name, rhs.name) == 0) &&
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
600 (strcmp(suffix, rhs.suffix) == 0) &&
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
601 (strcmp(message, rhs.message) == 0);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
602 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
603
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
604
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
605 DNSWL::DNSWL(const char *n, const char *s, const int l) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
606 name = n;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
607 suffix = s;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
608 level = l;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
609 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
610
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
611
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
612 bool DNSWL::operator==(const DNSWL &rhs) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
613 return (strcmp(name, rhs.name) == 0) &&
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
614 (strcmp(suffix, rhs.suffix) == 0) &&
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
615 (level == rhs.level);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
616 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
617
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
618
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
619 CONFIG::CONFIG() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
620 reference_count = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
621 generation = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
622 load_time = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
623 default_context = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
624 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
625
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
626
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
627 CONFIG::~CONFIG() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
628 if (debug_syslog) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
629 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
630 snprintf(buf, sizeof(buf), "freeing memory for old configuration generation %d", generation);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
631 my_syslog(buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
632 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
633 for (context_list::iterator i=contexts.begin(); i!=contexts.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
634 CONTEXT *c = *i;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
635 delete c;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
636 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
637 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
638
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
639
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
640 void CONFIG::add_context(CONTEXTP con) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
641 contexts.push_back(con);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
642 if (!default_context && !con->get_parent()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
643 // first global context
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
644 default_context = con;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
645 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
646 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
647
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
648
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
649 void CONFIG::add_to(const char *to, CONTEXTP con) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
650 context_map::iterator i = env_to.find(to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
651 if (i != env_to.end()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
652 CONTEXTP c = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
653 if ((c != con) && (c != con->get_parent())) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
654 if (debug_syslog) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
655 char oldname[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
656 char newname[maxlen];
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
657 const char *oldn = c->get_full_name(oldname, maxlen);
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
658 const char *newn = con->get_full_name(newname, maxlen);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
659 char buf[maxlen*3];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
660 snprintf(buf, maxlen*3, "both %s and %s claim envelope to %s, the second one wins", oldn, newn, to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
661 my_syslog(buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
662 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
663 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
664 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
665 env_to[to] = con;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
666 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
667
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
668
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
669 CONTEXTP CONFIG::find_context(const char *to) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
670 context_map::iterator i = env_to.find(to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
671 if (i != env_to.end()) return (*i).second; // found user@domain key
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
672 const char *x = strchr(to, '@');
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
673 if (x) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
674 x++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
675 i = env_to.find(x);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
676 if (i != env_to.end()) return (*i).second; // found domain key
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
677 size_t len = x - to;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
678 char user[len+1];
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
679 memcpy(user, to, len);
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
680 user[len] = '\0';
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
681 i = env_to.find(user);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
682 if (i != env_to.end()) return (*i).second; // found user@ key
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
683 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
684 return default_context;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
685 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
686
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
687
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
688 void CONFIG::dump() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
689 bool spamass = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
690 if (default_context) default_context->dump(true, spamass);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
691 for (context_list::iterator i=contexts.begin(); i!=contexts.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
692 CONTEXTP c = *i;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
693 CONTEXTP p = c->get_parent();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
694 if (!p && (c != default_context)) c->dump(false, spamass);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
695 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
696 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
697 for (context_map::iterator i=env_to.begin(); i!=env_to.end(); i++) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
698 const char *to = (*i).first;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
699 CONTEXTP con = (*i).second;
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
700 printf("// envelope to %s \t-> context %s \n", to, con->get_full_name(buf,maxlen));
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
701 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
702 if (spamass && (spamc == spamc_empty)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
703 printf("// *** warning - spamassassin filtering requested, but spamc not found by autoconf.\n");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
704 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
705 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
706
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
707
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
708 CONTEXT::CONTEXT(CONTEXTP parent_, const char *name_) {
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
709 parent = parent_;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
710 name = name_;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
711 verify_host = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
712 verifier = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
713 generic_regx = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
714 generic_message = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
715 white_regx = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
716 autowhite_file = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
717 whitelister = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
718 env_from_default = (parent) ? token_inherit : token_unknown;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
719 content_filtering = (parent) ? parent->content_filtering : false;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
720 content_suffix = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
721 content_message = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
722 uribl_suffix = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
723 uribl_message = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
724 host_limit = (parent) ? parent->host_limit : 0;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
725 host_limit_message = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
726 host_random = (parent) ? parent->host_random : false;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
727 tag_limit = (parent) ? parent->tag_limit : 0;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
728 tag_limit_message = NULL;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
729 spamassassin_limit = (parent) ? parent->spamassassin_limit : 0;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
730 require_match = (parent) ? parent->require_match : false;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
731 require_rdns = (parent) ? parent->require_rdns : false;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
732 dcc_greylist = (parent) ? parent->dcc_greylist : false;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
733 dcc_bulk_threshold = (parent) ? parent->dcc_bulk_threshold : 0;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
734 dnsbl_list_parsed = false;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
735 dnswl_list_parsed = false;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
736 default_rate_limit = 36000; // 10 per second
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
737 default_address_limit = 10;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
738 daily_rate_multiple = 3;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
739 daily_address_multiple = 3;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
740 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
741
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
742
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
743 CONTEXT::~CONTEXT() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
744 for (dnsblp_map::iterator i=dnsbl_names.begin(); i!=dnsbl_names.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
745 DNSBLP d = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
746 // delete the underlying DNSBL objects.
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
747 delete d;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
748 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
749 if (generic_regx) regfree(&generic_pattern);
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
750 if (white_regx) regfree(&white_pattern);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
751 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
752
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
753
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
754 bool CONTEXT::is_parent(CONTEXTP p) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
755 if (p == parent) return true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
756 if (!parent) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
757 return parent->is_parent(p);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
758 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
759
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
760
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
761 const char *CONTEXT::get_full_name(char *buffer, int size) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
762 if (!parent) return name;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
763 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
764 snprintf(buffer, size, "%s.%s", parent->get_full_name(buf, maxlen), name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
765 return buffer;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
766 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
767
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
768
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
769 bool CONTEXT::set_white(const char *regx)
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
770 {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
771 int rc = 0;
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
772 if (white_regx) regfree(&white_pattern);
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
773 white_regx = regx;
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
774 if (white_regx) {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
775 rc = regcomp(&white_pattern, regx, REG_NOSUB | REG_ICASE | REG_EXTENDED);
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
776 }
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
777 return rc; // true iff bad pattern
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
778 }
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
779
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
780
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
781 bool CONTEXT::white_match(const char *from)
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
782 {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
783 return (from &&
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
784 white_regx &&
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
785 (0 == regexec(&white_pattern, from, 0, NULL, 0)));
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
786 }
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
787
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
788
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
789 bool CONTEXT::set_generic(const char *regx, const char *msg)
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
790 {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
791 int rc = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
792 if (generic_regx) regfree(&generic_pattern);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
793 generic_regx = regx;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
794 generic_message = msg;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
795 if (generic_regx) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
796 rc = regcomp(&generic_pattern, regx, REG_NOSUB | REG_ICASE | REG_EXTENDED);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
797 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
798 return rc; // true iff bad pattern
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
799 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
800
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
801
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
802 const char *CONTEXT::generic_match(const char *client)
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
803 {
195
797299e9fffc fix null dereference if missing _ macro
carl
parents: 192
diff changeset
804 if (!client) return NULL; // allow missing _ macro, which will disable generic checking
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
805 if (parent && !generic_regx) return parent->generic_match(client);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
806 if (!generic_regx) return NULL;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
807 if (0 == regexec(&generic_pattern, client, 0, NULL, 0)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
808 return generic_message;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
809 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
810 return NULL;
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
811 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
812
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
813
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
814 bool CONTEXT::cover_env_to(const char *to) {
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
815 const char *x = strchr(to, '@');
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
816 if (x) x++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
817 else x = to;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
818 if (*x == '\0') return true; // always allow covering addresses with no domain name, eg abuse@
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
819 if (!parent && env_to.empty()) return true; // empty env_to at global level covers everything
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
820 string_set::iterator i = env_to.find(x);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
821 if (i != env_to.end()) return true; // we cover the entire domain
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
822 if (x != to) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
823 i = env_to.find(to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
824 if (i != env_to.end()) return true; // we cover the specific email address
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
825 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
826 return false;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
827 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
828
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
829
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
830 VERIFYP CONTEXT::find_verify(const char *to) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
831 if (verifier && (verify_host != token_myhostname) && cover_env_to(to))
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
832 return verifier;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
833 else if (parent)
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
834 return parent->find_verify(to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
835 else
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
836 return NULL;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
837 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
838
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
839
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
840 WHITELISTERP CONTEXT::find_autowhite(const char *from, const char *to) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
841 if (whitelister && cover_env_to(to) && !cover_env_to(from))
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
842 return whitelister;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
843 else if (parent)
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
844 return parent->find_autowhite(from, to);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
845 else
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
846 return NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
847 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
848
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
849
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
850 int CONTEXT::find_rate_limit(const char *user) {
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
851 if (rcpt_per_hour.empty()) return default_rate_limit;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
852 rates::iterator i = rcpt_per_hour.find(user); // look for authen id, or sender user@email limiting
259
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
853 if (i != rcpt_per_hour.end()) return (*i).second; // found authen id, or user@email limiting
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
854 const char *f = strchr(user, '@');
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
855 if (!f) return default_rate_limit;
259
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
856 i = rcpt_per_hour.find(f); // look for @domain limiting
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
857 if (i != rcpt_per_hour.end()) return (*i).second; // found @domain limiting
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
858 return default_rate_limit;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
859 }
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
860
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
861
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
862 int CONTEXT::find_address_limit(const char *user) {
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
863 if (addresses_per_hour.empty()) return default_address_limit;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
864 rates::iterator i = addresses_per_hour.find(user); // look for authen id, or sender user@email limiting
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
865 if (i != addresses_per_hour.end()) return (*i).second; // found authen id, or user@email limiting
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
866 const char *f = strchr(user, '@');
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
867 if (!f) return default_address_limit;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
868 i = addresses_per_hour.find(f); // look for @domain limiting
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
869 if (i != addresses_per_hour.end()) return (*i).second; // found @domain limiting
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
870 return default_address_limit;
259
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
871 }
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
872
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
873
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
874 bool CONTEXT::is_unauthenticated_limited(const char *user) {
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
875 rates::iterator i = rcpt_per_hour.find(user); // look for sender user@email limiting
259
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
876 if (i != rcpt_per_hour.end()) return true; // found user@email limiting
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
877 const char *f = strchr(user, '@');
266
582cfb9c4031 fix unauthenticated rate limit bug for empty mail from
Carl Byington <carl@five-ten-sg.com>
parents: 263
diff changeset
878 if (!f) return false;
259
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
879 i = rcpt_per_hour.find(f); // look for sender @domain limiting
be939802c64e add recipient rate limits by email from address or domain
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
880 return (i != rcpt_per_hour.end()); // found @domain limiting
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
881 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
882
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
883
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
884 const char *CONTEXT::find_from(const char *from, bool update_white, const char *queueid) {
211
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
885 WHITELISTERP w = whitelister;
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
886 CONTEXTP p = parent;
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
887 while (!w && p) {
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
888 w = p->whitelister;
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
889 p = p->parent;
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
890 }
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
891 if (w && w->is_white(from)) {
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
892 if (update_white && queueid) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
893 // update senders timestamp to extend the whitelisting period
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
894 if (debug_syslog > 1) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
895 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
896 char msg[maxlen];
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
897 snprintf(msg, sizeof(msg), "%s: extend whitelist reply from <%s> in context %s", queueid, from, get_full_name(buf,maxlen));
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
898 my_syslog(msg);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
899 }
211
4db1457cd11a Extend auto-whitelisting when receiving mail even if the auto whitelist is specified in a parent context.
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
900 w->sent(strdup(from));
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
901 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
902 return token_white;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
903 }
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
904 const char *rc = env_from_default;
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
905 string_map::iterator i = env_from.find(from);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
906 if (i != env_from.end()) rc = (*i).second; // found user@domain key
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
907 else {
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
908 const char *x = strchr(from, '@');
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
909 if (x) {
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
910 char buf[200];
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
911 x++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
912 i = env_from.find(x);
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
913 size_t n = x - from; // length of user name plus @
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
914 if (i != env_from.end()) rc = (*i).second; // found domain key
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
915 else if (n < sizeof(buf)) {
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
916 // we only test reasonably short user names, since we need
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
917 // to copy them to a buffer to avoid a dup/free cycle on every
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
918 // test here.
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
919 strncpy(buf, from, n);
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
920 buf[n] = '\0';
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
921 i = env_from.find(buf);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
922 if (i != env_from.end()) rc = (*i).second; // found user@ key
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
923 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
924 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
925 }
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
926 if ((rc == token_inherit) || (rc == token_unknown)) {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
927 bool ok = white_match(from);
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
928 if (ok) rc = token_white;
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
929 }
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
930 if ((rc == token_inherit) && parent) return parent->find_from(from);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
931 return (rc == token_inherit) ? token_unknown : rc;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
932 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
933
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
934
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
935 CONTEXTP CONTEXT::find_context(const char *from) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
936 context_map::iterator i = env_from_context.find(from);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
937 if (i != env_from_context.end()) return (*i).second; // found user@domain key
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
938 const char *x = strchr(from, '@');
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
939 if (x) {
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
940 char buf[200];
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
941 x++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
942 i = env_from_context.find(x);
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
943 size_t n = x - from; // length of user name plus @
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
944 if (i != env_from_context.end()) return (*i).second; // found domain key
244
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
945 else if (n < sizeof(buf)) {
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
946 // we only test reasonably short user names, since we need
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
947 // to copy them to a buffer to avoid a dup/free cycle on every
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
948 // test here.
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
949 strncpy(buf, from, n);
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
950 buf[n] = '\0';
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
951 i = env_from_context.find(buf);
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
952 if (i != env_from_context.end()) return (*i).second; // found user@ key
ef97c7cd4a6e const correctness fixes from new gcc, libresolv.a moved to glibc-static on newer distributions
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
953 }
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
954 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
955 return this;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
956 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
957
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
958
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
959 CONTEXTP CONTEXT::find_from_context_name(const char *name) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
960 context_map::iterator i = children.find(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
961 if (i != children.end()) return (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
962 return NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
963 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
964
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
965
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
966 DNSBLP CONTEXT::find_dnsbl(const char *name) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
967 dnsblp_map::iterator i = dnsbl_names.find(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
968 if (i != dnsbl_names.end()) return (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
969 if (parent) return parent->find_dnsbl(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
970 return NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
971 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
972
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
973
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
974 DNSWLP CONTEXT::find_dnswl(const char *name) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
975 dnswlp_map::iterator i = dnswl_names.find(name);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
976 if (i != dnswl_names.end()) return (*i).second;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
977 if (parent) return parent->find_dnswl(name);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
978 return NULL;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
979 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
980
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
981
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
982 const char* CONTEXT::get_content_suffix() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
983 if (!content_suffix && parent) return parent->get_content_suffix();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
984 return content_suffix;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
985 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
986
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
987
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
988 const char* CONTEXT::get_uribl_suffix() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
989 if (!uribl_suffix && parent) return parent->get_uribl_suffix();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
990 return uribl_suffix;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
991 }
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
992
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
993
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
994 const char* CONTEXT::get_content_message() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
995 if (!content_message && parent) return parent->get_content_message();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
996 return content_message;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
997 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
998
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
999
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1000 const char* CONTEXT::get_uribl_message() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1001 if (!uribl_message && parent) return parent->get_uribl_message();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1002 return uribl_message;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1003 }
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1004
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1005
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1006 string_set& CONTEXT::get_content_host_ignore() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1007 if (content_host_ignore.empty() && parent) return parent->get_content_host_ignore();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1008 return content_host_ignore;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1009 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1010
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1011
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1012 string_set& CONTEXT::get_content_tlds() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1013 if (content_tlds.empty() && parent) return parent->get_content_tlds();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1014 return content_tlds;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1015 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1016
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1017
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1018 string_set& CONTEXT::get_content_tldwilds() {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1019 if (content_tldwilds.empty() && parent) return parent->get_content_tldwilds();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1020 return content_tldwilds;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1021 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1022
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1023
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1024 string_set& CONTEXT::get_content_tldnots() {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1025 if (content_tldnots.empty() && parent) return parent->get_content_tldnots();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1026 return content_tldnots;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1027 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1028
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1029
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1030 string_set& CONTEXT::get_html_tags() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1031 if (html_tags.empty() && parent) return parent->get_html_tags();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1032 return html_tags;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1033 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1034
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1035
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1036 dnsblp_list& CONTEXT::get_dnsbl_list() {
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1037 if (!dnsbl_list_parsed && parent) return parent->get_dnsbl_list();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1038 return dnsbl_list;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1039 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1040
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1041
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1042 dnswlp_list& CONTEXT::get_dnswl_list() {
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1043 if (!dnswl_list_parsed && parent) return parent->get_dnswl_list();
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1044 return dnswl_list;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1045 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1046
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1047
178
d6531c702be3 embedded dcc filtering
carl
parents: 175
diff changeset
1048 bool CONTEXT::acceptable_content(recorder &memory, int score, int bulk, string& msg) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1049 if (spamassassin_limit && (score > spamassassin_limit)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1050 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1051 snprintf(buf, sizeof(buf), "Mail rejected - spam assassin score %d", score);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1052 msg = string(buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1053 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1054 }
203
92a5c866bdfa Verify from/to pairs even if they might be explicitly whitelisted.
Carl Byington <carl@five-ten-sg.com>
parents: 195
diff changeset
1055 if (dcc_bulk_threshold && (bulk >= dcc_bulk_threshold)) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1056 char buf[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1057 snprintf(buf, sizeof(buf), "Mail rejected - dcc score %d", bulk);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1058 msg = string(buf);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1059 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1060 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1061 if (memory.excessive_bad_tags(tag_limit)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1062 msg = string(tag_limit_message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1063 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1064 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1065 if (!host_random && memory.excessive_hosts(host_limit)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1066 msg = string(host_limit_message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1067 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1068 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1069 return true;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1070 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1071
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1072
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
1073 void CONTEXT::dump(bool isdefault, bool &spamass, int level) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1074 char indent[maxlen];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1075 int i = min(maxlen-1, level*4);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1076 memset(indent, ' ', i);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1077 indent[i] = '\0';
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1078 char buf[maxlen];
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1079 const char *fullname = get_full_name(buf,maxlen);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1080 printf("%s context %s { \t// %s\n", indent, name, fullname);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1081
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1082 for (dnsblp_map::iterator i=dnsbl_names.begin(); i!=dnsbl_names.end(); i++) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1083 const char *n = (*i).first;
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1084 DNSBL &d = *(*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1085 printf("%s dnsbl %s %s \"%s\"; \n", indent, n, d.suffix, d.message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1086 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1087
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1088 for (dnswlp_map::iterator i=dnswl_names.begin(); i!=dnswl_names.end(); i++) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1089 const char *n = (*i).first;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1090 DNSWL &d = *(*i).second;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1091 printf("%s dnswl %s %s %d; \n", indent, n, d.suffix, d.level);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1092 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1093
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1094 {
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1095 dnsblp_list dl = get_dnsbl_list();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1096 printf("%s dnsbl_list", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1097 for (dnsblp_list::iterator i=dl.begin(); i!=dl.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1098 DNSBL &d = *(*i);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1099 printf(" %s", d.name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1100 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1101 printf("; \n");
268
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1102 printf("%s require_rdns %s; \n", indent, (require_rdns) ? "yes" : "no");
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1103 }
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1104
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1105 {
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1106 dnswlp_list dl = get_dnswl_list();
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1107 printf("%s dnswl_list", indent);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1108 for (dnswlp_list::iterator i=dl.begin(); i!=dl.end(); i++) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1109 DNSWL &d = *(*i);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1110 printf(" %s", d.name);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1111 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1112 printf("; \n");
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1113 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1114
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1115 if (content_filtering) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1116 printf("%s content on { \n", indent);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1117 if (content_suffix) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1118 printf("%s filter %s \"%s\"; \n", indent, content_suffix, content_message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1119 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1120 if (uribl_suffix) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1121 printf("%s uribl %s \"%s\"; \n", indent, uribl_suffix, uribl_message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1122 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1123 if (!content_host_ignore.empty()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1124 printf("%s ignore { \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1125 for (string_set::iterator i=content_host_ignore.begin(); i!=content_host_ignore.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1126 printf("%s %s; \n", indent, *i);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1127 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1128 printf("%s }; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1129 }
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1130 if (!content_tlds.empty() || !content_tldwilds.empty() || !content_tldnots.empty()) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1131 printf("%s tld { \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1132 printf("%s ", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1133 for (string_set::iterator i=content_tlds.begin(); i!=content_tlds.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1134 printf("%s; ", *i);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1135 }
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1136 for (string_set::iterator i=content_tldwilds.begin(); i!=content_tldwilds.end(); i++) {
274
bdcf203e3f7b fix -c printing config
Carl Byington <carl@five-ten-sg.com>
parents: 272
diff changeset
1137 printf("*.%s; ", *i);
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1138 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1139 for (string_set::iterator i=content_tldnots.begin(); i!=content_tldnots.end(); i++) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1140 printf("!%s; ", *i);
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1141 }
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1142 printf("\n%s }; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1143 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1144 if (!html_tags.empty()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1145 printf("%s html_tags { \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1146 printf("%s ", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1147 for (string_set::iterator i=html_tags.begin(); i!=html_tags.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1148 printf("%s; ", *i);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1149 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1150 printf("\n%s }; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1151 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1152 if (host_limit_message) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1153 printf("%s host_limit on %d \"%s\"; \n", indent, host_limit, host_limit_message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1154 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1155 else if (host_random) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1156 printf("%s host_limit soft %d; \n", indent, host_limit);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1157 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1158 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1159 printf("%s host_limit off; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1160 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1161 if (tag_limit_message) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1162 printf("%s html_limit on %d \"%s\"; \n", indent, tag_limit, tag_limit_message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1163 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1164 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1165 printf("%s html_limit off; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1166 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1167 printf("%s spamassassin %d; \n", indent, spamassassin_limit);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1168 printf("%s require_match %s; \n", indent, (require_match) ? "yes" : "no");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1169 printf("%s dcc_greylist %s; \n", indent, (dcc_greylist) ? "yes" : "no");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1170 if (dcc_bulk_threshold == 0) printf("%s dcc_bulk_threshold off; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1171 else if (dcc_bulk_threshold >= dccbulk) printf("%s dcc_bulk_threshold many; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1172 else printf("%s dcc_bulk_threshold %d; \n", indent, dcc_bulk_threshold);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1173 printf("%s }; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1174 spamass |= (spamassassin_limit != 0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1175 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1176 else {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1177 printf("%s content off {}; \n", indent);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1178 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1179
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1180 printf("%s env_to { \t// %s\n", indent, fullname);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1181 for (string_set::iterator i=env_to.begin(); i!=env_to.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1182 printf("%s %s; \n", indent, *i);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1183 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1184 printf("%s }; \n", indent);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1185
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1186 if (verify_host) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1187 printf("%s verify %s; \n", indent, verify_host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1188 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1189
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1190 if (generic_regx) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1191 printf("%s generic \"%s\" \n", indent, generic_regx);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1192 printf("%s \"%s\"; \n", indent, generic_message);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1193 }
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1194
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1195 if (white_regx) {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1196 printf("%s white_regex \"%s\"; \n", indent, white_regx);
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1197 }
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1198
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1199 if (autowhite_file && whitelister) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1200 printf("%s autowhite %d %s; \n", indent, whitelister->get_days(), autowhite_file);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1201 }
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1202
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1203 for (context_map::iterator i=children.begin(); i!=children.end(); i++) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1204 CONTEXTP c = (*i).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1205 c->dump(false, spamass, level+1);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1206 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1207
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1208 printf("%s env_from %s { \t// %s\n", indent, env_from_default, fullname);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1209 if (!env_from.empty()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1210 printf("%s // white/black/unknown \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1211 for (string_map::iterator i=env_from.begin(); i!=env_from.end(); i++) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1212 const char *f = (*i).first;
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1213 const char *t = (*i).second;
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1214 printf("%s %s \t%s; \n", indent, f, t);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1215 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1216 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1217 if (!env_from_context.empty()) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1218 printf("%s // child contexts \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1219 for (context_map::iterator j=env_from_context.begin(); j!=env_from_context.end(); j++) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1220 const char *f = (*j).first;
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1221 CONTEXTP t = (*j).second;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1222 printf("%s %s \t%s; \n", indent, f, t->name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1223 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1224 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1225 printf("%s }; \n", indent);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1226
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1227 if (isdefault) {
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1228 printf("%s rate_limit %d %d %d %d { \n", indent, default_rate_limit, daily_rate_multiple, default_address_limit, daily_address_multiple);
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1229 for (rates::iterator j=rcpt_per_hour.begin(); j!=rcpt_per_hour.end(); j++) {
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1230 const char *u = (*j).first;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1231 int l = (*j).second;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1232 rates::iterator k = addresses_per_hour.find(u);
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1233 int a = (k==addresses_per_hour.end()) ? default_address_limit : (*k).second;
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1234 printf("%s \"%s\" \t%d %d; \n", indent, u, l, a);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1235 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1236 printf("%s }; \n", indent);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1237 }
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1238
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1239 printf("%s }; \n", indent);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1240 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1241
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1242
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1243 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1244 // helper to discard the strings held by a string_set
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1245 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1246 void discard(string_set &s) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1247 for (string_set::iterator i=s.begin(); i!=s.end(); i++) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1248 free((void*)*i);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1249 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1250 s.clear();
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1251 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1252
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1253
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1254 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1255 // helper to register a string in a string set
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1256 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1257 const char* register_string(string_set &s, const char *name) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1258 string_set::iterator i = s.find(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1259 if (i != s.end()) return *i;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1260 char *x = strdup(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1261 s.insert(x);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1262 return x;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1263 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1264
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1265
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1266 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1267 // register a global string
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1268 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1269 const char* register_string(const char *name) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1270 return register_string(all_strings, name);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1271 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1272
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1273
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1274 ////////////////////////////////////////////////
164
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1275 // clear all global strings, helper for valgrind checking
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1276 //
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1277 void clear_strings() {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1278 discard(all_strings);
164
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1279 }
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1280
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1281
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1282 ////////////////////////////////////////////////
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1283 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1284 bool tsa(TOKEN &tok, const char *token);
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1285 bool tsa(TOKEN &tok, const char *token) {
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1286 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1287 if (have == token) return true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1288 tok.token_error(token, have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1289 return false;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1290 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1291
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1292
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1293 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1294 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1295 bool parse_dnsbl(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1296 bool parse_dnsbl(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1297 const char *name = tok.next();
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1298 const char *suf = tok.next();
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1299 const char *msg = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1300 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1301 DNSBLP dnsnew = new DNSBL(name, suf, msg);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1302 DNSBLP dnsold = me.find_dnsbl(name);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1303 if (dnsold && (*dnsold == *dnsnew)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1304 // duplicate redefinition, ignore it
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1305 delete dnsnew;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1306 return true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1307 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1308 me.add_dnsbl(name, dnsnew);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1309 return true;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1310 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1311
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1312
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1313 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1314 //
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1315 bool parse_dnswl(TOKEN &tok, CONFIG &dc, CONTEXT &me);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1316 bool parse_dnswl(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1317 const char *name = tok.next();
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1318 const char *suf = tok.next();
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1319 const int lev = tok.nextint();
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1320 if (!tsa(tok, token_semi)) return false;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1321 DNSWLP dnsnew = new DNSWL(name, suf, lev);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1322 DNSWLP dnsold = me.find_dnswl(name);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1323 if (dnsold && (*dnsold == *dnsnew)) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1324 // duplicate redefinition, ignore it
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1325 delete dnsnew;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1326 return true;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1327 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1328 me.add_dnswl(name, dnsnew);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1329 return true;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1330 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1331
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1332
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1333 ////////////////////////////////////////////////
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1334 //
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1335 bool parse_dnsbll(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1336 bool parse_dnsbll(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1337 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1338 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1339 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1340 if (have == token_semi) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1341 DNSBLP dns = me.find_dnsbl(have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1342 if (dns) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1343 me.add_dnsbl(dns);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1344 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1345 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1346 tok.token_error("dnsbl name", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1347 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1348 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1349 }
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1350 me.set_dnsbll_parsed();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1351 return true;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1352 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1353
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1354
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1355 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1356 //
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1357 bool parse_dnswll(TOKEN &tok, CONFIG &dc, CONTEXT &me);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1358 bool parse_dnswll(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1359 while (true) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1360 const char *have = tok.next();
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1361 if (!have) break;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1362 if (have == token_semi) break;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1363 DNSWLP dns = me.find_dnswl(have);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1364 if (dns) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1365 me.add_dnswl(dns);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1366 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1367 else {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1368 tok.token_error("dnswl name", have);
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1369 return false;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1370 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1371 }
255
d6d5c50b9278 Allow dnswl_list and dnsbl_list to be empty, to override lists specified in the ancestor contexts. Add daily recipient limits as a multiple of the hourly limits.
Carl Byington <carl@five-ten-sg.com>
parents: 249
diff changeset
1372 me.set_dnswll_parsed();
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1373 return true;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1374 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1375
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1376
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1377 ////////////////////////////////////////////////
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1378 //
268
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1379 bool parse_requirerdns(TOKEN &tok, CONFIG &dc, CONTEXT &me);
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1380 bool parse_requirerdns(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1381 const char *have = tok.next();
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1382 if (have == token_yes) me.set_requirerdns(true);
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1383 else if (have == token_no) me.set_requirerdns(false);
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1384 else {
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1385 tok.token_error("yes/no", have);
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1386 return false;
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1387 }
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1388 if (!tsa(tok, token_semi)) return false;
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1389 return true;
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1390 }
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1391
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1392
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1393 ////////////////////////////////////////////////
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1394 //
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1395 bool parse_content(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1396 bool parse_content(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1397 const char *setting = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1398 if (setting == token_on) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1399 me.set_content_filtering(true);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1400 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1401 else if (setting == token_off) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1402 me.set_content_filtering(false);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1403 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1404 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1405 tok.token_error("on/off", setting);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1406 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1407 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1408 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1409 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1410 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1411 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1412 if (have == token_filter) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1413 const char *suffix = tok.next();
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1414 const char *messag = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1415 me.set_content_suffix(suffix);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1416 me.set_content_message(messag);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1417 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1418 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1419 else if (have == token_uribl) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1420 const char *suffix = tok.next();
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1421 const char *messag = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1422 me.set_uribl_suffix(suffix);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1423 me.set_uribl_message(messag);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1424 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1425 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1426 else if (have == token_ignore) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1427 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1428 while (true) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1429 if (!have) break;
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1430 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1431 if (have == token_rbrace) break; // done
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1432 me.add_ignore(have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1433 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1434 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1435 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1436 else if (have == token_tld) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1437 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1438 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1439 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1440 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1441 if (have == token_rbrace) break; // done
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1442 if (have == token_bang) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1443 have = tok.next();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1444 if (!have) break;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1445 if (have == token_rbrace) break; // done
272
a99b6c1f5f67 Code cleanup, increase minimum hostname length for uribl checking
Carl Byington <carl@five-ten-sg.com>
parents: 270
diff changeset
1446 me.add_tldnot(have);
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1447 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1448 else if (have == token_asterisk) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1449 have = tok.next();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1450 if (!have) break;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1451 if (have == token_rbrace) break; // done
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1452 if (have == token_period) {
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1453 have = tok.next();
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1454 if (!have) break;
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1455 if (have == token_rbrace) break; // done
272
a99b6c1f5f67 Code cleanup, increase minimum hostname length for uribl checking
Carl Byington <carl@five-ten-sg.com>
parents: 270
diff changeset
1456 me.add_tldwild(have);
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1457 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1458 }
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1459 else me.add_tld(have);
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1460 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1461 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1462 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1463 else if (have == token_html_tags) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1464 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1465 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1466 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1467 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1468 if (have == token_rbrace) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1469 break; // done
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1470 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1471 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1472 me.add_tag(have); // base version
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1473 char buf[200];
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1474 snprintf(buf, sizeof(buf), "/%s", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1475 me.add_tag(register_string(buf)); // leading /
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1476 snprintf(buf, sizeof(buf), "%s/", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1477 me.add_tag(register_string(buf)); // trailing /
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1478 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1479 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1480 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1481 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1482 else if (have == token_html_limit) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1483 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1484 if (have == token_on) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1485 me.set_tag_limit(tok.nextint());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1486 me.set_tag_message(tok.next());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1487 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1488 else if (have == token_off) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1489 me.set_tag_limit(0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1490 me.set_tag_message(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1491 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1492 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1493 tok.token_error("on/off", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1494 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1495 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1496 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1497 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1498 else if (have == token_host_limit) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1499 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1500 if (have == token_on) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1501 me.set_host_limit(tok.nextint());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1502 me.set_host_message(tok.next());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1503 me.set_host_random(false);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1504 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1505 else if (have == token_off) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1506 me.set_host_limit(0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1507 me.set_host_message(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1508 me.set_host_random(false);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1509 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1510 else if (have == token_soft) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1511 me.set_host_limit(tok.nextint());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1512 me.set_host_message(NULL);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1513 me.set_host_random(true);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1514 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1515 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1516 tok.token_error("on/off/soft", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1517 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1518 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1519 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1520 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1521 else if (have == token_spamassassin) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1522 me.set_spamassassin_limit(tok.nextint());
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1523 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1524 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1525 else if (have == token_require) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1526 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1527 if (have == token_yes) me.set_require(true);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1528 else if (have == token_no) me.set_require(false);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1529 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1530 tok.token_error("yes/no", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1531 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1532 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1533 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1534 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1535 else if (have == token_dccgrey) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1536 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1537 if (have == token_yes) me.set_grey(true);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1538 else if (have == token_no) me.set_grey(false);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1539 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1540 tok.token_error("yes/no", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1541 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1542 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1543 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1544 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1545 else if (have == token_dccbulk) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1546 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1547 if (have == token_off) me.set_bulk(0);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1548 else if (have == token_many) me.set_bulk(dccbulk);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1549 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1550 char *e;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1551 long i = strtol(have, &e, 10);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1552 if (*e != '\0') {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1553 tok.token_error("integer", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1554 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1555 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1556 me.set_bulk((int)i);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1557 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1558 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1559 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1560 else if (have == token_rbrace) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1561 break; // done
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1562 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1563 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1564 tok.token_error("content keyword", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1565 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1566 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1567 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1568 return tsa(tok, token_semi);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1569 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1570
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1571
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1572 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1573 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1574 bool parse_envto(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1575 bool parse_envto(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1576 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1577 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1578 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1579 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1580 if (have == token_rbrace) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1581 if (have == token_semi) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1582 // optional separators
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1583 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1584 else if (have == token_dccto) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1585 const char *flavor = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1586 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1587 bool keeping = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1588 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1589 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1590 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1591 if (have == token_rbrace) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1592 if (have == flavor) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1593 keeping = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1594 continue;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1595 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1596 else if ((have == token_ok) || (have == token_ok2) || (have == token_many)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1597 keeping = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1598 continue;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1599 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1600 if (have == token_envto) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1601 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1602 if (keeping) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1603 if (me.allow_env_to(have)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1604 me.add_to(have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1605 dc.add_to(have, &me);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1606 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1607 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1608 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1609 //else if (have == token_substitute) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1610 // if (tok.next() == token_mailhost) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1611 // have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1612 // if (keeping) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1613 // if (me.allow_env_to(have)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1614 // me.add_to(have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1615 // dc.add_to(have, &me);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1616 // }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1617 // }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1618 // }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1619 //}
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1620 tok.skipeol();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1621 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1622 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1623 else if (me.allow_env_to(have)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1624 me.add_to(have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1625 dc.add_to(have, &me);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1626 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1627 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1628 tok.token_error("user@ or user@domain.tld or domain.tld where domain.tld allowed by parent context", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1629 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1630 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1631 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1632 return tsa(tok, token_semi);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1633 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1634
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1635
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1636 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1637 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1638 bool parse_verify(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1639 bool parse_verify(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1640 const char *host = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1641 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1642 me.set_verify(host);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1643 me.set_verifier(add_verify_host(host));
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1644 return true;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1645 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1646
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1647
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1648 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1649 //
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1650 bool parse_generic(TOKEN &tok, CONFIG &dc, CONTEXT &me);
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1651 bool parse_generic(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1652 const char *regx = tok.next();
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1653 const char *msg = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1654 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1655 if (me.set_generic(regx, msg)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1656 tok.token_error("invalid regular expression %s", regx, regx);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1657 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1658 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1659 return true;
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1660 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1661
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1662
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1663 ////////////////////////////////////////////////
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1664 //
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1665 bool parse_white(TOKEN &tok, CONFIG &dc, CONTEXT &me);
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1666 bool parse_white(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1667 const char *regx = tok.next();
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1668 if (!tsa(tok, token_semi)) return false;
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1669 if (me.set_white(regx)) {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1670 tok.token_error("invalid regular expression %s", regx, regx);
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1671 return false;
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1672 }
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1673 return true;
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1674 }
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1675
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1676
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1677 ////////////////////////////////////////////////
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1678 //
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1679 bool parse_autowhite(TOKEN &tok, CONFIG &dc, CONTEXT &me);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1680 bool parse_autowhite(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1681 int days = tok.nextint();
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1682 const char *fn = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1683 if (!tsa(tok, token_semi)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1684 me.set_autowhite(fn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1685 me.set_whitelister(add_whitelister_file(fn, days));
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1686 return true;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1687 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1688
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1689
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1690 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1691 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1692 bool parse_envfrom(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1693 bool parse_envfrom(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1694 const char *st = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1695 if ((st == token_black) || (st == token_white) || (st == token_unknown) || (st == token_inherit)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1696 me.set_from_default(st);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1697 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1698 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1699 tok.push(st);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1700 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1701 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1702 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1703 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1704 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1705 if (have == token_rbrace) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1706 if (have == token_semi) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1707 // optional separators
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1708 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1709 else if (have == token_dccfrom) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1710 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1711 bool keeping = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1712 bool many = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1713 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1714 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1715 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1716 if (have == token_rbrace) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1717 if (have == token_ok) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1718 keeping = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1719 many = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1720 continue;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1721 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1722 else if (have == token_many) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1723 keeping = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1724 many = true;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1725 continue;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1726 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1727 else if (have == token_ok2) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1728 keeping = false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1729 continue;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1730 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1731 if (have == token_envfrom) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1732 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1733 if (keeping) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1734 me.add_from(have, (many) ? token_black : token_white);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1735 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1736 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1737 else if (have == token_substitute) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1738 if (tok.next() == token_mailhost) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1739 have = tok.next();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1740 me.add_from(have, (many) ? token_black : token_white);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1741 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1742 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1743 tok.skipeol();
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1744 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1745 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1746 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1747 // may be a valid email address or domain name
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1748 const char *st = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1749 if ((st == token_white) || (st == token_black) || (st == token_unknown) || (st == token_inherit)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1750 me.add_from(have, st);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1751 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1752 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1753 CONTEXTP con = me.find_from_context_name(st);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1754 if (con) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1755 me.add_from_context(have, con);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1756 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1757 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1758 tok.token_error("white/black/unknown/inherit or child context name", st);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1759 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1760 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1761 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1762 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1763 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1764 return tsa(tok, token_semi);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1765 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1766
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1767
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1768 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1769 //
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1770 bool parse_rate(TOKEN &tok, CONFIG &dc, CONTEXT &me);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1771 bool parse_rate(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1772 me.set_default_rate_limit(tok.nextint());
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1773 me.set_daily_rate_multiple(tok.nextint());
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1774 me.set_default_address_limit(tok.nextint());
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1775 me.set_daily_address_multiple(tok.nextint());
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1776 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1777 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1778 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1779 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1780 if (have == token_rbrace) break;
278
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1781 me.add_rate_limit(have, tok.nextint());
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1782 me.add_address_limit(have, tok.nextint());
368572c57013 add limits on unique ip addresses per hour per authenticated user
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1783 if (!tsa(tok, token_semi)) return false;
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1784 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1785 return tsa(tok, token_semi);
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1786 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1787
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1788
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1789 ////////////////////////////////////////////////
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1790 //
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1791 bool parse_context(TOKEN &tok, CONFIG &dc, CONTEXTP parent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1792 bool parse_context(TOKEN &tok, CONFIG &dc, CONTEXTP parent) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1793 const char *name = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1794 if (!tsa(tok, token_lbrace)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1795 CONTEXTP con = new CONTEXT(parent, name);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1796
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1797 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1798 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1799 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1800 if (have == token_rbrace) break; // done
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1801 if (have == token_dnsbl) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1802 if (!parse_dnsbl(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1803 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1804 else if (have == token_dnsbll) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1805 if (!parse_dnsbll(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1806 }
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1807 else if (have == token_dnswl) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1808 if (!parse_dnswl(tok, dc, *con)) return false;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1809 }
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1810 else if (have == token_dnswll) {
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1811 if (!parse_dnswll(tok, dc, *con)) return false;
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1812 }
268
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1813 else if (have == token_requirerdns) {
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1814 if (!parse_requirerdns(tok, dc, *con)) return false;
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1815 }
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1816 else if (have == token_content) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1817 if (!parse_content(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1818 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1819 else if (have == token_envto) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1820 if (!parse_envto(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1821 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1822 else if (have == token_verify) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1823 if (!parse_verify(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1824 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1825 else if (have == token_generic) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1826 if (!parse_generic(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1827 }
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1828 else if (have == token_white_regex) {
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1829 if (!parse_white(tok, dc, *con)) return false;
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1830 }
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1831 else if (have == token_autowhite) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1832 if (!parse_autowhite(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1833 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1834 else if (have == token_envfrom) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1835 if (!parse_envfrom(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1836 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1837 else if (have == token_rate) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1838 if (parent || dc.default_context) tok.token_error("rate limit ignored in non default context");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1839 if (!parse_rate(tok, dc, *con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1840 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1841 else if (have == token_context) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1842 if (!parse_context(tok, dc, con)) return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1843 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1844 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1845 tok.token_error("context keyword", have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1846 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1847 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1848 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1849
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1850 if (!tsa(tok, token_semi)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1851 delete con;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1852 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1853 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1854 dc.add_context(con);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1855 if (parent) parent->add_context(con);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1856 return true;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1857 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1858
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1859
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1860 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1861 // parse a config file
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1862 //
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1863 bool load_conf(CONFIG &dc, const char *fn) {
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1864 int count = 0;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1865 TOKEN tok(fn, &dc.config_files);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1866 while (true) {
214
82886d4dd71f Fixes to compile on Fedora 9 and for const correctness.
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
1867 const char *have = tok.next();
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1868 if (!have) break;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1869 if (have == token_context) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1870 if (!parse_context(tok, dc, NULL)) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1871 tok.token_error("load_conf() failed to parse context");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1872 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1873 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1874 else count++;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1875 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1876 else {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1877 tok.token_error(token_context, have);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1878 return false;
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1879 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1880 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1881 tok.token_error("load_conf() found %d contexts in %s", count, fn);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1882 return (dc.default_context) ? true : false;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1883 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1884
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1885
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1886 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1887 // init the tokens
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1888 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1889 void token_init() {
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1890 token_asterisk = register_string("*");
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1891 token_autowhite = register_string("autowhite");
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1892 token_bang = register_string("!");
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1893 token_black = register_string("black");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1894 token_content = register_string("content");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1895 token_context = register_string("context");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1896 token_dccbulk = register_string("dcc_bulk_threshold");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1897 token_dccfrom = register_string("dcc_from");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1898 token_dccgrey = register_string("dcc_greylist");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1899 token_dccto = register_string("dcc_to");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1900 token_default = register_string("default");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1901 token_dnsbl = register_string("dnsbl");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1902 token_dnsbll = register_string("dnsbl_list");
249
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1903 token_dnswl = register_string("dnswl");
15bf4f68a0b2 Add dnswl support
Carl Byington <carl@five-ten-sg.com>
parents: 244
diff changeset
1904 token_dnswll = register_string("dnswl_list");
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1905 token_envfrom = register_string("env_from");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1906 token_envto = register_string("env_to");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1907 token_filter = register_string("filter");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1908 token_generic = register_string("generic");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1909 token_host_limit = register_string("host_limit");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1910 token_html_limit = register_string("html_limit");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1911 token_html_tags = register_string("html_tags");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1912 token_ignore = register_string("ignore");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1913 token_include = register_string("include");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1914 token_inherit = register_string("inherit");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1915 token_lbrace = register_string("{");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1916 token_mailhost = register_string("mail_host");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1917 token_many = register_string("many");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1918 token_no = register_string("no");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1919 token_off = register_string("off");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1920 token_ok = register_string("ok");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1921 token_ok2 = register_string("ok2");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1922 token_on = register_string("on");
270
f92f24950bd3 Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
Carl Byington <carl@five-ten-sg.com>
parents: 268
diff changeset
1923 token_period = register_string(".");
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1924 token_rate = register_string("rate_limit");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1925 token_rbrace = register_string("}");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1926 token_require = register_string("require_match");
268
f941563c2a95 Add require_rdns checking
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1927 token_requirerdns = register_string("require_rdns");
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1928 token_semi = register_string(";");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1929 token_soft = register_string("soft");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1930 token_spamassassin = register_string("spamassassin");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1931 token_substitute = register_string("substitute");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1932 token_tld = register_string("tld");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1933 token_unknown = register_string("unknown");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1934 token_uribl = register_string("uribl");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1935 token_verify = register_string("verify");
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1936 token_white = register_string("white");
233
5c3e9bf45bb5 Add whitelisting by regex expression filtering.
Carl Byington <carl@five-ten-sg.com>
parents: 214
diff changeset
1937 token_white_regex = register_string("white_regex");
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1938 token_yes = register_string("yes");
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1939
192
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1940 if (gethostname(myhostname, HOST_NAME_MAX+1) != 0) {
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1941 strncpy(myhostname, "localhost", HOST_NAME_MAX+1);
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1942 }
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1943 myhostname[HOST_NAME_MAX] = '\0'; // ensure null termination
8f4a9a37d4d9 delay autowhitelisting to avoid out of office reply bots
carl
parents: 180
diff changeset
1944 token_myhostname = register_string(myhostname);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1945 }