dovecot/original-hg/dovecot-1.2: src/lib-mail/message-parser.c annotate

annotate src/lib-mail/message-parser.c @ 7086:7ed926ed7aa4 HEAD

Updated copyright notices to include year 2008.

author	Timo Sirainen <tss@iki.fi>
date	Tue, 01 Jan 2008 22:05:21 +0200
parents	414c9d631a81
children	2d58b1c2dfd0

rev	line source
7086 7ed926ed7aa4 Updated copyright notices to include year 2008. Timo Sirainen <tss@iki.fi> parents: 6940 diff changeset	1 /* Copyright (c) 2002-2008 Dovecot authors, see the included COPYING file */
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	2
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	4 #include "str.h"
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 579 diff changeset	5 #include "istream.h"
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	6 #include "rfc822-parser.h"
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	7 #include "message-parser.h"
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	8
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	9 /* RFC-2046 requires boundaries are max. 70 chars + "--" prefix + "--" suffix.
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	10 We'll add a bit more just in case. */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	11 #define BOUNDARY_END_MAX_LEN (70 + 2 + 2 + 10)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	12
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	13 struct message_boundary {
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	14 struct message_boundary *next;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	15
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	16 struct message_part *part;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	17 const char *boundary;
184 4223b9ed0c80 move size_t fixes Timo Sirainen <tss@iki.fi> parents: 169 diff changeset	18 size_t len;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	19
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	20 unsigned int epilogue_found:1;
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	21 };
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	22
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	23 struct message_parser_ctx {
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	24 pool_t parser_pool, part_pool;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	25 struct istream *input;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	26 struct message_part parts, part;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	27
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	28 enum message_header_parser_flags hdr_flags;
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	29 enum message_parser_flags flags;
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	30
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	31 const char *last_boundary;
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	32 struct message_boundary *boundaries;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	33
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	34 size_t skip;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	35 char last_chr;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	36 unsigned int want_count;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	37
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	38 struct message_header_parser_ctx *hdr_parser_ctx;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	39
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	40 int (parse_next_block)(struct message_parser_ctx ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	41 struct message_block *block_r);
1534 676995d7c0ca IMAP protocol doesn't allow server to send NULs to client. Send ascii #128 Timo Sirainen <tss@iki.fi> parents: 1532 diff changeset	42
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	43 unsigned int part_seen_content_type:1;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	44 };
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	45
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4673 diff changeset	46 message_part_header_callback_t *null_message_part_header_callback = NULL;
204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4673 diff changeset	47
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	48 static int parse_next_header_init(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	49 struct message_block *block_r);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	50 static int parse_next_body_to_boundary(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	51 struct message_block *block_r);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	52 static int parse_next_body_to_eof(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	53 struct message_block *block_r);
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	54 static int preparsed_parse_next_header_init(struct message_parser_ctx *ctx,
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	55 struct message_block *block_r);
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	56
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	57 static struct message_boundary *
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	58 boundary_find(struct message_boundary *boundaries,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	59 const unsigned char *data, size_t len)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	60 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	61 /* As MIME spec says: search from latest one to oldest one so that we
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	62 don't break if the same boundary is used in nested parts. Also the
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	63 full message line doesn't have to match the boundary, only the
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	64 beginning. */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	65 while (boundaries != NULL) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	66 if (boundaries->len <= len &&
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	67 memcmp(boundaries->boundary, data, boundaries->len) == 0)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	68 return boundaries;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	69
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	70 boundaries = boundaries->next;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	71 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	72
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	73 return NULL;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	74 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	75
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	76 static void parse_body_add_block(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	77 struct message_block *block)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	78 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	79 unsigned int missing_cr_count = 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	80 const unsigned char *data = block->data;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	81 size_t i;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	82
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	83 block->hdr = NULL;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	84
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	85 for (i = 0; i < block->size; i++) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	86 if (data[i] <= '\n') {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	87 if (data[i] == '\n') {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	88 ctx->part->body_size.lines++;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	89 if ((i > 0 && data[i-1] != '\r') \|\|
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	90 (i == 0 && ctx->last_chr != '\r'))
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	91 missing_cr_count++;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	92 } else if (data[i] == '\0')
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	93 ctx->part->flags \|= MESSAGE_PART_FLAG_HAS_NULS;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	94 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	95 }
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	96
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	97 ctx->part->body_size.physical_size += block->size;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	98 ctx->part->body_size.virtual_size += block->size + missing_cr_count;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	99
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	100 ctx->last_chr = data[i-1];
5244 aeb72263352d And more fixes Timo Sirainen <tss@iki.fi> parents: 5112 diff changeset	101 ctx->skip += block->size;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	102 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	103
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	104 static int message_parser_read_more(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	105 struct message_block *block_r)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	106 {
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	107 int ret;
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	108
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	109 if (ctx->skip > 0) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	110 i_stream_skip(ctx->input, ctx->skip);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	111 ctx->skip = 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	112 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	113
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	114 ret = i_stream_read_data(ctx->input, &block_r->data,
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	115 &block_r->size, ctx->want_count);
6586 d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	116 if (ret <= 0) {
6729 f323da4ef459 If we're at EOF but we wanted more data, return what we have so far instead Timo Sirainen <tss@iki.fi> parents: 6654 diff changeset	117 if (ret == -1 && block_r->size != 0) {
f323da4ef459 If we're at EOF but we wanted more data, return what we have so far instead Timo Sirainen <tss@iki.fi> parents: 6654 diff changeset	118 /* EOF, but we still have some data. return it. */
f323da4ef459 If we're at EOF but we wanted more data, return what we have so far instead Timo Sirainen <tss@iki.fi> parents: 6654 diff changeset	119 return 1;
f323da4ef459 If we're at EOF but we wanted more data, return what we have so far instead Timo Sirainen <tss@iki.fi> parents: 6654 diff changeset	120 }
6586 d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	121 if (ret < 0)
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	122 return ret;
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	123
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	124 if (!ctx->input->eof) {
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	125 i_assert(!ctx->input->blocking);
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	126 return 0;
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	127 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	128 }
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	129
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	130 ctx->want_count = 1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	131 return 1;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	132 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	133
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	134 static struct message_part *
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	135 message_part_append(pool_t pool, struct message_part *parent)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	136 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	137 struct message_part part, *list;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	138
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	139 part = p_new(pool, struct message_part, 1);
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	140 part->parent = parent;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	141
212 4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	142 /* set child position */
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	143 part->physical_pos =
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	144 parent->physical_pos +
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	145 parent->body_size.physical_size +
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	146 parent->header_size.physical_size;
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	147
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	148 list = &part->parent->children;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	149 while (*list != NULL)
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	150 list = &(*list)->next;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	151
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	152 *list = part;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	153 return part;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	154 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	155
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	156 static void parse_next_body_multipart_init(struct message_parser_ctx *ctx)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	157 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	158 struct message_boundary *b;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	159
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	160 b = p_new(ctx->parser_pool, struct message_boundary, 1);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	161 b->part = ctx->part;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	162 b->boundary = ctx->last_boundary;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	163 b->len = strlen(b->boundary);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	164
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	165 b->next = ctx->boundaries;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	166 ctx->boundaries = b;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	167
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	168 ctx->last_boundary = NULL;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	169 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	170
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	171 static void parse_next_body_message_rfc822_init(struct message_parser_ctx *ctx)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	172 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	173 ctx->part = message_part_append(ctx->part_pool, ctx->part);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	174 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	175
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	176 static int
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	177 boundary_line_find(struct message_parser_ctx *ctx,
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	178 const unsigned char *data, size_t size, bool full,
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	179 struct message_boundary **boundary_r)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	180 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	181 size_t i;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	182
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	183 *boundary_r = NULL;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	184
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	185 if (size < 2) {
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	186 i_assert(!full);
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	187
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	188 if (ctx->input->eof)
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	189 return -1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	190 ctx->want_count = 2;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	191 return 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	192 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	193
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	194 if (data[0] != '-' \|\| data[1] != '-') {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	195 /* not a boundary, just skip this line */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	196 return -1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	197 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	198
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	199 /* need to find the end of line */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	200 for (i = 2; i < size; i++) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	201 if (data[i] == '\n')
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	202 break;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	203 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	204 if (i == size && i < BOUNDARY_END_MAX_LEN &&
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	205 !ctx->input->eof && !full) {
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	206 /* no LF found */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	207 ctx->want_count = BOUNDARY_END_MAX_LEN;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	208 return 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	209 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	210
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	211 data += 2;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	212 size -= 2;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	213
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	214 *boundary_r = boundary_find(ctx->boundaries, data, size);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	215 if (*boundary_r == NULL)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	216 return -1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	217
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	218 (*boundary_r)->epilogue_found =
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	219 size >= (*boundary_r)->len + 2 &&
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	220 memcmp(data + (*boundary_r)->len, "--", 2) == 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	221 return 1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	222 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	223
6900 950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	224 static int parse_next_mime_header_init(struct message_parser_ctx *ctx,
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	225 struct message_block *block_r)
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	226 {
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	227 ctx->part = message_part_append(ctx->part_pool, ctx->part);
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	228 ctx->part->flags \|= MESSAGE_PART_FLAG_IS_MIME;
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	229
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	230 return parse_next_header_init(ctx, block_r);
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	231 }
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	232
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	233 static int parse_next_body_skip_boundary_line(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	234 struct message_block *block_r)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	235 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	236 size_t i;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	237 int ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	238
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	239 if ((ret = message_parser_read_more(ctx, block_r)) <= 0)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	240 return ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	241
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	242 for (i = 0; i < block_r->size; i++) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	243 if (block_r->data[i] == '\n')
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	244 break;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	245 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	246
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	247 if (i == block_r->size) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	248 parse_body_add_block(ctx, block_r);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	249 return 1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	250 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	251
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	252 /* found the LF */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	253 block_r->size = i + 1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	254 parse_body_add_block(ctx, block_r);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	255
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	256 /* a new MIME part begins */
6900 950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	257 ctx->parse_next_block = parse_next_mime_header_init;
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	258 return 1;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	259 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	260
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	261 static int parse_part_finish(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	262 struct message_boundary *boundary,
5305 43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	263 struct message_block *block_r, bool first_line)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	264 {
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	265 struct message_part *part;
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	266
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	267 if (boundary == NULL) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	268 /* message ended unexpectedly */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	269 return -1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	270 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	271
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	272 /* get back to parent MIME part, summing the child MIME part sizes
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	273 into parent's body sizes */
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	274 for (part = ctx->part; part != boundary->part; part = part->parent) {
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	275 message_size_add(&part->parent->body_size, &part->body_size);
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	276 message_size_add(&part->parent->body_size, &part->header_size);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	277 }
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	278 ctx->part = part;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	279
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	280 if (boundary->epilogue_found) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	281 /* this boundary isn't needed anymore */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	282 ctx->boundaries = boundary->next;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	283
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	284 if (ctx->boundaries != NULL)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	285 ctx->parse_next_block = parse_next_body_to_boundary;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	286 else
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	287 ctx->parse_next_block = parse_next_body_to_eof;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	288 return ctx->parse_next_block(ctx, block_r);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	289 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	290
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	291 /* forget about the boundaries we possibly skipped */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	292 ctx->boundaries = boundary;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	293
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	294 /* the boundary itself should already be in buffer. add that. */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	295 block_r->data = i_stream_get_data(ctx->input, &block_r->size);
5305 43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	296 i_assert(block_r->size >= ctx->skip + 2 + boundary->len +
43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	297 (first_line ? 0 : 1));
43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	298 block_r->data += ctx->skip;
43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	299 /* [\n]--<boundary> */
43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	300 block_r->size = (first_line ? 0 : 1) + 2 + boundary->len;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	301 parse_body_add_block(ctx, block_r);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	302
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	303 ctx->parse_next_block = parse_next_body_skip_boundary_line;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	304 return 1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	305 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	306
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	307 static int parse_next_body_to_boundary(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	308 struct message_block *block_r)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	309 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	310 struct message_boundary *boundary = NULL;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	311 const unsigned char *data;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	312 size_t i, boundary_start;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	313 int ret;
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	314 bool eof, full;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	315
6729 f323da4ef459 If we're at EOF but we wanted more data, return what we have so far instead Timo Sirainen <tss@iki.fi> parents: 6654 diff changeset	316 if ((ret = message_parser_read_more(ctx, block_r)) <= 0)
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	317 return ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	318 eof = ret == -1;
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	319 full = ret == -2;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	320
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	321 data = block_r->data;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	322 if (ctx->last_chr == '\n') {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	323 /* handle boundary in first line of message. alternatively
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	324 it's an empty line. */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	325 ret = boundary_line_find(ctx, block_r->data,
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	326 block_r->size, full, &boundary);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	327 if (ret >= 0) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	328 if (ret == 0)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	329 return 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	330
5305 43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	331 return parse_part_finish(ctx, boundary, block_r, TRUE);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	332 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	333 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	334
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	335 for (i = boundary_start = 0; i < block_r->size; i++) {
5411 bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	336 /* skip to beginning of the next line. the first line was
bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	337 handled already. */
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	338 size_t next_line_idx = block_r->size;
d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	339
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	340 for (; i < block_r->size; i++) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	341 if (data[i] == '\n') {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	342 boundary_start = i;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	343 if (i > 0 && data[i-1] == '\r')
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	344 boundary_start--;
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	345 next_line_idx = i + 1;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	346 break;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	347 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	348 }
5411 bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	349 if (boundary_start != 0) {
bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	350 /* we can skip the first lines. input buffer can't be
bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	351 full anymore. */
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	352 full = FALSE;
6586 d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	353 } else if (next_line_idx == block_r->size) {
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	354 /* no linefeeds in this block. we can just skip it. */
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	355 boundary_start = block_r->size;
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	356 full = FALSE;
5411 bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	357 }
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	358
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	359 ret = boundary_line_find(ctx, block_r->data + next_line_idx,
d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	360 block_r->size - next_line_idx, full,
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	361 &boundary);
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	362 if (ret >= 0) {
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	363 /* found / need more data */
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	364 if (ret == 0 && boundary_start == 0)
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	365 ctx->want_count += next_line_idx;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	366 break;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	367 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	368 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	369
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	370 if (i >= block_r->size) {
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	371 /* the boundary wasn't found from this data block,
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	372 we'll need more data. */
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	373 if (eof)
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	374 ret = -1;
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	375 else {
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	376 ret = 0;
5989 1a7f5c04af1d We wanted to read too many bytes when finding end boundary, which could have Timo Sirainen <tss@iki.fi> parents: 5522 diff changeset	377 ctx->want_count = (block_r->size - boundary_start) + 1;
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	378 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	379 }
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	380 i_assert(!(ret == 0 && full));
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	381
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	382 if (ret >= 0) {
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	383 /* leave CR+LF + last line to buffer */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	384 block_r->size = boundary_start;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	385 }
6904 275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	386 if (block_r->size != 0) {
5244 aeb72263352d And more fixes Timo Sirainen <tss@iki.fi> parents: 5112 diff changeset	387 parse_body_add_block(ctx, block_r);
6904 275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	388 return 1;
275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	389 }
275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	390 return ret <= 0 ? ret :
5305 43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	391 parse_part_finish(ctx, boundary, block_r, FALSE);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	392 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	393
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	394 static int parse_next_body_to_eof(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	395 struct message_block *block_r)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	396 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	397 int ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	398
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	399 if ((ret = message_parser_read_more(ctx, block_r)) <= 0)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	400 return ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	401
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	402 parse_body_add_block(ctx, block_r);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	403 return 1;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	404 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	405
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	406 static void parse_content_type(struct message_parser_ctx *ctx,
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	407 struct message_header_line *hdr)
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	408 {
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	409 struct rfc822_parser_context parser;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	410 const char key, value;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	411 string_t *content_type;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	412
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	413 if (ctx->part_seen_content_type)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	414 return;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	415 ctx->part_seen_content_type = TRUE;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	416
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	417 rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	418 (void)rfc822_skip_lwsp(&parser);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	419
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	420 content_type = t_str_new(64);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	421 if (rfc822_parse_content_type(&parser, content_type) < 0)
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	422 return;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	423
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	424 if (strcasecmp(str_c(content_type), "message/rfc822") == 0)
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	425 ctx->part->flags \|= MESSAGE_PART_FLAG_MESSAGE_RFC822;
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	426 else if (strncasecmp(str_c(content_type), "text", 4) == 0 &&
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	427 (str_len(content_type) == 4 \|\|
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	428 str_data(content_type)[4] == '/'))
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	429 ctx->part->flags \|= MESSAGE_PART_FLAG_TEXT;
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	430 else if (strncasecmp(str_c(content_type), "multipart/", 10) == 0) {
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	431 ctx->part->flags \|= MESSAGE_PART_FLAG_MULTIPART;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	432
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	433 if (strcasecmp(str_c(content_type)+10, "digest") == 0)
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	434 ctx->part->flags \|= MESSAGE_PART_FLAG_MULTIPART_DIGEST;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	435 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	436
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	437 if ((ctx->part->flags & MESSAGE_PART_FLAG_MULTIPART) == 0 \|\|
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	438 ctx->last_boundary != NULL)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	439 return;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	440
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	441 while (rfc822_parse_content_param(&parser, &key, &value) > 0) {
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	442 if (strcasecmp(key, "boundary") == 0) {
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	443 ctx->last_boundary = p_strdup(ctx->parser_pool, value);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	444 break;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	445 }
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	446 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	447 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	448
874 a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 diff changeset	449 #define MUTEX_FLAGS \
a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 diff changeset	450 (MESSAGE_PART_FLAG_MESSAGE_RFC822 \| MESSAGE_PART_FLAG_MULTIPART)
a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 diff changeset	451
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	452 static int parse_next_header(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	453 struct message_block *block_r)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	454 {
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	455 struct message_part *part = ctx->part;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	456 struct message_header_line *hdr;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	457 size_t size;
2430 7c1dc4a7db3a message_parse_header_next() can now return "need more data" with nonblocking Timo Sirainen <tss@iki.fi> parents: 2404 diff changeset	458 int ret;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	459
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	460 if (ctx->skip > 0) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	461 i_stream_skip(ctx->input, ctx->skip);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	462 ctx->skip = 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	463 }
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	464
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	465 ret = message_parse_header_next(ctx->hdr_parser_ctx, &hdr);
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	466 if (ret == 0 \|\| (ret < 0 && ctx->input->stream_errno != 0)) {
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	467 (void)i_stream_get_data(ctx->input, &size);
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	468 ctx->want_count = size + 1;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	469 return ret;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	470 }
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	471
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	472 if (hdr != NULL) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	473 if (hdr->eoh)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	474 ;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	475 else if (strcasecmp(hdr->name, "Mime-Version") == 0) {
1618 149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	476 /* it's MIME. Content-* headers are valid */
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	477 part->flags \|= MESSAGE_PART_FLAG_IS_MIME;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	478 } else if (strcasecmp(hdr->name, "Content-Type") == 0) {
6156 e18086698ebf By default assume MIME message if Content-Type: exists even if Mime-Version: Timo Sirainen <tss@iki.fi> parents: 6117 diff changeset	479 if ((ctx->flags &
e18086698ebf By default assume MIME message if Content-Type: exists even if Mime-Version: Timo Sirainen <tss@iki.fi> parents: 6117 diff changeset	480 MESSAGE_PARSER_FLAG_MIME_VERSION_STRICT) == 0)
e18086698ebf By default assume MIME message if Content-Type: exists even if Mime-Version: Timo Sirainen <tss@iki.fi> parents: 6117 diff changeset	481 part->flags \|= MESSAGE_PART_FLAG_IS_MIME;
e18086698ebf By default assume MIME message if Content-Type: exists even if Mime-Version: Timo Sirainen <tss@iki.fi> parents: 6117 diff changeset	482
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	483 if (hdr->continues)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	484 hdr->use_full_value = TRUE;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	485 else {
6940 414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6904 diff changeset	486 T_FRAME(
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6904 diff changeset	487 parse_content_type(ctx, hdr);
414c9d631a81 Replaced t_push/t_pop calls with T_FRAME() macros. Timo Sirainen <tss@iki.fi>* parents: 6904 diff changeset	488 );
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	489 }
1618 149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	490 }
149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	491
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	492 block_r->hdr = hdr;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	493 block_r->size = 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	494 return 1;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	495 }
1618 149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	496
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	497 /* end of headers */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	498 if ((part->flags & MESSAGE_PART_FLAG_MULTIPART) != 0 &&
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	499 ctx->last_boundary == NULL) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	500 /* multipart type but no message boundary */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	501 part->flags = 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	502 }
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	503 if ((part->flags & MESSAGE_PART_FLAG_IS_MIME) == 0) {
1618 149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	504 /* It's not MIME. Reset everything we found from
149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	505 Content-Type. */
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	506 part->flags = 0;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	507 ctx->last_boundary = NULL;
1618 149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	508 }
874 a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 diff changeset	509
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	510 if (!ctx->part_seen_content_type \|\|
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	511 (part->flags & MESSAGE_PART_FLAG_IS_MIME) == 0) {
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	512 if (part->parent != NULL &&
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	513 (part->parent->flags &
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	514 MESSAGE_PART_FLAG_MULTIPART_DIGEST) != 0) {
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	515 /* when there's no content-type specified and we're
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	516 below multipart/digest, assume message/rfc822
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	517 content-type */
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	518 part->flags \|= MESSAGE_PART_FLAG_MESSAGE_RFC822;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	519 } else {
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	520 /* otherwise we default to text/plain */
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	521 part->flags \|= MESSAGE_PART_FLAG_TEXT;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	522 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	523 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	524
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	525 if (message_parse_header_has_nuls(ctx->hdr_parser_ctx))
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	526 part->flags \|= MESSAGE_PART_FLAG_HAS_NULS;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	527 message_parse_header_deinit(&ctx->hdr_parser_ctx);
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	528
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	529 i_assert((part->flags & MUTEX_FLAGS) != MUTEX_FLAGS);
5 1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several Timo Sirainen <tss@iki.fi> parents: 0 diff changeset	530
5244 aeb72263352d And more fixes Timo Sirainen <tss@iki.fi> parents: 5112 diff changeset	531 ctx->last_chr = '\n';
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	532 if (ctx->last_boundary != NULL) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	533 parse_next_body_multipart_init(ctx);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	534 ctx->parse_next_block = parse_next_body_to_boundary;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	535 } else if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	536 parse_next_body_message_rfc822_init(ctx);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	537 ctx->parse_next_block = parse_next_header_init;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	538 } else if (ctx->boundaries != NULL)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	539 ctx->parse_next_block = parse_next_body_to_boundary;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	540 else
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	541 ctx->parse_next_block = parse_next_body_to_eof;
5 1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several Timo Sirainen <tss@iki.fi> parents: 0 diff changeset	542
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	543 ctx->want_count = 1;
5 1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several Timo Sirainen <tss@iki.fi> parents: 0 diff changeset	544
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	545 /* return empty block as end of headers */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	546 block_r->hdr = NULL;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	547 block_r->size = 0;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	548 return 1;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	549 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	550
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	551 static int parse_next_header_init(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	552 struct message_block *block_r)
5 1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several Timo Sirainen <tss@iki.fi> parents: 0 diff changeset	553 {
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	554 i_assert(ctx->hdr_parser_ctx == NULL);
1253 39b899338c99 A few small fixes to MIME and mail address parsers. Timo Sirainen <tss@iki.fi> parents: 1061 diff changeset	555
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	556 ctx->hdr_parser_ctx =
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	557 message_parse_header_init(ctx->input, &ctx->part->header_size,
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	558 ctx->hdr_flags);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	559 ctx->part_seen_content_type = FALSE;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	560
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	561 ctx->parse_next_block = parse_next_header;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	562 return parse_next_header(ctx, block_r);
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	563 }
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	564
6411 6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6156 diff changeset	565 static int preparsed_parse_eof(struct message_parser_ctx *ctx ATTR_UNUSED,
6a64e64fa3a3 Renamed __attr___ to ATTR_. Renamed __attrs_used__ to ATTRS_DEFINED. Timo Sirainen <tss@iki.fi> parents: 6156 diff changeset	566 struct message_block *block_r ATTR_UNUSED)
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	567 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	568 return -1;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	569 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	570
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	571 static void preparsed_skip_to_next(struct message_parser_ctx *ctx)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	572 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	573 ctx->parse_next_block = preparsed_parse_next_header_init;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	574 while (ctx->part != NULL) {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	575 if (ctx->part->next != NULL) {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	576 ctx->part = ctx->part->next;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	577 break;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	578 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	579 ctx->part = ctx->part->parent;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	580 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	581 if (ctx->part == NULL)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	582 ctx->parse_next_block = preparsed_parse_eof;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	583 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	584
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	585 static int preparsed_parse_body_finish(struct message_parser_ctx *ctx,
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	586 struct message_block *block_r)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	587 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	588 i_stream_skip(ctx->input, ctx->skip);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	589 ctx->skip = 0;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	590
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	591 preparsed_skip_to_next(ctx);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	592 return ctx->parse_next_block(ctx, block_r);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	593 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	594
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	595 static int preparsed_parse_body_more(struct message_parser_ctx *ctx,
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	596 struct message_block *block_r)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	597 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	598 uoff_t end_offset = ctx->part->physical_pos +
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	599 ctx->part->header_size.physical_size +
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	600 ctx->part->body_size.physical_size;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	601 int ret;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	602
6729 f323da4ef459 If we're at EOF but we wanted more data, return what we have so far instead Timo Sirainen <tss@iki.fi> parents: 6654 diff changeset	603 if ((ret = message_parser_read_more(ctx, block_r)) <= 0)
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	604 return ret;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	605
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	606 if (ctx->input->v_offset + block_r->size >= end_offset) {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	607 block_r->size = end_offset - ctx->input->v_offset;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	608 ctx->parse_next_block = preparsed_parse_body_finish;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	609 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	610 ctx->skip = block_r->size;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	611 return 1;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	612 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	613
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	614 static int preparsed_parse_body_init(struct message_parser_ctx *ctx,
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	615 struct message_block *block_r)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	616 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	617 uoff_t offset = ctx->part->physical_pos +
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	618 ctx->part->header_size.physical_size;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	619
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	620 i_assert(offset >= ctx->input->v_offset);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	621 i_stream_skip(ctx->input, offset - ctx->input->v_offset);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	622
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	623 ctx->parse_next_block = preparsed_parse_body_more;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	624 return preparsed_parse_body_more(ctx, block_r);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	625 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	626
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	627 static int preparsed_parse_finish_header(struct message_parser_ctx *ctx,
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	628 struct message_block *block_r)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	629 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	630 if (ctx->part->children != NULL) {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	631 ctx->parse_next_block = preparsed_parse_next_header_init;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	632 ctx->part = ctx->part->children;
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	633 } else if ((ctx->flags & MESSAGE_PARSER_FLAG_SKIP_BODY_BLOCK) == 0) {
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	634 ctx->parse_next_block = preparsed_parse_body_init;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	635 } else {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	636 preparsed_skip_to_next(ctx);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	637 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	638 return ctx->parse_next_block(ctx, block_r);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	639 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	640
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	641 static int preparsed_parse_next_header(struct message_parser_ctx *ctx,
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	642 struct message_block *block_r)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	643 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	644 struct message_header_line *hdr;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	645 size_t size;
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	646 int ret;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	647
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	648 ret = message_parse_header_next(ctx->hdr_parser_ctx, &hdr);
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	649 if (ret == 0 \|\| (ret < 0 && ctx->input->stream_errno != 0)) {
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	650 (void)i_stream_get_data(ctx->input, &size);
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	651 ctx->want_count = size + 1;
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	652 return ret;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	653 }
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	654
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	655 if (hdr != NULL) {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	656 block_r->hdr = hdr;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	657 block_r->size = 0;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	658 return 1;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	659 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	660 message_parse_header_deinit(&ctx->hdr_parser_ctx);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	661
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	662 ctx->parse_next_block = preparsed_parse_finish_header;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	663
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	664 /* return empty block as end of headers */
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	665 block_r->hdr = NULL;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	666 block_r->size = 0;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	667 return 1;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	668 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	669
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	670 static int preparsed_parse_next_header_init(struct message_parser_ctx *ctx,
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	671 struct message_block *block_r)
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	672 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	673 i_assert(ctx->hdr_parser_ctx == NULL);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	674
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	675 i_assert(ctx->part->physical_pos >= ctx->input->v_offset);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	676 i_stream_skip(ctx->input, ctx->part->physical_pos -
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	677 ctx->input->v_offset);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	678
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	679 ctx->hdr_parser_ctx =
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	680 message_parse_header_init(ctx->input, NULL, ctx->hdr_flags);
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	681
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	682 ctx->parse_next_block = preparsed_parse_next_header;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	683 return preparsed_parse_next_header(ctx, block_r);
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	684 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	685
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	686 struct message_parser_ctx *
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	687 message_parser_init(pool_t part_pool, struct istream *input,
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	688 enum message_header_parser_flags hdr_flags,
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	689 enum message_parser_flags flags)
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	690 {
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	691 struct message_parser_ctx *ctx;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	692 pool_t pool;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	693
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	694 pool = pool_alloconly_create("Message Parser", 1024);
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	695 ctx = p_new(pool, struct message_parser_ctx, 1);
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	696 ctx->parser_pool = pool;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	697 ctx->part_pool = part_pool;
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	698 ctx->hdr_flags = hdr_flags;
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	699 ctx->flags = flags;
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	700 ctx->input = input;
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	701 ctx->parts = ctx->part = part_pool == NULL ? NULL :
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	702 p_new(part_pool, struct message_part, 1);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	703 ctx->parse_next_block = parse_next_header_init;
6082 d62bddb414ef ref/unref stream when parsing it. Timo Sirainen <tss@iki.fi> parents: 5989 diff changeset	704 i_stream_ref(input);
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	705 return ctx;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	706 }
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	707
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	708 struct message_parser_ctx *
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	709 message_parser_init_from_parts(struct message_part *parts,
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	710 struct istream *input,
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	711 enum message_header_parser_flags hdr_flags,
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	712 enum message_parser_flags flags)
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	713 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	714 struct message_parser_ctx *ctx;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	715
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	716 ctx = message_parser_init(NULL, input, hdr_flags, flags);
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	717 ctx->parts = ctx->part = parts;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	718 ctx->parse_next_block = preparsed_parse_next_header_init;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	719 return ctx;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	720 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	721
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	722 struct message_part message_parser_deinit(struct message_parser_ctx *_ctx)
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	723 {
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	724 struct message_parser_ctx ctx = _ctx;
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	725 struct message_part *parts = ctx->parts;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	726
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	727 *_ctx = NULL;
6082 d62bddb414ef ref/unref stream when parsing it. Timo Sirainen <tss@iki.fi> parents: 5989 diff changeset	728 i_stream_unref(&ctx->input);
6428 7cad076906eb pool_unref() now takes ** pointer. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	729 pool_unref(&ctx->parser_pool);
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	730 return parts;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	731 }
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	732
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	733 int message_parser_parse_next_block(struct message_parser_ctx *ctx,
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	734 struct message_block *block_r)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	735 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	736 int ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	737 bool eof = FALSE;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	738
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	739 while ((ret = ctx->parse_next_block(ctx, block_r)) == 0) {
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	740 ret = message_parser_read_more(ctx, block_r);
6586 d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	741 if (ret == 0) {
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	742 i_assert(!ctx->input->blocking);
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	743 return 0;
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	744 }
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	745 if (ret == -1) {
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	746 i_assert(!eof);
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	747 eof = TRUE;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	748 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	749 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	750
4673 f5bef033a9ac message_parser_parse_next_block() returned body part wrong for first header Timo Sirainen <tss@iki.fi> parents: 4267 diff changeset	751 block_r->part = ctx->part;
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	752
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	753 if (ret < 0 && ctx->part != NULL) {
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	754 i_assert(ctx->input->eof);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	755 while (ctx->part->parent != NULL) {
4265 75d5843153f1 Added message_part to struct message_block and some cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 4259 diff changeset	756 message_size_add(&ctx->part->parent->body_size,
75d5843153f1 Added message_part to struct message_block and some cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 4259 diff changeset	757 &ctx->part->body_size);
4267 bd99e8f5e3ac Some fixes and added message_parser_set_crlfs(). Timo Sirainen <timo.sirainen@movial.fi> parents: 4265 diff changeset	758 message_size_add(&ctx->part->parent->body_size,
bd99e8f5e3ac Some fixes and added message_parser_set_crlfs(). Timo Sirainen <timo.sirainen@movial.fi> parents: 4265 diff changeset	759 &ctx->part->header_size);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	760 ctx->part = ctx->part->parent;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	761 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	762 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	763
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	764 return ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	765 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	766
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4673 diff changeset	767 #undef message_parser_parse_header
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	768 void message_parser_parse_header(struct message_parser_ctx *ctx,
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	769 struct message_size *hdr_size,
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	770 message_part_header_callback_t *callback,
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	771 void *context)
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	772 {
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	773 struct message_block block;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	774 int ret;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	775
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	776 while ((ret = message_parser_parse_next_block(ctx, &block)) > 0) {
4265 75d5843153f1 Added message_part to struct message_block and some cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 4259 diff changeset	777 callback(block.part, block.hdr, context);
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	778
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	779 if (block.hdr == NULL)
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	780 break;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	781 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	782 i_assert(ret != 0);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	783
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	784 if (ret < 0) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	785 /* well, can't return error so fake end of headers */
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	786 callback(ctx->part, NULL, context);
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	787 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	788
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	789 *hdr_size = ctx->part->header_size;
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	790 }
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	791
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4673 diff changeset	792 #undef message_parser_parse_body
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	793 void message_parser_parse_body(struct message_parser_ctx *ctx,
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	794 message_part_header_callback_t *hdr_callback,
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	795 void *context)
ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	796 {
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	797 struct message_block block;
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	798 int ret;
1697 ef79ce6507ff Message parsing can now be done in two parts - header and body. We're now Timo Sirainen <tss@iki.fi> parents: 1689 diff changeset	799
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	800 while ((ret = message_parser_parse_next_block(ctx, &block)) > 0) {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	801 if (block.size == 0 && hdr_callback != NULL)
4265 75d5843153f1 Added message_part to struct message_block and some cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 4259 diff changeset	802 hdr_callback(block.part, block.hdr, context);
4259 fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	803 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	804 i_assert(ret != 0);
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	805 }

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-mail/message-parser.c @ 7086:7ed926ed7aa4 HEAD