annotate src/context.cpp @ 174:da0c41b9f672

don't whitelist addresses with embedded spaces
author carl
date Sun, 23 Sep 2007 11:20:12 -0700
parents 83fe0be032c1
children e726e1a61ef9
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
152
c7fc218686f5 gpl3, block mail to recipients that cannot reply
carl
parents: 149
diff changeset
3 Copyright (c) 2007 Carl Byington - 510 Software Group, released under
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>
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
21
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
22 static char* context_version="$Id$";
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
23
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
24 char *token_autowhite;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
25 char *token_black;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
26 char *token_content;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
27 char *token_context;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
28 char *token_dccfrom;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
29 char *token_dccto;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
30 char *token_default;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
31 char *token_dnsbl;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
32 char *token_dnsbll;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
33 char *token_envfrom;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
34 char *token_envto;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
35 char *token_filter;
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
36 char *token_generic;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
37 char *token_host_limit;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
38 char *token_html_limit;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
39 char *token_html_tags;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
40 char *token_ignore;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
41 char *token_include;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
42 char *token_inherit;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
43 char *token_lbrace;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
44 char *token_mailhost;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
45 char *token_many;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
46 char *token_off;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
47 char *token_ok2;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
48 char *token_ok;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
49 char *token_on;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
50 char *token_rate;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
51 char *token_rbrace;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
52 char *token_semi;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
53 char *token_soft;
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
54 char *token_spamassassin;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
55 char *token_substitute;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
56 char *token_tld;
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
57 char *token_cctld;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
58 char *token_unknown;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
59 char *token_uribl;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
60 char *token_verify;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
61 char *token_white;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
62
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
63 char *token_myhostname;
96
1edd4e8d3a60 fix missing include, not all systems define HOST_NAME_MAX
carl
parents: 94
diff changeset
64 #ifndef HOST_NAME_MAX
1edd4e8d3a60 fix missing include, not all systems define HOST_NAME_MAX
carl
parents: 94
diff changeset
65 #define HOST_NAME_MAX 255
1edd4e8d3a60 fix missing include, not all systems define HOST_NAME_MAX
carl
parents: 94
diff changeset
66 #endif
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
67 char myhostname[HOST_NAME_MAX+1];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
68
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
69 pthread_mutex_t verifier_mutex; // protect the verifier map
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
70 verify_map verifiers;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
71
173
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
72 pthread_mutex_t whitelister_mutex; // protect the whitelisters map
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
73 whitelister_map whitelisters;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
74
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
75 string_set all_strings; // owns all the strings, only modified by the config loader thread
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
76 const int maxlen = 1000; // used for snprintf buffers
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
77 const int maxsmtp_age = 120;// smtp verify sockets older than this are ancient
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
78 const int maxauto_age = 600;// auto whitelister delay before flushing to file
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
79 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
80 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
81
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
82
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
83 int SMTP::writer() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
84 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
85 log("writer() sees buffer with %s", buffer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
86 log("writer() sees error %d", (int)error);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
87 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
88 int rs = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
89 if (!error) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
90 int len = strlen(buffer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
91 while (rs < len) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
92 int ws = write(fd, buffer+rs, len-rs);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
93 if (ws > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
94 rs += ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
95 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
96 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
97 // peer closed the socket!
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
98 rs = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
99 error = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
100 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
101 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
102 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
103 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
104 return rs;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
105 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
106
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
107
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
108 int SMTP::reader() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
109 // read some bytes terminated by lf or end of buffer.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
110 // we may have a multi line response or part thereof in the buffer.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
111 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
112 log("reader() sees error %d", (int)error);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
113 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
114 if (error) return 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
115 int len = maxlen-1; // room for null terminator
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
116 while (pending < len) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
117 int ws = read(fd, buffer+pending, len-pending);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
118 if (ws > 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
119 pending += ws;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
120 if (buffer[pending-1] == '\n') break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
121 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
122 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
123 // peer closed the socket!
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
124 pending = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
125 error = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
126 break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
127 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
128 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
129 buffer[pending] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
130 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
131 log("reader() sees buffer with %s", buffer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
132 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
133 return pending;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
134 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
135
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
136
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
137 int SMTP::read_line() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
138 char *lf = strchr(buffer, '\n');
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
139 if (!lf) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
140 reader(); // get a lf
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
141 lf = strchr(buffer, '\n');
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
142 if (!lf) lf = buffer + pending - 1;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
143 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
144 return (lf-buffer)+1; // number of bytes in this line
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
97
cc3b79349c9c fix int function not returning value
carl
parents: 96
diff changeset
148 void SMTP::flush_line(int r) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
149 if (pending > r) memmove(buffer, buffer+r, pending-r);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
150 pending -= r;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
151 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
152
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
153
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
154 int SMTP::read_response() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
155 pending = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
156 buffer[pending] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
157 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
158 int r = read_line();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
159 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
160 log("read_response() sees line with %s", buffer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
161 log("read_response() sees line length %d", r);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
162 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
163 if (r == 0) return 0; // failed to read any bytes
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
164 if ((r > 4) && (buffer[3] == '-')) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
165 flush_line(r);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
166 continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
167 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
168 return atoi(buffer);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
169 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
170 return 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
171 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
172
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
173
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
174 int SMTP::cmd(char *c) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
175 if (c) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
176 init();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
177 append(c);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
178 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
179 append("\r\n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
180 writer();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
181 return read_response();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
182 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
183
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
184
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
185 int SMTP::helo() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
186 if (read_response() != 220) return 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
187 init();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
188 append("HELO ");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
189 append(token_myhostname);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
190 return cmd(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
191 }
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 int SMTP::rset() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
195 int rc = cmd("RSET");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
196 efrom[0] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
197 return rc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
198 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
199
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
200
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
201 int SMTP::from(char *f) {
101
6ac7ba4a8312 fix <> passed as <<>> to verification hosts
carl
parents: 100
diff changeset
202 // the mail from address was originally passed in from sendmail enclosed in
6ac7ba4a8312 fix <> passed as <<>> to verification hosts
carl
parents: 100
diff changeset
203 // <>. to_lower_string() removed the <> and converted the rest to lowercase,
6ac7ba4a8312 fix <> passed as <<>> to verification hosts
carl
parents: 100
diff changeset
204 // except in the case of an empty return path, which was left as the two
6ac7ba4a8312 fix <> passed as <<>> to verification hosts
carl
parents: 100
diff changeset
205 // character string <>.
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
206 if (strncmp(efrom, f, maxlen)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
207 rset();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
208 strncpy(efrom, f, maxlen);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
209 init();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
210 append("MAIL FROM:<");
101
6ac7ba4a8312 fix <> passed as <<>> to verification hosts
carl
parents: 100
diff changeset
211 if (*f != '<') append(f);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
212 append(">");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
213 return cmd(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
214 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
215 return 250; // pretend it worked
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
216 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
217
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
218
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
219 int SMTP::rcpt(char *t) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
220 init();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
221 append("RCPT TO:<");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
222 append(t);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
223 append(">");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
224 return cmd(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
225 }
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 int SMTP::quit() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
229 return cmd("QUIT");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
230 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
231
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
232
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
233 void SMTP::closefd() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
234 shutdown(fd, SHUT_RDWR);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
235 close(fd);
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
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
239 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
240 void SMTP::log(char *m, int v) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
241 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
242 snprintf(buf, maxlen, m, v);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
243 my_syslog(buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
244 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
245
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
246
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
247 void SMTP::log(char *m, char *v) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
248 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
249 snprintf(buf, maxlen, m, v);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
250 my_syslog(buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
251 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
252 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
253
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
254
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
255 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
256 // smtp verifier so backup mx machines can see the valid users
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
257 //
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
258 VERIFY::VERIFY(char *h) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
259 host = h;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
260 last_err = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
261 pthread_mutex_init(&mutex, 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
262 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
263
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
264
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
265 void VERIFY::closer() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
266 bool ok = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
267 while (ok) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
268 SMTP *conn = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
269 pthread_mutex_lock(&mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
270 if (connections.empty()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
271 ok = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
272 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
273 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
274 conn = connections.front();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
275 time_t now = time(NULL);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
276 if ((now - conn->get_stamp()) > maxsmtp_age) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
277 // this connection is ancient, remove it
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
278 connections.pop_front();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
279 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
280 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
281 ok = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
282 conn = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
283 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
284 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
285 pthread_mutex_unlock(&mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
286 // avoid doing this work inside the mutex lock
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
287 if (conn) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
288 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
289 conn->log("closer() closes ancient %d", conn->get_fd());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
290 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
291 delete conn;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
292 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
293 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
294 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
295
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
296
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
297 SMTP* VERIFY::get_connection() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
298 SMTP *conn = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
299 pthread_mutex_lock(&mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
300 if (!connections.empty()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
301 conn = connections.front();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
302 connections.pop_front();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
303 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
304 conn->log("get_connection() %d from cache", conn->get_fd());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
305 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
306 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
307 pthread_mutex_unlock(&mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
308 if (conn) return conn;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
309 int sock = NULL_SOCKET;
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 119
diff changeset
310 if ((time(NULL) - last_err) > ERROR_SMTP_SOCKET_TIME) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
311 // nothing recent, maybe this time it will work
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
312 hostent *h = gethostbyname(host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
313 if (h) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
314 sockaddr_in server;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
315 server.sin_family = h->h_addrtype;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
316 server.sin_port = htons(25);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
317 memcpy(&server.sin_addr, h->h_addr_list[0], h->h_length);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
318 sock = socket(PF_INET, SOCK_STREAM, 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
319 if (sock != NULL_SOCKET) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
320 bool rc = (connect(sock, (sockaddr *)&server, sizeof(server)) == 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
321 if (!rc) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
322 shutdown(sock, SHUT_RDWR);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
323 close(sock);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
324 sock = NULL_SOCKET;
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 119
diff changeset
325 last_err = time(NULL);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
326 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
327 }
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 119
diff changeset
328 else last_err = time(NULL);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
329 }
129
c5cd1261394d ignore smtp connection attempts for 10 minutes when getting connection errors on verify hosts
carl
parents: 119
diff changeset
330 else last_err = time(NULL);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
331 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
332 if (sock != NULL_SOCKET) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
333 conn = new SMTP(sock);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
334 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
335 conn->log("get_connection() %d new socket", conn->get_fd());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
336 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
337 if (conn->helo() == 250) return conn;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
338 delete conn;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
339 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
340 return NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
341 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
342
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
343
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
344 void VERIFY::put_connection(SMTP *conn) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
345 if (conn->err()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
346 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
347 conn->log("put_socket() %d with error, close it", conn->get_fd());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
348 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
349 delete conn;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
350 last_err = time(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
351 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
352 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
353 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
354 conn->log("put_socket() %d", conn->get_fd());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
355 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
356 conn->now();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
357 pthread_mutex_lock(&mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
358 connections.push_back(conn);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
359 pthread_mutex_unlock(&mutex);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
360 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
361 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
362
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
363
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
364 bool VERIFY::ok(char *from, char *to) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
365 if (host == token_myhostname) return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
366 SMTP *conn = get_connection();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
367 if (!conn) return true; // cannot verify right now, we have socket errors
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
368 int rc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
369 rc = conn->from(from);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
370 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
371 conn->log("verify::ok() from sees %d", rc);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
372 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
373 if (rc != 250) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
374 conn->rset();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
375 put_connection(conn);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
376 return (rc >= 500) ? false : true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
377 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
378 rc = conn->rcpt(to);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
379 #ifdef VERIFY_DEBUG
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
380 conn->log("verify::ok() rcpt sees %d", rc);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
381 #endif
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
382 put_connection(conn);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
383 return (rc >= 500) ? false : true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
384 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
385
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
386
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
387 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
388 // setup a new smtp verify host
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
389 //
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
390 VERIFYP add_verify_host(char *host);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
391 VERIFYP add_verify_host(char *host) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
392 VERIFYP rc = NULL;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
393 pthread_mutex_lock(&verifier_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
394 verify_map::iterator i = verifiers.find(host);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
395 if (i == verifiers.end()) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
396 rc = new VERIFY(host);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
397 verifiers[host] = rc;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
398 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
399 else rc = (*i).second;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
400 pthread_mutex_unlock(&verifier_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
401 return rc;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
402 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
403
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
404
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
405 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
406 // thread to check for verify hosts with old sockets that we can close
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
407 //
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
408 void* verify_closer(void *arg) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
409 while (true) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
410 sleep(maxsmtp_age);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
411 pthread_mutex_lock(&verifier_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
412 for (verify_map::iterator i=verifiers.begin(); i!=verifiers.end(); i++) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
413 VERIFYP v = (*i).second;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
414 v->closer();
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
415 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
416 pthread_mutex_unlock(&verifier_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
417 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
418 return NULL;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
419 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
420
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
421
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
422 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
423 // automatic whitelister
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
424 //
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
425 WHITELISTER::WHITELISTER(char *f, int d) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
426 fn = f;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
427 days = d;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
428 pthread_mutex_init(&mutex, 0);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
429 need = false;
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
430 loaded = time(NULL);
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
431 merge();
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
432 }
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
433
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
434
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
435 void WHITELISTER::merge() {
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
436 time_t now = time(NULL);
154
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
437 ifstream ifs;
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
438 ifs.open(fn);
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
439 if (!ifs.fail()) {
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
440 const int maxlen = 1000;
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
441 char buf[maxlen];
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
442 while (ifs.getline(buf, maxlen)) {
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
443 char *p = strchr(buf, ' ');
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
444 if (p) {
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
445 *p = '\0';
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
446 char *who = strdup(buf);
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
447 time_t when = atoi(p+1);
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
448 if ((when == 0) || (when > now)) when = now;
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
449 autowhite_sent::iterator i = rcpts.find(who);
173
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
450 if (i == rcpts.end()) {
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
451 rcpts[who] = when;
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
452 }
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
453 else {
173
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
454 time_t wh = (*i).second;
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
455 if (when > wh) (*i).second = when;
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
456 free(who);
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
457 }
154
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
458 }
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
459 }
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
460 }
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
461 ifs.close();
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
462 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
463
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
464
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
465 void WHITELISTER::writer() {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
466 pthread_mutex_lock(&mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
467 time_t limit = time(NULL) - days*86400;
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
468
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
469 // check for manually modified autowhitelist file
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
470 struct stat st;
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
471 if (stat(fn, &st)) need = true; // file has disappeared
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
472 else if (st.st_mtime > loaded) {
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
473 // file has been manually updated, merge new entries
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
474 merge();
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
475 need = true;
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
476 }
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
477
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
478 // purge old entries
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
479 for (autowhite_sent::iterator i=rcpts.begin(); i!=rcpts.end();) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
480 time_t when = (*i).second;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
481 if (when < limit) {
154
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
482 char *who = (*i).first;
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
483 free(who);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
484 autowhite_sent::iterator j = i;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
485 j++;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
486 rcpts.erase(i);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
487 i = j;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
488 need = true;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
489 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
490 else i++;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
491 }
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
492
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
493 if (need) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
494 // dump the file
154
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
495 ofstream ofs;
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
496 ofs.open(fn);
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
497 if (!ofs.fail()) {
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
498 for (autowhite_sent::iterator i=rcpts.begin(); i!=rcpts.end(); i++) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
499 char *who = (*i).first;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
500 int when = (*i).second;
174
da0c41b9f672 don't whitelist addresses with embedded spaces
carl
parents: 173
diff changeset
501 if (!strchr(who, ' ')) {
da0c41b9f672 don't whitelist addresses with embedded spaces
carl
parents: 173
diff changeset
502 ofs << who << " " << when << endl;
da0c41b9f672 don't whitelist addresses with embedded spaces
carl
parents: 173
diff changeset
503 }
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
504 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
505 }
154
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
506 ofs.close();
156
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
507 need = false;
160
b3ed72ee6564 allow manual updates to auto whitelist files
carl
parents: 156
diff changeset
508 loaded = time(NULL); // update load time
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
509 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
510 pthread_mutex_unlock(&mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
511 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
512
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
513
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
514 void WHITELISTER::sent(char *to) {
154
89ce226e5383 add auto whitelisting
carl
parents: 153
diff changeset
515 // we take ownership of the string
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
516 pthread_mutex_lock(&mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
517 need = true;
173
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
518 autowhite_sent::iterator i = rcpts.find(to);
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
519 if (i == rcpts.end()) {
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
520 rcpts[to] = time(NULL);
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
521 }
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
522 else {
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
523 (*i).second = time(NULL);
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
524 free(to);
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
525 }
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
526 pthread_mutex_unlock(&mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
527 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
528
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
529
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
530 bool WHITELISTER::is_white(char *from) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
531 pthread_mutex_lock(&mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
532 autowhite_sent::iterator i = rcpts.find(from);
162
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 160
diff changeset
533 bool rc = (i != rcpts.end());
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
534 pthread_mutex_unlock(&mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
535 return rc;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
536 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
537
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
538
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
539 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
540 // setup a new auto whitelister file
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
541 //
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
542 WHITELISTERP add_whitelister_file(char *fn, int days);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
543 WHITELISTERP add_whitelister_file(char *fn, int days) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
544 WHITELISTERP rc = NULL;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
545 pthread_mutex_lock(&whitelister_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
546 whitelister_map::iterator i = whitelisters.find(fn);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
547 if (i == whitelisters.end()) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
548 rc = new WHITELISTER(fn, days);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
549 whitelisters[fn] = rc;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
550 }
156
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
551 else {
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
552 rc = (*i).second;
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
553 rc->set_days(days);
a220bfb9211f add auto whitelisting
carl
parents: 154
diff changeset
554 }
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
555 pthread_mutex_unlock(&whitelister_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
556 return rc;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
557 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
558
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
559
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
560 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
561 // thread to check for whitelister hosts with old sockets that we can close
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
562 //
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
563 void* whitelister_writer(void *arg) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
564 while (true) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
565 sleep(maxauto_age);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
566 pthread_mutex_lock(&whitelister_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
567 for (whitelister_map::iterator i=whitelisters.begin(); i!=whitelisters.end(); i++) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
568 WHITELISTERP v = (*i).second;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
569 v->writer();
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
570 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
571 pthread_mutex_unlock(&whitelister_mutex);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
572 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
573 return NULL;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
574 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
575
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
576
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
577 DNSBL::DNSBL(char *n, char *s, char *m) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
578 name = n;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
579 suffix = s;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
580 message = m;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
581 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
582
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
583
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
584 bool DNSBL::operator==(const DNSBL &rhs) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
585 return (strcmp(name, rhs.name) == 0) &&
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
586 (strcmp(suffix, rhs.suffix) == 0) &&
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
587 (strcmp(message, rhs.message) == 0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
588 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
589
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
590
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
591 CONFIG::CONFIG() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
592 reference_count = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
593 generation = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
594 load_time = 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
595 default_context = NULL;
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
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
599 CONFIG::~CONFIG() {
146
7278c9766e26 free old configs when last reference goes away
carl
parents: 145
diff changeset
600 if (debug_syslog) {
7278c9766e26 free old configs when last reference goes away
carl
parents: 145
diff changeset
601 char buf[maxlen];
7278c9766e26 free old configs when last reference goes away
carl
parents: 145
diff changeset
602 snprintf(buf, sizeof(buf), "freeing memory for old configuration generation %d", generation);
7278c9766e26 free old configs when last reference goes away
carl
parents: 145
diff changeset
603 my_syslog(buf);
7278c9766e26 free old configs when last reference goes away
carl
parents: 145
diff changeset
604 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
605 for (context_list::iterator i=contexts.begin(); i!=contexts.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
606 CONTEXT *c = *i;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
607 delete c;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
608 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
609 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
610
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
611
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
612 void CONFIG::add_context(CONTEXTP con) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
613 contexts.push_back(con);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
614 if (!default_context && !con->get_parent()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
615 // first global context
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
616 default_context = con;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
617 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
618 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
619
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
620
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
621 void CONFIG::add_to(char *to, CONTEXTP con) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
622 context_map::iterator i = env_to.find(to);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
623 if (i != env_to.end()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
624 CONTEXTP c = (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
625 if ((c != con) && (c != con->get_parent())) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
626 if (debug_syslog) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
627 char oldname[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
628 char newname[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
629 char *oldn = c->get_full_name(oldname, maxlen);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
630 char *newn = con->get_full_name(newname, maxlen);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
631 char buf[maxlen*3];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
632 snprintf(buf, maxlen*3, "both %s and %s claim envelope to %s, the second one wins", oldn, newn, to);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
633 my_syslog(buf);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
634 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
635 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
636 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
637 env_to[to] = con;
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
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
641 CONTEXTP CONFIG::find_context(char *to) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
642 context_map::iterator i = env_to.find(to);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
643 if (i != env_to.end()) return (*i).second; // found user@domain key
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
644 char *x = strchr(to, '@');
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
645 if (x) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
646 x++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
647 i = env_to.find(x);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
648 if (i != env_to.end()) return (*i).second; // found domain key
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
649 char y = *x;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
650 *x = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
651 i = env_to.find(to);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
652 *x = y;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
653 if (i != env_to.end()) return (*i).second; // found user@ key
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
654 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
655 return default_context;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
656 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
657
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
658
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
659 void CONFIG::dump() {
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
660 bool spamass = false;
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
661 if (default_context) default_context->dump(true, spamass);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
662 for (context_list::iterator i=contexts.begin(); i!=contexts.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
663 CONTEXTP c = *i;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
664 CONTEXTP p = c->get_parent();
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
665 if (!p && (c != default_context)) c->dump(false, spamass);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
666 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
667 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
668 for (context_map::iterator i=env_to.begin(); i!=env_to.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
669 char *to = (*i).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
670 CONTEXTP con = (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
671 printf("// envelope to %s \t-> context %s \n", to, con->get_full_name(buf,maxlen));
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
672 }
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
673 if (spamass && (spamc == spamc_empty)) {
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
674 printf("// *** warning - spamassassin filtering requested, but spamc not found by autoconf.\n");
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
675 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
676 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
677
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
678
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
679 CONTEXT::CONTEXT(CONTEXTP parent_, char *name_) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
680 parent = parent_;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
681 name = name_;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
682 verify_host = NULL;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
683 verifier = NULL;
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
684 generic_regx = NULL;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
685 generic_message = NULL;
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
686 autowhite_file = NULL;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
687 whitelister = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
688 env_from_default = (parent) ? token_inherit : token_unknown;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
689 content_filtering = (parent) ? parent->content_filtering : false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
690 content_suffix = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
691 content_message = NULL;
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
692 uribl_suffix = NULL;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
693 uribl_message = NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
694 host_limit = (parent) ? parent->host_limit : 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
695 host_limit_message = NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
696 host_random = (parent) ? parent->host_random : false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
697 tag_limit = (parent) ? parent->tag_limit : 0;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
698 tag_limit_message = NULL;
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
699 spamassassin_limit = (parent) ? parent->spamassassin_limit : 0;
140
4028de9b46dd cleanup smtp rate limit code
carl
parents: 136
diff changeset
700 default_rcpt_rate = INT_MAX;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
701 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
702
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
703
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
704 CONTEXT::~CONTEXT() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
705 for (dnsblp_map::iterator i=dnsbl_names.begin(); i!=dnsbl_names.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
706 DNSBLP d = (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
707 // delete the underlying DNSBL objects.
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
708 delete d;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
709 }
170
bd33eaccfed8 fix pre/post scripts in rpm spec file
carl
parents: 168
diff changeset
710 if (generic_regx) regfree(&generic_pattern);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
711 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
712
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
713
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
714 bool CONTEXT::is_parent(CONTEXTP p) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
715 if (p == parent) return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
716 if (!parent) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
717 return parent->is_parent(p);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
718 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
719
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
720
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
721 char *CONTEXT::get_full_name(char *buffer, int size) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
722 if (!parent) return name;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
723 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
724 snprintf(buffer, size, "%s.%s", parent->get_full_name(buf, maxlen), name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
725 return buffer;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
726 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
727
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
728
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
729 bool CONTEXT::set_generic(char *regx, char *msg)
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
730 {
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
731 int rc = 0;
170
bd33eaccfed8 fix pre/post scripts in rpm spec file
carl
parents: 168
diff changeset
732 if (generic_regx) regfree(&generic_pattern);
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
733 generic_regx = regx;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
734 generic_message = msg;
170
bd33eaccfed8 fix pre/post scripts in rpm spec file
carl
parents: 168
diff changeset
735 if (generic_regx) {
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
736 rc = regcomp(&generic_pattern, regx, REG_NOSUB | REG_ICASE | REG_EXTENDED);
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
737 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
738 return rc; // true iff bad pattern
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
739 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
740
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
741
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
742 char *CONTEXT::generic_match(char *client)
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
743 {
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
744 if (parent && !generic_regx) return parent->generic_match(client);
170
bd33eaccfed8 fix pre/post scripts in rpm spec file
carl
parents: 168
diff changeset
745 if (!generic_regx) return NULL;
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
746 if (0 == regexec(&generic_pattern, client, 0, NULL, 0)) {
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
747 return generic_message;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
748 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
749 return NULL;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
750 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
751
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
752
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
753 bool CONTEXT::cover_env_to(char *to) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
754 char buffer[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
755 char *x = strchr(to, '@');
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
756 if (x) x++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
757 else x = to;
144
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
758 if (*x == '\0') return true; // always allow covering addresses with no domain name, eg abuse@
100
63e8633abc34 allow empty env_to at global context to remove all restrictions on child contexts
carl
parents: 99
diff changeset
759 if (!parent && env_to.empty()) return true; // empty env_to at global level covers everything
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
760 string_set::iterator i = env_to.find(x);
144
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
761 if (i != env_to.end()) return true; // we cover the entire domain
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
762 if (x != to) {
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
763 i = env_to.find(to);
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
764 if (i != env_to.end()) return true; // we cover the specific email address
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
765 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
766 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
767 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
768
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
769
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
770 VERIFYP CONTEXT::find_verify(char *to) {
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
771 if (verifier && (verify_host != token_myhostname) && cover_env_to(to))
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
772 return verifier;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
773 else if (parent)
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
774 return parent->find_verify(to);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
775 else
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
776 return NULL;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
777 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
778
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
779
162
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 160
diff changeset
780 WHITELISTERP CONTEXT::find_autowhite(char *from, char *to) {
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 160
diff changeset
781 if (whitelister && cover_env_to(to) && !cover_env_to(from))
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
782 return whitelister;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
783 else if (parent)
162
c4bce911c276 don't add auto whitelist for A to A
carl
parents: 160
diff changeset
784 return parent->find_autowhite(from, to);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
785 else
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
786 return NULL;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
787 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
788
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
789
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
790 int CONTEXT::find_rate(char *user) {
140
4028de9b46dd cleanup smtp rate limit code
carl
parents: 136
diff changeset
791 if (rcpt_per_hour.empty()) return default_rcpt_rate;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
792 rcpt_rates::iterator i = rcpt_per_hour.find(user);
140
4028de9b46dd cleanup smtp rate limit code
carl
parents: 136
diff changeset
793 return (i == rcpt_per_hour.end()) ? default_rcpt_rate : (*i).second;
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
794 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
795
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
796
173
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
797 char *CONTEXT::find_from(char *from, bool update_white) {
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
798 if (whitelister && whitelister->is_white(from)) {
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
799 if (update_white) {
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
800 // update senders timestamp to extend the whitelisting period
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
801 if (debug_syslog > 1) {
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
802 char buf[maxlen];
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
803 char msg[maxlen];
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
804 snprintf(msg, sizeof(msg), "extend whitelist reply from <%s> in context %s", from, get_full_name(buf,maxlen));
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
805 my_syslog(msg);
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
806 }
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
807 whitelister->sent(strdup(from));
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
808 }
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
809 return token_white;
83fe0be032c1 fix leak, update timestamps when receiving auto-whitelisted sender
carl
parents: 170
diff changeset
810 }
148
9330b8d6a56b add documentation fixes, allow env_from target of inherit
carl
parents: 146
diff changeset
811 char *rc = env_from_default;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
812 string_map::iterator i = env_from.find(from);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
813 if (i != env_from.end()) rc = (*i).second; // found user@domain key
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
814 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
815 char *x = strchr(from, '@');
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
816 if (x) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
817 x++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
818 i = env_from.find(x);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
819 if (i != env_from.end()) rc = (*i).second; // found domain key
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
820 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
821 char y = *x;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
822 *x = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
823 i = env_from.find(from);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
824 *x = y;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
825 if (i != env_from.end()) rc = (*i).second; // found user@ key
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
826 }
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 if ((rc == token_inherit) && parent) return parent->find_from(from);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
830 return (rc == token_inherit) ? token_unknown : rc;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
831 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
832
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
833
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
834 CONTEXTP CONTEXT::find_context(char *from) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
835 context_map::iterator i = env_from_context.find(from);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
836 if (i != env_from_context.end()) return (*i).second; // found user@domain key
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
837 char *x = strchr(from, '@');
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
838 if (x) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
839 x++;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
840 i = env_from_context.find(x);
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
841 if (i != env_from_context.end()) return (*i).second; // found domain key
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
842 char y = *x;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
843 *x = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
844 i = env_from_context.find(from);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
845 *x = y;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
846 if (i != env_from_context.end()) return (*i).second; // found user@ key
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
847 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
848 return this;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
849 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
850
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
851
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
852 CONTEXTP CONTEXT::find_from_context_name(char *name) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
853 context_map::iterator i = children.find(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
854 if (i != children.end()) return (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
855 return NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
856 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
857
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
858
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
859 DNSBLP CONTEXT::find_dnsbl(char *name) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
860 dnsblp_map::iterator i = dnsbl_names.find(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
861 if (i != dnsbl_names.end()) return (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
862 if (parent) return parent->find_dnsbl(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
863 return NULL;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
864 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
865
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
866
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
867 char* CONTEXT::get_content_suffix() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
868 if (!content_suffix && parent) return parent->get_content_suffix();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
869 return content_suffix;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
870 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
871
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
872
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
873 char* CONTEXT::get_uribl_suffix() {
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
874 if (!uribl_suffix && parent) return parent->get_uribl_suffix();
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
875 return uribl_suffix;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
876 }
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
877
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
878
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
879 char* CONTEXT::get_content_message() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
880 if (!content_message && parent) return parent->get_content_message();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
881 return content_message;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
882 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
883
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
884
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
885 char* CONTEXT::get_uribl_message() {
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
886 if (!uribl_message && parent) return parent->get_uribl_message();
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
887 return uribl_message;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
888 }
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
889
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
890
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
891 string_set& CONTEXT::get_content_host_ignore() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
892 if (content_host_ignore.empty() && parent) return parent->get_content_host_ignore();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
893 return content_host_ignore;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
894 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
895
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
896
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
897 string_set& CONTEXT::get_content_cctlds() {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
898 if (content_cctlds.empty() && parent) return parent->get_content_cctlds();
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
899 return content_cctlds;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
900 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
901
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
902 string_set& CONTEXT::get_content_tlds() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
903 if (content_tlds.empty() && parent) return parent->get_content_tlds();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
904 return content_tlds;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
905 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
906
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
907
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
908 string_set& CONTEXT::get_html_tags() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
909 if (html_tags.empty() && parent) return parent->get_html_tags();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
910 return html_tags;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
911 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
912
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
913
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
914 dnsblp_list& CONTEXT::get_dnsbl_list() {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
915 if (dnsbl_list.empty() && parent) return parent->get_dnsbl_list();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
916 return dnsbl_list;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
917 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
918
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
919
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
920 bool CONTEXT::acceptable_content(recorder &memory, int score, string& msg) {
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
921 if (spamassassin_limit && (score > spamassassin_limit)) {
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
922 char buf[maxlen];
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
923 snprintf(buf, sizeof(buf), "Mail rejected - spam assassin score %d", score);
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
924 msg = string(buf);
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
925 return false;
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
926 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
927 if (memory.excessive_bad_tags(tag_limit)) {
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
928 msg = string(tag_limit_message);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
929 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
930 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
931 if (!host_random && memory.excessive_hosts(host_limit)) {
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
932 msg = string(host_limit_message);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
933 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
934 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
935 return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
936 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
937
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
938
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
939 void CONTEXT::dump(bool isdefault, bool &spamass, int level) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
940 char indent[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
941 int i = min(maxlen-1, level*4);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
942 memset(indent, ' ', i);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
943 indent[i] = '\0';
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
944 char buf[maxlen];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
945 char *fullname = get_full_name(buf,maxlen);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
946 printf("%s context %s { \t// %s\n", indent, name, fullname);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
947
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
948 for (dnsblp_map::iterator i=dnsbl_names.begin(); i!=dnsbl_names.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
949 char *n = (*i).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
950 DNSBL &d = *(*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
951 printf("%s dnsbl %s %s \"%s\"; \n", indent, n, d.suffix, d.message);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
952 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
953
145
9b9bab1d3c21 dump effective dnsbl_list with -c switch
carl
parents: 144
diff changeset
954 dnsblp_list dl = get_dnsbl_list();
9b9bab1d3c21 dump effective dnsbl_list with -c switch
carl
parents: 144
diff changeset
955 if (!dl.empty()) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
956 printf("%s dnsbl_list", indent);
145
9b9bab1d3c21 dump effective dnsbl_list with -c switch
carl
parents: 144
diff changeset
957 for (dnsblp_list::iterator i=dl.begin(); i!=dl.end(); i++) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
958 DNSBL &d = *(*i);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
959 printf(" %s", d.name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
960 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
961 printf("; \n");
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
962 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
963
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
964 if (content_filtering) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
965 printf("%s content on { \n", indent, env_from_default);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
966 if (content_suffix) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
967 printf("%s filter %s \"%s\"; \n", indent, content_suffix, content_message);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
968 }
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
969 if (uribl_suffix) {
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
970 printf("%s uribl %s \"%s\"; \n", indent, uribl_suffix, uribl_message);
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
971 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
972 if (!content_host_ignore.empty()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
973 printf("%s ignore { \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
974 for (string_set::iterator i=content_host_ignore.begin(); i!=content_host_ignore.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
975 printf("%s %s; \n", indent, *i);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
976 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
977 printf("%s }; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
978 }
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
979 if (!content_cctlds.empty()) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
980 printf("%s cctld { \n", indent);
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
981 printf("%s ", indent);
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
982 for (string_set::iterator i=content_cctlds.begin(); i!=content_cctlds.end(); i++) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
983 printf("%s; ", *i);
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
984 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
985 printf("\n%s }; \n", indent);
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
986 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
987 if (!content_tlds.empty()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
988 printf("%s tld { \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
989 printf("%s ", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
990 for (string_set::iterator i=content_tlds.begin(); i!=content_tlds.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
991 printf("%s; ", *i);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
992 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
993 printf("\n%s }; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
994 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
995 if (!html_tags.empty()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
996 printf("%s html_tags { \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
997 printf("%s ", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
998 for (string_set::iterator i=html_tags.begin(); i!=html_tags.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
999 printf("%s; ", *i);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1000 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1001 printf("\n%s }; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1002 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1003 if (host_limit_message) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1004 printf("%s host_limit on %d \"%s\"; \n", indent, host_limit, host_limit_message);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1005 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1006 else if (host_random) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1007 printf("%s host_limit soft %d; \n", indent, host_limit);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1008 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1009 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1010 printf("%s host_limit off; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1011 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1012 if (tag_limit_message) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1013 printf("%s html_limit on %d \"%s\"; \n", indent, tag_limit, tag_limit_message);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1014 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1015 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1016 printf("%s html_limit off; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1017 }
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1018 printf("%s spamassassin %d; \n", indent, spamassassin_limit);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1019 printf("%s }; \n", indent);
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
1020 spamass |= (spamassassin_limit != 0);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1021 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1022 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1023 printf("%s content off {}; \n", indent, env_from_default);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1024 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1025
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1026 printf("%s env_to { \t// %s\n", indent, fullname);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1027 for (string_set::iterator i=env_to.begin(); i!=env_to.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1028 printf("%s %s; \n", indent, *i);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1029 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1030 printf("%s }; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1031
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1032 if (verify_host) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1033 printf("%s verify %s; \n", indent, verify_host);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1034 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1035
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1036 if (generic_regx) {
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1037 printf("%s generic \"%s\" \n", indent, generic_regx);
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1038 printf("%s \"%s\"; \n", indent, generic_message);
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1039 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1040
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1041 if (autowhite_file && whitelister) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1042 printf("%s autowhite %d %s; \n", indent, whitelister->get_days(), autowhite_file);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1043 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1044
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1045 for (context_map::iterator i=children.begin(); i!=children.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1046 CONTEXTP c = (*i).second;
167
9b129ed78d7d actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
carl
parents: 164
diff changeset
1047 c->dump(false, spamass, level+1);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1048 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1049
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1050 printf("%s env_from %s { \t// %s\n", indent, env_from_default, fullname);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1051 if (!env_from.empty()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1052 printf("%s // white/black/unknown \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1053 for (string_map::iterator i=env_from.begin(); i!=env_from.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1054 char *f = (*i).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1055 char *t = (*i).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1056 printf("%s %s \t%s; \n", indent, f, t);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1057 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1058 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1059 if (!env_from_context.empty()) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1060 printf("%s // child contexts \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1061 for (context_map::iterator j=env_from_context.begin(); j!=env_from_context.end(); j++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1062 char *f = (*j).first;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1063 CONTEXTP t = (*j).second;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1064 printf("%s %s \t%s; \n", indent, f, t->name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1065 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1066 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1067 printf("%s }; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1068
144
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1069 if (isdefault) {
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1070 printf("%s rate_limit %d { \n", indent, default_rcpt_rate);
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1071 for (rcpt_rates::iterator j=rcpt_per_hour.begin(); j!=rcpt_per_hour.end(); j++) {
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1072 char *u = (*j).first;
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1073 int l = (*j).second;
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1074 printf("%s \"%s\" \t%d; \n", indent, u, l);
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1075 }
31ff00ea6bfb allow parent/child to share a fully qualified env_to address
carl
parents: 143
diff changeset
1076 printf("%s }; \n", indent);
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1077 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1078
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1079 printf("%s }; \n", indent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1080 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1081
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1082
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1083 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1084 // helper to discard the strings held by a string_set
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1085 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1086 void discard(string_set &s) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1087 for (string_set::iterator i=s.begin(); i!=s.end(); i++) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1088 free(*i);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1089 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1090 s.clear();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1091 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1092
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1093
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1094 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1095 // helper to register a string in a string set
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1096 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1097 char* register_string(string_set &s, char *name) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1098 string_set::iterator i = s.find(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1099 if (i != s.end()) return *i;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1100 char *x = strdup(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1101 s.insert(x);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1102 return x;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1103 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1104
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1105
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1106 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1107 // register a global string
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1108 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1109 char* register_string(char *name) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1110 return register_string(all_strings, name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1111 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1112
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1113
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1114 ////////////////////////////////////////////////
164
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1115 // clear all global strings, helper for valgrind checking
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1116 //
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1117 void clear_strings() {
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1118 discard(all_strings);
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1119 }
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1120
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1121
5809bcdc325b spamassassin changes
carl
parents: 163
diff changeset
1122 ////////////////////////////////////////////////
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1123 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1124 bool tsa(TOKEN &tok, char *token);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1125 bool tsa(TOKEN &tok, char *token) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1126 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1127 if (have == token) return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1128 tok.token_error(token, have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1129 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1130 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1131
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1132
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1133 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1134 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1135 bool parse_dnsbl(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1136 bool parse_dnsbl(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1137 char *name = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1138 char *suf = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1139 char *msg = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1140 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1141 DNSBLP dnsnew = new DNSBL(name, suf, msg);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1142 DNSBLP dnsold = me.find_dnsbl(name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1143 if (dnsold && (*dnsold == *dnsnew)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1144 // duplicate redefinition, ignore it
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1145 delete dnsnew;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1146 return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1147 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1148 me.add_dnsbl(name, dnsnew);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1149 return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1150 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1151
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1152
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1153 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1154 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1155 bool parse_dnsbll(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1156 bool parse_dnsbll(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1157 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1158 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1159 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1160 if (have == token_semi) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1161 DNSBLP dns = me.find_dnsbl(have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1162 if (dns) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1163 me.add_dnsbl(dns);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1164 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1165 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1166 tok.token_error("dnsbl name", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1167 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1168 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1169 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1170 return true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1171 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1172
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1173
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1174 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1175 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1176 bool parse_content(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1177 bool parse_content(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1178 char *setting = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1179 if (setting == token_on) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1180 me.set_content_filtering(true);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1181 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1182 else if (setting == token_off) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1183 me.set_content_filtering(false);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1184 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1185 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1186 tok.token_error("on/off", setting);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1187 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1188 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1189 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1190 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1191 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1192 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1193 if (have == token_filter) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1194 char *suffix = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1195 char *messag = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1196 me.set_content_suffix(suffix);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1197 me.set_content_message(messag);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1198 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1199 }
119
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1200 else if (have == token_uribl) {
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1201 char *suffix = tok.next();
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1202 char *messag = tok.next();
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1203 me.set_uribl_suffix(suffix);
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1204 me.set_uribl_message(messag);
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1205 if (!tsa(tok, token_semi)) return false;
d9d2f8699621 uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 117
diff changeset
1206 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1207 else if (have == token_ignore) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1208 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1209 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1210 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1211 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1212 if (have == token_rbrace) break; // done
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1213 me.add_ignore(have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1214 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1215 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1216 }
117
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1217 else if (have == token_cctld) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1218 if (!tsa(tok, token_lbrace)) return false;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1219 while (true) {
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1220 char *have = tok.next();
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1221 if (!have) break;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1222 if (have == token_rbrace) break; // done
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1223 me.add_cctld(have);
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1224 }
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1225 if (!tsa(tok, token_semi)) return false;
aa07452e641b uribl patch from Jeff Evans <jeffe@tricab.com>
carl
parents: 101
diff changeset
1226 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1227 else if (have == token_tld) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1228 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1229 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1230 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1231 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1232 if (have == token_rbrace) break; // done
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1233 me.add_tld(have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1234 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1235 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1236 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1237 else if (have == token_html_limit) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1238 have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1239 if (have == token_on) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1240 me.set_tag_limit(tok.nextint());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1241 me.set_tag_message(tok.next());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1242 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1243 else if (have == token_off) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1244 me.set_tag_limit(0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1245 me.set_tag_message(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1246 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1247 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1248 tok.token_error("on/off", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1249 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1250 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1251 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1252 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1253 else if (have == token_html_tags) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1254 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1255 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1256 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1257 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1258 if (have == token_rbrace) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1259 break; // done
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1260 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1261 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1262 me.add_tag(have); // base version
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1263 char buf[200];
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1264 snprintf(buf, sizeof(buf), "/%s", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1265 me.add_tag(register_string(buf)); // leading /
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1266 snprintf(buf, sizeof(buf), "%s/", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1267 me.add_tag(register_string(buf)); // trailing /
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1268 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1269 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1270 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1271 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1272 else if (have == token_host_limit) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1273 have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1274 if (have == token_on) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1275 me.set_host_limit(tok.nextint());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1276 me.set_host_message(tok.next());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1277 me.set_host_random(false);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1278 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1279 else if (have == token_off) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1280 me.set_host_limit(0);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1281 me.set_host_message(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1282 me.set_host_random(false);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1283 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1284 else if (have == token_soft) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1285 me.set_host_limit(tok.nextint());
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1286 me.set_host_message(NULL);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1287 me.set_host_random(true);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1288 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1289 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1290 tok.token_error("on/off/soft", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1291 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1292 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1293 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1294 }
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1295 else if (have == token_spamassassin) {
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1296 me.set_spamassassin_limit(tok.nextint());
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1297 if (!tsa(tok, token_semi)) return false;
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1298 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1299 else if (have == token_rbrace) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1300 break; // done
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1301 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1302 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1303 tok.token_error("content keyword", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1304 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1305 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1306 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1307 return tsa(tok, token_semi);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1308 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1309
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 bool parse_envto(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1314 bool parse_envto(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1315 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1316 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1317 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1318 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1319 if (have == token_rbrace) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1320 if (have == token_semi) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1321 // optional separators
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1322 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1323 else if (have == token_dccto) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1324 char *flavor = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1325 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1326 bool keeping = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1327 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1328 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1329 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1330 if (have == token_rbrace) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1331 if (have == flavor) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1332 keeping = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1333 continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1334 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1335 else if ((have == token_ok) || (have == token_ok2) || (have == token_many)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1336 keeping = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1337 continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1338 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1339 if (have == token_envto) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1340 have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1341 if (keeping) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1342 if (me.allow_env_to(have)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1343 me.add_to(have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1344 dc.add_to(have, &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1345 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1346 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1347 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1348 //else if (have == token_substitute) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1349 // if (tok.next() == token_mailhost) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1350 // have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1351 // if (keeping) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1352 // if (me.allow_env_to(have)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1353 // me.add_to(have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1354 // dc.add_to(have, &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1355 // }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1356 // }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1357 // }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1358 //}
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1359 tok.skipeol();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1360 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1361 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1362 else if (me.allow_env_to(have)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1363 me.add_to(have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1364 dc.add_to(have, &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1365 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1366 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1367 tok.token_error("user@ or user@domain.tld or domain.tld where domain.tld allowed by parent context", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1368 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1369 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1370 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1371 return tsa(tok, token_semi);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1372 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1373
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1374
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1375 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1376 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1377 bool parse_verify(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1378 bool parse_verify(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1379 char *host = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1380 if (!tsa(tok, token_semi)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1381 me.set_verify(host);
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1382 me.set_verifier(add_verify_host(host));
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1383 return true;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1384 }
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1385
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1386
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1387 ////////////////////////////////////////////////
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1388 //
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1389 bool parse_generic(TOKEN &tok, CONFIG &dc, CONTEXT &me);
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1390 bool parse_generic(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1391 char *regx = tok.next();
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1392 char *msg = tok.next();
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1393 if (!tsa(tok, token_semi)) return false;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1394 if (me.set_generic(regx, msg)) {
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1395 tok.token_error("invalid regular expression %s", regx, regx);
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1396 return false;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1397 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1398 return true;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1399 }
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1400
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1401
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1402 ////////////////////////////////////////////////
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1403 //
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1404 bool parse_autowhite(TOKEN &tok, CONFIG &dc, CONTEXT &me);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1405 bool parse_autowhite(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1406 int days = tok.nextint();
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1407 char *fn = tok.next();
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1408 if (!tsa(tok, token_semi)) return false;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1409 me.set_autowhite(fn);
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1410 me.set_whitelister(add_whitelister_file(fn, days));
99
f8963ddf7143 failed to return a value from parse_verify()
carl
parents: 97
diff changeset
1411 return true;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1412 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1413
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1414
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1415 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1416 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1417 bool parse_envfrom(TOKEN &tok, CONFIG &dc, CONTEXT &me);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1418 bool parse_envfrom(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1419 char *st = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1420 if ((st == token_black) || (st == token_white) || (st == token_unknown) || (st == token_inherit)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1421 me.set_from_default(st);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1422 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1423 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1424 tok.push(st);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1425 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1426 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1427 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1428 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1429 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1430 if (have == token_rbrace) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1431 if (have == token_semi) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1432 // optional separators
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1433 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1434 else if (have == token_dccfrom) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1435 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1436 bool keeping = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1437 bool many = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1438 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1439 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1440 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1441 if (have == token_rbrace) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1442 if (have == token_ok) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1443 keeping = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1444 many = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1445 continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1446 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1447 else if (have == token_many) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1448 keeping = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1449 many = true;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1450 continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1451 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1452 else if (have == token_ok2) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1453 keeping = false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1454 continue;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1455 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1456 if (have == token_envfrom) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1457 have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1458 if (keeping) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1459 me.add_from(have, (many) ? token_black : token_white);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1460 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1461 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1462 else if (have == token_substitute) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1463 if (tok.next() == token_mailhost) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1464 have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1465 me.add_from(have, (many) ? token_black : token_white);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1466 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1467 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1468 tok.skipeol();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1469 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1470 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1471 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1472 // may be a valid email address or domain name
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1473 char *st = tok.next();
148
9330b8d6a56b add documentation fixes, allow env_from target of inherit
carl
parents: 146
diff changeset
1474 if ((st == token_white) || (st == token_black) || (st == token_unknown) || (st == token_inherit)) {
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1475 me.add_from(have, st);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1476 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1477 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1478 CONTEXTP con = me.find_from_context_name(st);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1479 if (con) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1480 me.add_from_context(have, con);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1481 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1482 else {
148
9330b8d6a56b add documentation fixes, allow env_from target of inherit
carl
parents: 146
diff changeset
1483 tok.token_error("white/black/unknown/inherit or child context name", st);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1484 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1485 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1486 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1487 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1488 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1489 return tsa(tok, token_semi);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1490 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1491
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1492
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1493 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1494 //
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1495 bool parse_rate(TOKEN &tok, CONFIG &dc, CONTEXT &me);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1496 bool parse_rate(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
140
4028de9b46dd cleanup smtp rate limit code
carl
parents: 136
diff changeset
1497 char *def = tok.next();
141
6256cab02248 cleanup smtp rate limit code
carl
parents: 140
diff changeset
1498 tok.push(def);
6256cab02248 cleanup smtp rate limit code
carl
parents: 140
diff changeset
1499 if (def != token_lbrace) me.set_default_rate(tok.nextint());
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1500 if (!tsa(tok, token_lbrace)) return false;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1501 while (true) {
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1502 char *have = tok.next();
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1503 if (!have) break;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1504 if (have == token_rbrace) break;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1505 if (have == token_semi) {
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1506 // optional separators
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1507 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1508 else {
140
4028de9b46dd cleanup smtp rate limit code
carl
parents: 136
diff changeset
1509 me.add_rate(have, tok.nextint());
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1510 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1511 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1512 return tsa(tok, token_semi);
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1513 }
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1514
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1515
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1516 ////////////////////////////////////////////////
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1517 //
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1518 bool parse_context(TOKEN &tok, CONFIG &dc, CONTEXTP parent);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1519 bool parse_context(TOKEN &tok, CONFIG &dc, CONTEXTP parent) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1520 char *name = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1521 if (!tsa(tok, token_lbrace)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1522 CONTEXTP con = new CONTEXT(parent, name);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1523
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1524 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1525 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1526 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1527 if (have == token_rbrace) break; // done
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1528 if (have == token_dnsbl) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1529 if (!parse_dnsbl(tok, dc, *con)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1530 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1531 else if (have == token_dnsbll) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1532 if (!parse_dnsbll(tok, dc, *con)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1533 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1534 else if (have == token_content) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1535 if (!parse_content(tok, dc, *con)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1536 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1537 else if (have == token_envto) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1538 if (!parse_envto(tok, dc, *con)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1539 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1540 else if (have == token_verify) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1541 if (!parse_verify(tok, dc, *con)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1542 }
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1543 else if (have == token_generic) {
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1544 if (!parse_generic(tok, dc, *con)) return false;
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1545 }
153
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1546 else if (have == token_autowhite) {
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1547 if (!parse_autowhite(tok, dc, *con)) return false;
8d7c439bb6fa add auto whitelisting
carl
parents: 152
diff changeset
1548 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1549 else if (have == token_envfrom) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1550 if (!parse_envfrom(tok, dc, *con)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1551 }
140
4028de9b46dd cleanup smtp rate limit code
carl
parents: 136
diff changeset
1552 else if (have == token_rate) {
4028de9b46dd cleanup smtp rate limit code
carl
parents: 136
diff changeset
1553 if (parent || dc.default_context) tok.token_error("rate limit ignored in non default context");
136
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1554 if (!parse_rate(tok, dc, *con)) return false;
f4746d8a12a3 add smtp auth rate limits
carl
parents: 129
diff changeset
1555 }
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1556 else if (have == token_context) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1557 if (!parse_context(tok, dc, con)) return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1558 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1559 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1560 tok.token_error("context keyword", have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1561 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1562 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1563 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1564
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1565 if (!tsa(tok, token_semi)) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1566 delete con;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1567 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1568 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1569 dc.add_context(con);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1570 if (parent) parent->add_context(con);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1571 return true;
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
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1575 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1576 // parse a config file
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1577 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1578 bool load_conf(CONFIG &dc, char *fn) {
99
f8963ddf7143 failed to return a value from parse_verify()
carl
parents: 97
diff changeset
1579 int count = 0;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1580 TOKEN tok(fn, &dc.config_files);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1581 while (true) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1582 char *have = tok.next();
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1583 if (!have) break;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1584 if (have == token_context) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1585 if (!parse_context(tok, dc, NULL)) {
99
f8963ddf7143 failed to return a value from parse_verify()
carl
parents: 97
diff changeset
1586 tok.token_error("load_conf() failed to parse context");
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1587 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1588 }
99
f8963ddf7143 failed to return a value from parse_verify()
carl
parents: 97
diff changeset
1589 else count++;
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1590 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1591 else {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1592 tok.token_error(token_context, have);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1593 return false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1594 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1595 }
99
f8963ddf7143 failed to return a value from parse_verify()
carl
parents: 97
diff changeset
1596 tok.token_error("load_conf() found %d contexts in %s", count, fn);
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1597 return (dc.default_context) ? true : false;
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1598 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1599
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1600
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1601 ////////////////////////////////////////////////
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1602 // init the tokens
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1603 //
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1604 void token_init() {
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1605 token_autowhite = register_string("autowhite");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1606 token_black = register_string("black");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1607 token_cctld = register_string("cctld");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1608 token_content = register_string("content");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1609 token_context = register_string("context");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1610 token_dccfrom = register_string("dcc_from");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1611 token_dccto = register_string("dcc_to");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1612 token_default = register_string("default");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1613 token_dnsbl = register_string("dnsbl");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1614 token_dnsbll = register_string("dnsbl_list");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1615 token_envfrom = register_string("env_from");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1616 token_envto = register_string("env_to");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1617 token_filter = register_string("filter");
168
6bac960af6b4 add generic reverse dns filtering regex
carl
parents: 167
diff changeset
1618 token_generic = register_string("generic");
163
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1619 token_host_limit = register_string("host_limit");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1620 token_html_limit = register_string("html_limit");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1621 token_html_tags = register_string("html_tags");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1622 token_ignore = register_string("ignore");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1623 token_include = register_string("include");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1624 token_inherit = register_string("inherit");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1625 token_lbrace = register_string("{");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1626 token_mailhost = register_string("mail_host");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1627 token_many = register_string("many");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1628 token_off = register_string("off");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1629 token_ok = register_string("ok");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1630 token_ok2 = register_string("ok2");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1631 token_on = register_string("on");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1632 token_rate = register_string("rate_limit");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1633 token_rbrace = register_string("}");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1634 token_semi = register_string(";");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1635 token_soft = register_string("soft");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1636 token_spamassassin = register_string("spamassassin");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1637 token_substitute = register_string("substitute");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1638 token_tld = register_string("tld");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1639 token_unknown = register_string("unknown");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1640 token_uribl = register_string("uribl");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1641 token_verify = register_string("verify");
97d7da45fe2a spamassassin changes
carl
parents: 162
diff changeset
1642 token_white = register_string("white");
94
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1643
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1644 if (gethostname(myhostname, HOST_NAME_MAX+1) != 0) {
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1645 strncpy(myhostname, "localhost", HOST_NAME_MAX+1);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1646 }
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1647 myhostname[HOST_NAME_MAX] = '\0'; // ensure null termination
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1648 token_myhostname = register_string(myhostname);
e107ade3b1c0 fix dos line terminators
carl
parents: 92
diff changeset
1649 }