author | Sunil Nimmagadda <sunil@nimmagadda.net> |
Sun, 31 Aug 2014 16:35:51 +0500 | |
changeset 38 | 058e5ad9ba79 |
parent 37 | e3dccf824f91 |
parent 35 | dcf7a837ec0b |
child 39 | 6d2a560793d3 |
permissions | -rw-r--r-- |
0 | 1 |
/* |
2 |
* Copyright (c) 2014 Sunil Nimmagadda <sunil@nimmagadda.net> |
|
3 |
* |
|
4 |
* Permission to use, copy, modify, and distribute this software for any |
|
5 |
* purpose with or without fee is hereby granted, provided that the above |
|
6 |
* copyright notice and this permission notice appear in all copies. |
|
7 |
* |
|
8 |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
|
9 |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
|
10 |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
|
11 |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
|
12 |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
|
13 |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|
14 |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|
15 |
*/ |
|
16 |
||
17 |
#include <sys/types.h> |
|
18 |
#include <sys/socket.h> |
|
19 |
||
20 |
#include <ctype.h> |
|
21 |
#include <err.h> |
|
22 |
#include <limits.h> |
|
23 |
#include <stdio.h> |
|
24 |
#include <stdlib.h> |
|
25
ce31cbe9193a
Fix a crash during concurrent sessions TIMEOUT reported by James
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
23
diff
changeset
|
25 |
#include <string.h> |
0 | 26 |
#include <syslog.h> |
27 |
#include <unistd.h> |
|
28 |
||
29 |
#include "imsgev.h" |
|
30 |
#include "pop3d.h" |
|
31 |
#include "ssl.h" |
|
32 |
||
33 |
#define MAXLINESIZE 2048 |
|
34 |
#define TIMEOUT 600000 |
|
35 |
||
36 |
enum pop_command { |
|
37 |
CMD_STLS = 0, |
|
38 |
CMD_CAPA, |
|
39 |
CMD_USER, |
|
40 |
CMD_PASS, |
|
41 |
CMD_QUIT, |
|
42 |
CMD_STAT, |
|
43 |
CMD_RETR, |
|
44 |
CMD_LIST, |
|
45 |
CMD_DELE, |
|
46 |
CMD_RSET, |
|
47 |
CMD_TOP, |
|
48 |
CMD_UIDL, |
|
49 |
CMD_NOOP |
|
50 |
}; |
|
51 |
||
52 |
enum arg_constraint { |
|
53 |
OPTIONAL = 1, |
|
54 |
PROHIBITED, |
|
55 |
REQUIRED |
|
56 |
}; |
|
57 |
||
58 |
static struct {int code; enum arg_constraint c; const char *cmd;} commands[] = { |
|
59 |
{CMD_STLS, PROHIBITED, "STLS"}, |
|
60 |
{CMD_CAPA, PROHIBITED, "CAPA"}, |
|
61 |
{CMD_USER, REQUIRED, "USER"}, |
|
62 |
{CMD_PASS, REQUIRED, "PASS"}, |
|
63 |
{CMD_QUIT, PROHIBITED, "QUIT"}, |
|
64 |
{CMD_STAT, PROHIBITED, "STAT"}, |
|
65 |
{CMD_RETR, REQUIRED, "RETR"}, |
|
66 |
{CMD_LIST, OPTIONAL, "LIST"}, |
|
67 |
{CMD_DELE, REQUIRED, "DELE"}, |
|
68 |
{CMD_RSET, PROHIBITED, "RSET"}, |
|
69 |
{CMD_TOP, REQUIRED, "TOP"}, |
|
70 |
{CMD_UIDL, OPTIONAL, "UIDL"}, |
|
71 |
{CMD_NOOP, PROHIBITED, "NOOP"}, |
|
72 |
{-1, OPTIONAL, NULL} |
|
73 |
}; |
|
74 |
||
75 |
static void auth_request(struct session *); |
|
76 |
static void capa(struct session *); |
|
77 |
static void command(struct session *, int, char *); |
|
78 |
static void session_io(struct io *, int); |
|
79 |
static void parse(struct session *, char *); |
|
80 |
static void auth_command(struct session *, int, char *); |
|
81 |
static void trans_command(struct session *, int, char *); |
|
82 |
static void get_list_all(struct session *, int); |
|
83 |
static void get_list(struct session *, unsigned int, int); |
|
84 |
static void maildrop_imsgev(struct imsgev *, int, struct imsg *); |
|
85 |
static void handle_init(struct session *, struct imsg *); |
|
86 |
static void handle_retr(struct session *, struct imsg *); |
|
87 |
static void handle_dele(struct session *, struct imsg *); |
|
88 |
static void handle_list(struct session *, struct imsg *); |
|
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
89 |
static void handle_list_all(struct session *, struct imsg *); |
0 | 90 |
static void handle_update(struct session *, struct imsg *); |
91 |
static void needfd(struct imsgev *); |
|
92 |
static void pop3_debug(char *, ...); |
|
93 |
static void session_write(struct session *, const char *, size_t); |
|
94 |
static const char *strstate(enum state); |
|
95 |
||
96 |
struct session_tree sessions; |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
97 |
static int _pop3_debug = 0; |
0 | 98 |
|
99 |
void |
|
100 |
session_init(struct listener *l, int fd) |
|
101 |
{ |
|
102 |
struct session *s; |
|
103 |
void *ssl; |
|
104 |
extern void *ssl_ctx; |
|
105 |
||
106 |
s = xcalloc(1, sizeof(*s), "session_init"); |
|
107 |
s->l = l; |
|
108 |
if (iobuf_init(&s->iobuf, 0, 0) == -1) |
|
109 |
fatal("iobuf_init"); |
|
110 |
||
111 |
io_init(&s->io, fd, s, session_io, &s->iobuf); |
|
112 |
io_set_timeout(&s->io, TIMEOUT); |
|
113 |
s->id = arc4random(); |
|
114 |
s->state = AUTH; |
|
115 |
if (s->l->flags & POP3S) { |
|
116 |
s->flags |= POP3S; |
|
17
596dec2978b2
Remove redundant sock member in session. io already holds the sock for each session.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
8
diff
changeset
|
117 |
ssl = pop3s_init(ssl_ctx, fd); |
0 | 118 |
io_set_read(&s->io); |
119 |
io_start_tls(&s->io, ssl); |
|
120 |
return; |
|
121 |
} |
|
122 |
||
123 |
log_connect(s->id, &l->ss, l->ss.ss_len); |
|
124 |
SPLAY_INSERT(session_tree, &sessions, s); |
|
125 |
session_reply(s, "%s", "+OK pop3d ready"); |
|
126 |
io_set_write(&s->io); |
|
127 |
} |
|
128 |
||
129 |
void |
|
130 |
session_close(struct session *s, int flush) |
|
131 |
{ |
|
132 |
struct session *entry; |
|
133 |
||
134 |
entry = SPLAY_REMOVE(session_tree, &sessions, s); |
|
135 |
if (entry == NULL) { |
|
35 | 136 |
/* STARTTLS session was in progress and got interrupted */ |
0 | 137 |
logit(LOG_DEBUG, "%u: not in tree", s->id); |
138 |
entry = s; |
|
139 |
} |
|
140 |
||
141 |
if (flush) { |
|
142 |
if (entry->flags & POP3S) |
|
143 |
iobuf_flush_ssl(&entry->iobuf, entry->io.ssl); |
|
144 |
else |
|
145 |
iobuf_flush(&entry->iobuf, entry->io.sock); |
|
146 |
} |
|
147 |
||
29
9ced98f59ea6
First clear io then iobuf.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
26
diff
changeset
|
148 |
io_clear(&entry->io); |
0 | 149 |
iobuf_clear(&entry->iobuf); |
38 | 150 |
/* |
151 |
* If the session hadn't made it to TRANSACTION |
|
152 |
* iev_maildrop is not inited. |
|
153 |
*/ |
|
154 |
if (entry->iev_maildrop) { |
|
155 |
imsgev_clear(entry->iev_maildrop); |
|
156 |
entry->iev_maildrop->terminate = 1; |
|
157 |
} |
|
0 | 158 |
logit(LOG_INFO, "%u: session closed", entry->id); |
159 |
free(entry); |
|
160 |
} |
|
161 |
||
162 |
static void |
|
163 |
session_io(struct io *io, int evt) |
|
164 |
{ |
|
165 |
struct session *s = io->arg; |
|
166 |
char *line; |
|
167 |
size_t len; |
|
168 |
||
169 |
pop3_debug("%u: %s", s->id, io_strevent(evt)); |
|
170 |
switch (evt) { |
|
171 |
case IO_DATAIN: |
|
172 |
line = iobuf_getline(&s->iobuf, &len); |
|
173 |
if (line == NULL) { |
|
174 |
iobuf_normalize(&s->iobuf); |
|
175 |
break; |
|
176 |
} |
|
177 |
if (strncasecmp(line, "PASS", 4) == 0) |
|
178 |
pop3_debug(">>> PASS"); |
|
179 |
else |
|
180 |
pop3_debug(">>> %s", line); |
|
181 |
parse(s, line); |
|
182 |
break; |
|
183 |
case IO_LOWAT: |
|
184 |
if (iobuf_queued(&s->iobuf) == 0) |
|
185 |
io_set_read(io); |
|
186 |
break; |
|
187 |
case IO_TLSREADY: |
|
188 |
/* greet only for pop3s, STLS already greeted */ |
|
189 |
if (s->flags & POP3S) { |
|
190 |
log_connect(s->id, &s->l->ss, s->l->ss.ss_len); |
|
191 |
session_reply(s, "%s", "+OK pop3 ready"); |
|
192 |
io_set_write(&s->io); |
|
193 |
} |
|
194 |
SPLAY_INSERT(session_tree, &sessions, s); |
|
195 |
/* mark STLS session as secure */ |
|
196 |
s->flags |= POP3S; |
|
197 |
logit(LOG_INFO, "%u: TLS ready", s->id); |
|
198 |
break; |
|
199 |
case IO_DISCONNECTED: |
|
200 |
case IO_TIMEOUT: |
|
201 |
case IO_ERROR: |
|
202 |
session_close(s, 0); |
|
203 |
break; |
|
204 |
default: |
|
205 |
logit(LOG_DEBUG, "unknown event %s", io_strevent(evt)); |
|
206 |
break; |
|
207 |
} |
|
208 |
} |
|
209 |
||
210 |
static void |
|
211 |
parse(struct session *s, char *line) |
|
212 |
{ |
|
213 |
enum arg_constraint c = OPTIONAL; |
|
214 |
int i, cmd = -1; |
|
215 |
char *args; |
|
216 |
||
217 |
/* trim newline */ |
|
218 |
line[strcspn(line, "\n")] = '\0'; |
|
219 |
||
220 |
args = strchr(line, ' '); |
|
221 |
if (args) { |
|
222 |
*args++ = '\0'; |
|
223 |
while (isspace((unsigned char)*args)) |
|
224 |
args++; |
|
225 |
} |
|
226 |
||
227 |
for (i = 0; commands[i].code != -1; i++) { |
|
228 |
if (strcasecmp(line, commands[i].cmd) == 0) { |
|
229 |
cmd = commands[i].code; |
|
230 |
c = commands[i].c; |
|
231 |
break; |
|
232 |
} |
|
233 |
} |
|
234 |
||
235 |
if (cmd == -1) { |
|
236 |
logit(LOG_INFO, "%u: invalid command %s", s->id, line); |
|
237 |
session_reply(s, "%s", "-ERR invalid command"); |
|
238 |
io_set_write(&s->io); |
|
239 |
return; |
|
240 |
} |
|
241 |
||
242 |
if (c == PROHIBITED && args) { |
|
243 |
session_reply(s, "%s", "-ERR no arguments allowed"); |
|
244 |
io_set_write(&s->io); |
|
245 |
return; |
|
246 |
} else if ((c == REQUIRED) && |
|
247 |
(args == NULL || strlen(args) >= ARGLEN)) { |
|
248 |
session_reply(s, "%s", "-ERR args required or too long"); |
|
249 |
io_set_write(&s->io); |
|
250 |
return; |
|
251 |
} |
|
252 |
||
253 |
command(s, cmd, args); |
|
254 |
} |
|
255 |
||
256 |
static void |
|
257 |
command(struct session *s, int cmd, char *args) |
|
258 |
{ |
|
259 |
switch (s->state) { |
|
260 |
case AUTH: |
|
261 |
auth_command(s, cmd, args); |
|
262 |
break; |
|
263 |
case TRANSACTION: |
|
264 |
trans_command(s, cmd, args); |
|
265 |
break; |
|
266 |
case UPDATE: |
|
267 |
session_reply(s, "%s", "-ERR commands not allowed"); |
|
268 |
io_set_write(&s->io); |
|
269 |
break; |
|
270 |
default: |
|
271 |
fatalx("Invalid state"); |
|
272 |
} |
|
273 |
} |
|
274 |
||
275 |
static void |
|
276 |
auth_command(struct session *s, int cmd, char *args) |
|
277 |
{ |
|
278 |
extern void *ssl_ctx; |
|
279 |
void *ssl; |
|
280 |
||
281 |
switch (cmd) { |
|
282 |
case CMD_STLS: |
|
283 |
if (s->flags & POP3S) { |
|
284 |
session_reply(s, "%s", "-ERR already secured"); |
|
285 |
break; |
|
286 |
} |
|
287 |
session_reply(s, "%s", "+OK"); |
|
288 |
io_set_write(&s->io); |
|
289 |
iobuf_flush(&s->iobuf, s->io.sock); |
|
290 |
/* add back when IO_TLSREADY. */ |
|
291 |
SPLAY_REMOVE(session_tree, &sessions, s); |
|
17
596dec2978b2
Remove redundant sock member in session. io already holds the sock for each session.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
8
diff
changeset
|
292 |
ssl = pop3s_init(ssl_ctx, s->io.sock); |
0 | 293 |
io_set_read(&s->io); |
294 |
io_start_tls(&s->io, ssl); |
|
295 |
return; |
|
296 |
case CMD_CAPA: |
|
297 |
capa(s); |
|
298 |
break; |
|
299 |
case CMD_USER: |
|
21
a591c0872243
args are checked for size in parse function. Cast to void as no truncation check required here.
Sunil Nimmagadda <sunil@sunilnimmagadda.com>
parents:
17
diff
changeset
|
300 |
(void)strlcpy(s->user, args, sizeof(s->user)); |
0 | 301 |
session_reply(s, "%s", "+OK"); |
302 |
break; |
|
303 |
case CMD_PASS: |
|
304 |
if (s->user[0] == '\0') { |
|
305 |
session_reply(s, "%s", "-ERR no USER specified"); |
|
306 |
break; |
|
307 |
} |
|
21
a591c0872243
args are checked for size in parse function. Cast to void as no truncation check required here.
Sunil Nimmagadda <sunil@sunilnimmagadda.com>
parents:
17
diff
changeset
|
308 |
(void)strlcpy(s->pass, args, sizeof(s->pass)); |
0 | 309 |
auth_request(s); |
310 |
return; |
|
311 |
case CMD_QUIT: |
|
312 |
session_reply(s, "%s", "+OK"); |
|
313 |
io_set_write(&s->io); |
|
314 |
session_close(s, 1); |
|
315 |
return; |
|
316 |
default: |
|
317 |
session_reply(s, "%s", "-ERR invalid command"); |
|
318 |
break; |
|
319 |
} |
|
320 |
||
321 |
io_set_write(&s->io); |
|
322 |
} |
|
323 |
||
324 |
static void |
|
325 |
auth_request(struct session *s) |
|
326 |
{ |
|
327 |
extern struct imsgev iev_pop3d; |
|
328 |
struct auth_req req; |
|
329 |
||
330 |
memset(&req, 0, sizeof(req)); |
|
22
5529e269a78c
Equal sized buffer copy, no truncation happens.
Sunil Nimmagadda <sunil@sunilnimmagadda.com>
parents:
21
diff
changeset
|
331 |
(void)strlcpy(req.user, s->user, sizeof(req.user)); |
5529e269a78c
Equal sized buffer copy, no truncation happens.
Sunil Nimmagadda <sunil@sunilnimmagadda.com>
parents:
21
diff
changeset
|
332 |
(void)strlcpy(req.pass, s->pass, sizeof(req.pass)); |
0 | 333 |
imsgev_xcompose(&iev_pop3d, IMSG_AUTH, s->id, 0, -1, |
334 |
&req, sizeof(req), "auth_request"); |
|
335 |
} |
|
336 |
||
337 |
static void |
|
338 |
capa(struct session *s) |
|
339 |
{ |
|
340 |
session_reply(s, "%s", "+OK"); |
|
341 |
session_reply(s, "%s", "STLS"); |
|
342 |
session_reply(s, "%s", "USER"); |
|
343 |
session_reply(s, "%s", "TOP"); |
|
344 |
session_reply(s, "%s", "UIDL"); |
|
345 |
session_reply(s, "%s", "IMPLEMENTATION pop3d"); |
|
346 |
session_reply(s, "%s", "."); |
|
347 |
} |
|
348 |
||
349 |
static void |
|
350 |
trans_command(struct session *s, int cmd, char *args) |
|
351 |
{ |
|
352 |
struct retr_req retr_req; |
|
353 |
unsigned int idx, n; |
|
354 |
char *c; |
|
355 |
const char *errstr; |
|
356 |
int uidl = 0; |
|
357 |
||
358 |
memset(&retr_req, 0, sizeof(retr_req)); |
|
359 |
switch (cmd) { |
|
360 |
case CMD_CAPA: |
|
361 |
capa(s); |
|
362 |
break; |
|
363 |
case CMD_STAT: |
|
364 |
session_reply(s, "%s %zu %zu", "+OK", s->nmsgs, s->m_sz); |
|
365 |
break; |
|
366 |
case CMD_TOP: |
|
367 |
if ((c = strchr(args, ' ')) == NULL) { |
|
368 |
session_reply(s, "%s", "-ERR invalid arguments"); |
|
369 |
break; |
|
370 |
} |
|
371 |
*c++ = '\0'; |
|
372 |
n = strtonum(c, 0, UINT_MAX, &errstr); |
|
373 |
if (errstr) { |
|
374 |
session_reply(s, "%s", "-ERR invalid n"); |
|
375 |
break; |
|
376 |
} |
|
377 |
retr_req.top = 1; |
|
378 |
retr_req.ntop = n; |
|
379 |
/* FALLTRHROUGH */ |
|
380 |
case CMD_RETR: |
|
381 |
if (!get_index(s, args, &retr_req.idx)) |
|
382 |
break; |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
383 |
imsgev_xcompose(s->iev_maildrop, IMSG_MAILDROP_RETR, |
0 | 384 |
s->id, 0, -1, &retr_req, sizeof(retr_req), "trans_command"); |
385 |
return; |
|
386 |
case CMD_NOOP: |
|
387 |
session_reply(s, "%s", "+OK"); |
|
388 |
break; |
|
389 |
case CMD_DELE: |
|
390 |
if (!get_index(s, args, &idx)) |
|
391 |
break; |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
392 |
imsgev_xcompose(s->iev_maildrop, IMSG_MAILDROP_DELE, |
0 | 393 |
s->id, 0, -1, &idx, sizeof(idx), "trans_command"); |
394 |
return; |
|
395 |
case CMD_RSET: |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
396 |
imsgev_xcompose(s->iev_maildrop, IMSG_MAILDROP_RSET, |
0 | 397 |
s->id, 0, -1, NULL, 0, "trans_command"); |
398 |
return; |
|
399 |
case CMD_UIDL: |
|
400 |
uidl = 1; |
|
401 |
/* FALLTHROUGH */ |
|
402 |
case CMD_LIST: |
|
403 |
if (args) { |
|
404 |
if (!get_index(s, args, &idx)) |
|
405 |
break; |
|
406 |
get_list(s, idx, uidl); |
|
407 |
} else |
|
408 |
get_list_all(s, uidl); |
|
409 |
return; |
|
410 |
case CMD_QUIT: |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
411 |
imsgev_xcompose(s->iev_maildrop, IMSG_MAILDROP_UPDATE, |
0 | 412 |
s->id, 0, -1, NULL, 0, "trans_command"); |
413 |
session_set_state(s, UPDATE); |
|
414 |
return; |
|
415 |
default: |
|
416 |
session_reply(s, "%s", "-ERR invalid command"); |
|
417 |
break; |
|
418 |
} |
|
419 |
||
420 |
io_set_write(&s->io); |
|
421 |
} |
|
422 |
||
423 |
static void |
|
424 |
get_list_all(struct session *s, int uidl) |
|
425 |
{ |
|
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
426 |
io_pause(&s->io, IO_PAUSE_IN); |
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
427 |
session_reply(s, "+OK"); |
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
428 |
imsgev_xcompose(s->iev_maildrop, IMSG_MAILDROP_LISTALL, |
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
429 |
s->id, 0, -1, &uidl, sizeof(uidl), "list_all"); |
0 | 430 |
} |
431 |
||
432 |
static void |
|
433 |
get_list(struct session *s, unsigned int i, int uidl) |
|
434 |
{ |
|
435 |
struct list_req req; |
|
436 |
||
437 |
req.idx = i; |
|
438 |
req.uidl = uidl; |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
439 |
imsgev_xcompose(s->iev_maildrop, IMSG_MAILDROP_LIST, |
0 | 440 |
s->id, 0, -1, &req, sizeof(req), "list"); |
441 |
} |
|
442 |
||
443 |
void |
|
444 |
session_imsgev_init(struct session *s, int fd) |
|
445 |
{ |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
446 |
s->iev_maildrop = xcalloc(1, sizeof(struct imsgev), |
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
447 |
"session_imsgev_init"); |
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
448 |
imsgev_init(s->iev_maildrop, fd, NULL, maildrop_imsgev, needfd); |
38 | 449 |
imsgev_xcompose(s->iev_maildrop, IMSG_MAILDROP_INIT, s->id, 0, |
33
252e70a700c0
Give session a chance to init its imsgev. Let session initiate the
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
30
diff
changeset
|
450 |
-1, s->user, sizeof(s->user), "session_imsgev_init"); |
0 | 451 |
} |
452 |
||
453 |
static void |
|
454 |
maildrop_imsgev(struct imsgev *iev, int code, struct imsg *imsg) |
|
455 |
{ |
|
456 |
struct session key, *r; |
|
457 |
||
458 |
switch (code) { |
|
459 |
case IMSGEV_IMSG: |
|
460 |
key.id = imsg->hdr.peerid; |
|
461 |
r = SPLAY_FIND(session_tree, &sessions, &key); |
|
462 |
if (r == NULL) { |
|
463 |
logit(LOG_INFO, "%u: session not found", key.id); |
|
464 |
fatalx("session: session lost"); |
|
465 |
} |
|
466 |
switch (imsg->hdr.type) { |
|
467 |
case IMSG_MAILDROP_INIT: |
|
468 |
handle_init(r, imsg); |
|
469 |
break; |
|
470 |
case IMSG_MAILDROP_RETR: |
|
471 |
handle_retr(r, imsg); |
|
472 |
break; |
|
473 |
case IMSG_MAILDROP_DELE: |
|
474 |
handle_dele(r, imsg); |
|
475 |
break; |
|
476 |
case IMSG_MAILDROP_RSET: |
|
477 |
session_reply(r, "%s", "+OK reset"); |
|
478 |
io_set_write(&r->io); |
|
479 |
break; |
|
480 |
case IMSG_MAILDROP_LIST: |
|
481 |
handle_list(r, imsg); |
|
482 |
break; |
|
483 |
case IMSG_MAILDROP_LISTALL: |
|
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
484 |
handle_list_all(r, imsg); |
0 | 485 |
break; |
486 |
case IMSG_MAILDROP_UPDATE: |
|
487 |
handle_update(r, imsg); |
|
488 |
break; |
|
489 |
default: |
|
490 |
logit(LOG_DEBUG, "%s: unexpected imsg %u", |
|
491 |
__func__, imsg->hdr.type); |
|
492 |
break; |
|
493 |
} |
|
494 |
break; |
|
495 |
case IMSGEV_EREAD: |
|
496 |
case IMSGEV_EWRITE: |
|
497 |
case IMSGEV_EIMSG: |
|
498 |
fatal("session: imsgev read/write error"); |
|
499 |
break; |
|
37
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
500 |
case IMSGEV_DONE: |
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
501 |
free(iev); |
e3dccf824f91
Disengaging imsgev is tricky. First imsgev_clear as we know there
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
34
diff
changeset
|
502 |
break; |
0 | 503 |
} |
504 |
} |
|
505 |
||
506 |
static void |
|
507 |
handle_init(struct session *s, struct imsg *imsg) |
|
508 |
{ |
|
509 |
size_t datalen; |
|
510 |
struct stats *stats; |
|
511 |
||
512 |
datalen = imsg->hdr.len - sizeof(imsg->hdr); |
|
513 |
if (datalen) { |
|
514 |
stats = imsg->data; |
|
515 |
s->m_sz = stats->sz; |
|
516 |
s->nmsgs = stats->nmsgs; |
|
517 |
session_reply(s, "%s", "+OK maildrop ready"); |
|
518 |
io_set_write(&s->io); |
|
519 |
session_set_state(s, TRANSACTION); |
|
520 |
} else { |
|
521 |
session_reply(s, "%s", "-ERR maildrop init failed"); |
|
522 |
io_set_write(&s->io); |
|
523 |
session_close(s, 1); |
|
524 |
} |
|
525 |
} |
|
526 |
||
527 |
static void |
|
528 |
handle_retr(struct session *s, struct imsg *imsg) |
|
529 |
{ |
|
530 |
struct retr_res *r = imsg->data; |
|
531 |
FILE *fp; |
|
532 |
char *line; |
|
533 |
size_t len; |
|
534 |
||
535 |
if (imsg->fd == -1) { |
|
536 |
session_reply(s, "%s", "-ERR marked for delete"); |
|
537 |
io_set_write(&s->io); |
|
538 |
return; |
|
539 |
} |
|
540 |
||
541 |
if ((fp = fdopen(imsg->fd, "r")) == NULL) { |
|
542 |
logit(LOG_INFO, "%zu: retr failed", s->id); |
|
543 |
session_reply(s, "%s", "-ERR RETR failed"); |
|
544 |
io_set_write(&s->io); |
|
545 |
session_close(s, 1); |
|
546 |
return; |
|
547 |
} |
|
548 |
||
549 |
if (fseek(fp, r->offset, SEEK_SET) == -1) |
|
550 |
fatal("fseek"); |
|
551 |
||
552 |
session_reply(s, "%s", "+OK"); |
|
553 |
/* Ignore "From " line when type is mbox; maildir doesn't have it */ |
|
554 |
if ((line = fgetln(fp, &len)) && strncmp(line, "From ", 5)) |
|
555 |
session_write(s, line, len); |
|
556 |
||
557 |
if (r->top) { |
|
558 |
/* print headers regardless of ntop */ |
|
559 |
while ((line = fgetln(fp, &len))) { |
|
560 |
session_write(s, line, len); |
|
561 |
r->nlines -= 1; |
|
562 |
if (strncmp(line , "\n", 1) == 0) |
|
563 |
break; |
|
564 |
} |
|
565 |
||
566 |
/* print ntop lines of body */ |
|
567 |
while ((r->ntop-- > 0) && r->nlines-- && |
|
568 |
(line = fgetln(fp, &len))) |
|
569 |
session_write(s, line, len); |
|
570 |
} else |
|
571 |
while (r->nlines-- && (line = fgetln(fp, &len))) |
|
572 |
session_write(s, line, len); |
|
573 |
||
574 |
session_reply(s, "%s", "."); |
|
575 |
io_set_write(&s->io); |
|
576 |
fclose(fp); |
|
577 |
close(imsg->fd); |
|
578 |
} |
|
579 |
||
580 |
static void |
|
581 |
handle_dele(struct session *s, struct imsg *imsg) |
|
582 |
{ |
|
583 |
int *res = imsg->data; |
|
584 |
||
585 |
if (*res == 0) |
|
586 |
session_reply(s, "%s", "+OK marked for delete"); |
|
587 |
else |
|
588 |
session_reply(s, "%s", "+ERR msg already marked delete"); |
|
589 |
||
590 |
io_set_write(&s->io); |
|
591 |
} |
|
592 |
||
593 |
/* DELEted msg's hash and sz will be zero, ignore them */ |
|
594 |
static void |
|
595 |
handle_list(struct session *s, struct imsg *imsg) |
|
596 |
{ |
|
597 |
struct list_res *res = imsg->data; |
|
598 |
||
599 |
res->idx += 1; /* POP3 index is 1 based */ |
|
600 |
if (res->uidl) { |
|
601 |
if (strlen(res->u.hash)) |
|
602 |
session_reply(s, "+OK %zu %s", res->idx, res->u.hash); |
|
603 |
else |
|
604 |
session_reply(s, "-ERR marked for delete"); |
|
605 |
} else { |
|
606 |
if (res->u.sz) |
|
607 |
session_reply(s, "+OK %zu %zu", res->idx, res->u.sz); |
|
608 |
else |
|
609 |
session_reply(s, "-ERR marked for delete"); |
|
610 |
} |
|
611 |
||
612 |
io_set_write(&s->io); |
|
613 |
} |
|
614 |
||
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
615 |
/* List terminal is indicated by hash being empty string or sz = 0 */ |
0 | 616 |
static void |
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
617 |
handle_list_all(struct session *s, struct imsg *imsg) |
0 | 618 |
{ |
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
619 |
struct list_res *res = imsg->data; |
0 | 620 |
|
8
dd898f214ed7
Use correct format of listing.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
2
diff
changeset
|
621 |
res->idx += 1; /* POP3 index is 1 based */ |
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
622 |
if (res->uidl) |
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
623 |
if (strlen(res->u.hash)) |
8
dd898f214ed7
Use correct format of listing.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
2
diff
changeset
|
624 |
session_reply(s, "%zu %s", res->idx, res->u.hash); |
26
b20d78c55e91
knf and whitespace fixes.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
25
diff
changeset
|
625 |
else |
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
626 |
goto end; |
0 | 627 |
else |
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
628 |
if (res->u.sz) |
8
dd898f214ed7
Use correct format of listing.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
2
diff
changeset
|
629 |
session_reply(s, "%zu %zu", res->idx, res->u.sz); |
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
630 |
else |
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
631 |
goto end; |
0 | 632 |
|
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
633 |
return; |
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
634 |
end: |
0 | 635 |
session_reply(s, "."); |
636 |
io_set_write(&s->io); |
|
2
6e7b98264ea2
Simplify list_all handling. Send an imsg for each msg instead of
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
0
diff
changeset
|
637 |
io_resume(&s->io, IO_PAUSE_IN); |
0 | 638 |
} |
639 |
||
640 |
static void |
|
641 |
handle_update(struct session *s, struct imsg *imsg) |
|
642 |
{ |
|
643 |
int *res = imsg->data; |
|
644 |
||
645 |
if (*res == 0) |
|
646 |
session_reply(s, "%s", "+OK maildrop updated"); |
|
647 |
else |
|
648 |
session_reply(s, "%s", "-ERR maildrop update failed"); |
|
649 |
||
650 |
io_set_write(&s->io); |
|
651 |
session_close(s, 1); |
|
652 |
} |
|
653 |
||
654 |
static void |
|
655 |
needfd(struct imsgev *iev) |
|
656 |
{ |
|
657 |
/* XXX */ |
|
658 |
fatalx("session needs an fd"); |
|
659 |
} |
|
660 |
||
661 |
int |
|
662 |
session_cmp(struct session *a, struct session *b) |
|
663 |
{ |
|
664 |
if (a->id < b->id) |
|
665 |
return (-1); |
|
666 |
||
667 |
if (a->id > b->id) |
|
668 |
return (1); |
|
669 |
||
670 |
return (0); |
|
671 |
} |
|
672 |
||
673 |
void |
|
674 |
session_set_state(struct session *s, enum state newstate) |
|
675 |
{ |
|
676 |
pop3_debug("%u: %s -> %s", s->id, strstate(s->state), |
|
677 |
strstate(newstate)); |
|
678 |
s->state = newstate; |
|
679 |
} |
|
680 |
||
681 |
#define CASE(x) case x : return #x |
|
682 |
static const char * |
|
683 |
strstate(enum state state) |
|
684 |
{ |
|
685 |
static char buf[32]; |
|
686 |
||
687 |
switch (state) { |
|
688 |
CASE(AUTH); |
|
689 |
CASE(TRANSACTION); |
|
690 |
CASE(UPDATE); |
|
691 |
default: |
|
23
a65ab8b73e52
This cannot truncate unless new states are added.
Sunil Nimmagadda <sunil@sunilnimmagadda.com>
parents:
22
diff
changeset
|
692 |
(void)snprintf(buf, sizeof(buf), "%d ???", state); |
0 | 693 |
return (buf); |
694 |
} |
|
695 |
} |
|
696 |
||
697 |
void |
|
698 |
session_reply(struct session *s, char *fmt, ...) |
|
699 |
{ |
|
700 |
va_list ap; |
|
701 |
int n; |
|
702 |
char buf[MAXLINESIZE]; |
|
703 |
||
704 |
va_start(ap, fmt); |
|
705 |
n = vsnprintf(buf, sizeof(buf), fmt, ap); |
|
706 |
va_end(ap); |
|
707 |
if (n == -1 || n > MAXLINESIZE) |
|
708 |
fatalx("session_reply: response too long"); |
|
709 |
||
710 |
if (buf[0] == '+') |
|
711 |
pop3_debug("<<< +OK"); |
|
712 |
else if (buf[0] == '-') |
|
713 |
pop3_debug("<<< -ERR"); |
|
714 |
||
715 |
iobuf_xfqueue(&s->iobuf, "session_reply", "%s\r\n", buf); |
|
716 |
} |
|
717 |
||
718 |
static void |
|
719 |
session_write(struct session *s, const char *data, size_t len) |
|
720 |
{ |
|
721 |
/* remove terminating \n or \r\n if any */ |
|
722 |
if (data[len - 1] == '\n') |
|
723 |
len -= 1; |
|
724 |
||
30
fec6f692ba74
Bounds check array index. Fixes a crash when len == 1.
Sunil Nimmagadda <sunil@nimmagadda.net>
parents:
29
diff
changeset
|
725 |
if (len && data[len - 1] == '\r') |
0 | 726 |
len -= 1; |
727 |
||
728 |
/* byte stuff "." if at beginning of line */ |
|
729 |
if (data[0] == '.') |
|
730 |
iobuf_xfqueue(&s->iobuf, "session_write", "."); |
|
731 |
||
732 |
iobuf_xqueue(&s->iobuf, "session_write", data, len); |
|
733 |
/* explicitly terminate with CRLF */ |
|
734 |
iobuf_xfqueue(&s->iobuf, "session_write", "\r\n"); |
|
735 |
} |
|
736 |
||
737 |
static void |
|
738 |
pop3_debug(char *fmt, ...) |
|
739 |
{ |
|
740 |
va_list ap; |
|
741 |
char buf[MAXLINESIZE]; |
|
742 |
int n; |
|
743 |
||
744 |
if (!_pop3_debug) |
|
745 |
return; |
|
746 |
||
747 |
va_start(ap, fmt); |
|
748 |
n = vsnprintf(buf, sizeof(buf), fmt, ap); |
|
749 |
va_end(ap); |
|
750 |
if (n == -1 || n > MAXLINESIZE) |
|
751 |
fatalx("pop3_debug: response too long"); |
|
752 |
||
753 |
logit(LOG_DEBUG, "%s", buf); |
|
754 |
} |
|
755 |
||
756 |
SPLAY_GENERATE(session_tree, session, entry, session_cmp); |
|
757 |