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

annotate src/lib-mail/message-parser.c @ 7798:8e206e25a142 HEAD

Merged latest v1.1 changes.

author	Timo Sirainen <tss@iki.fi>
date	Mon, 09 Jun 2008 05:11:18 +0300
parents	929198b1f313 f27e6f583817
children	e06d4049d282

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;
7243 289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	44 unsigned int broken:1;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	45 };
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	46
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4673 diff changeset	47 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	48
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	49 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	50 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	51 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	52 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	53 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	54 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	55 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	56 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	57
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	58 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	59 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	60 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	61 {
fd315deac28f Rewrote the message bodystructure parser to allow 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 /* 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	63 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	64 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	65 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	66 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	67 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	68 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	69 return boundaries;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	70
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	71 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	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
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	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
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	78 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	79 {
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	81 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	82 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	83
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	84 block->hdr = NULL;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	85
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	86 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	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 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	89 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	90 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	91 (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	92 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	93 } 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	94 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	95 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	96 }
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	97
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	98 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	99 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	100
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	101 ctx->last_chr = data[i-1];
5244 aeb72263352d And more fixes Timo Sirainen <tss@iki.fi> parents: 5112 diff changeset	102 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	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
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	106 struct message_block *block_r)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	107 {
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	108 int ret;
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	109
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	110 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	111 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	112 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	113 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	114
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	115 ret = i_stream_read_data(ctx->input, &block_r->data,
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	116 &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	117 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	118 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	119 /* 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	120 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	121 }
6586 d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	122 if (ret < 0)
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	123 return ret;
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	124
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	125 if (!ctx->input->eof) {
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	126 i_assert(!ctx->input->blocking);
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	127 return 0;
c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	128 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	129 }
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	130
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	132 return 1;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	133 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	134
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	135 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	136 message_part_append(pool_t pool, struct message_part *parent)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	137 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	138 struct message_part part, *list;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	139
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	140 part = p_new(pool, struct message_part, 1);
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	141 part->parent = parent;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	142
212 4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	143 /* set child position */
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	144 part->physical_pos =
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	145 parent->physical_pos +
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	146 parent->body_size.physical_size +
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	147 parent->header_size.physical_size;
4327b1266604 message/rfc822 mime parts weren't parsed correctly Timo Sirainen <tss@iki.fi> parents: 184 diff changeset	148
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	149 list = &part->parent->children;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	150 while (*list != NULL)
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	151 list = &(*list)->next;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	152
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	153 *list = part;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	154 return part;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	155 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	156
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	157 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	158 {
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	160
fd315deac28f Rewrote the message bodystructure parser to allow 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 = 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	162 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	163 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	164 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	165
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	167 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	168
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	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
7214 2d58b1c2dfd0 The header ending a message/rfc822 doesn't belong to its child MIME part. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	172 static int parse_next_body_message_rfc822_init(struct message_parser_ctx *ctx,
2d58b1c2dfd0 The header ending a message/rfc822 doesn't belong to its child MIME part. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	173 struct message_block *block_r)
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	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 ctx->part = message_part_append(ctx->part_pool, ctx->part);
7214 2d58b1c2dfd0 The header ending a message/rfc822 doesn't belong to its child MIME part. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	176 return parse_next_header_init(ctx, block_r);
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	177 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	178
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	180 boundary_line_find(struct message_parser_ctx *ctx,
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	181 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	182 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	183 {
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	185
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	186 *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	187
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	188 if (size < 2) {
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	189 i_assert(!full);
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	190
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	191 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	192 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	193 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	194 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	195 }
fd315deac28f Rewrote the message bodystructure parser to allow 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
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	198 /* 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	199 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	200 }
fd315deac28f Rewrote the message bodystructure parser to allow 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
fd315deac28f Rewrote the message bodystructure parser to allow 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 /* 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	203 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	204 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	205 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	206 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	207 if (i == size && i < BOUNDARY_END_MAX_LEN &&
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	208 !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	209 /* 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	210 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	211 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	212 }
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	215 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	216
fd315deac28f Rewrote the message bodystructure parser to allow 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 *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	218 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	219 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	220
fd315deac28f Rewrote the message bodystructure parser to allow 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 (*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	222 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	223 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	224 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	225 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	226
6900 950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	227 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	228 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	229 {
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	230 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	231 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	232
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	233 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	234 }
950ce0b5edb5 Message parser wasn't returning body blocks correctly, causing problems with Timo Sirainen <tss@iki.fi> parents: 6729 diff changeset	235
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	236 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	237 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	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 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	240 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	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 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	243 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	244
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	246 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	247 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	248 }
fd315deac28f Rewrote the message bodystructure parser to allow 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
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	251 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	252 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	253 }
fd315deac28f Rewrote the message bodystructure parser to allow 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
fd315deac28f Rewrote the message bodystructure parser to allow 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 /* 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	256 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	257 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	258
fd315deac28f Rewrote the message bodystructure parser to allow 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 /* 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	260 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	261 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	262 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	263
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	264 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	265 struct message_boundary *boundary,
5305 43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	266 struct message_block *block_r, bool first_line)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	267 {
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	268 struct message_part *part;
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	269
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	270 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	271 /* 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	272 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	273 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	274
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	275 /* 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	276 into parent's body sizes */
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	277 for (part = ctx->part; part != boundary->part; part = part->parent) {
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	278 message_size_add(&part->parent->body_size, &part->body_size);
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	279 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	280 }
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	281 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	282
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	284 /* 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	285 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	286
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	288 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	289 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	290 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	291 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	292 }
fd315deac28f Rewrote the message bodystructure parser to allow 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 /* 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	295 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	296
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	297 /* 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	298 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	299 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	300 (first_line ? 0 : 1));
43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	301 block_r->data += ctx->skip;
43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	302 /* [\n]--<boundary> */
43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	303 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	304 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	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 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	307 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	308 }
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	311 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	312 {
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	314 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	315 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	316 int ret;
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	317 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	318
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	319 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	320 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	321 eof = ret == -1;
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	322 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	323
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	325 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	326 /* 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	327 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	328 ret = boundary_line_find(ctx, block_r->data,
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	329 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	330 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	331 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	332 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	333
5305 43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	334 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	335 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	336 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	337
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	338 for (i = boundary_start = 0; i < block_r->size; i++) {
5411 bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	339 /* skip to beginning of the next line. the first line was
bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	340 handled already. */
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	341 size_t next_line_idx = block_r->size;
d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	342
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	343 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	344 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	345 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	346 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	347 boundary_start--;
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	348 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	349 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	350 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	351 }
5411 bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	352 if (boundary_start != 0) {
bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	353 /* we can skip the first lines. input buffer can't be
bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	354 full anymore. */
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	355 full = FALSE;
6586 d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	356 } 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	357 /* 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	358 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	359 full = FALSE;
5411 bea1e1bab54a Fixes Timo Sirainen <tss@iki.fi> parents: 5305 diff changeset	360 }
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
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	362 ret = boundary_line_find(ctx, block_r->data + next_line_idx,
d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	363 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	364 &boundary);
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	365 if (ret >= 0) {
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	366 /* found / need more data */
5112 c72eb76e4173 Inifinite looping fixes Timo Sirainen <tss@iki.fi> parents: 5111 diff changeset	367 if (ret == 0 && boundary_start == 0)
5440 d9b7957a7255 yet another fix Timo Sirainen <tss@iki.fi> parents: 5411 diff changeset	368 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	369 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	370 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	371 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	372
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	373 if (i >= block_r->size) {
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	374 /* the boundary wasn't found from this data block,
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	375 we'll need more data. */
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	376 if (eof)
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	377 ret = -1;
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	378 else {
daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	379 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	380 ctx->want_count = (block_r->size - boundary_start) + 1;
5111 daf87522bce4 Fixes Timo Sirainen <tss@iki.fi> parents: 5109 diff changeset	381 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	382 }
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	383 i_assert(!(ret == 0 && full));
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	384
312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	385 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	386 /* 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	387 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	388 }
6904 275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	389 if (block_r->size != 0) {
5244 aeb72263352d And more fixes Timo Sirainen <tss@iki.fi> parents: 5112 diff changeset	390 parse_body_add_block(ctx, block_r);
6904 275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	391 return 1;
275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	392 }
275d22eb25ba Another fix to returning body blocks. Timo Sirainen <tss@iki.fi> parents: 6900 diff changeset	393 return ret <= 0 ? ret :
5305 43d3955ce03f Fixes to counting MIME part sizes Timo Sirainen <tss@iki.fi> parents: 5244 diff changeset	394 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	395 }
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	398 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	399 {
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	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 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	403 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	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 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	406 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	407 }
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	410 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	411 {
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	412 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	413 const char key, value;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	414 string_t *content_type;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	415
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	416 if (ctx->part_seen_content_type)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	417 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	418 ctx->part_seen_content_type = TRUE;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	419
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	420 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	421 (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	422
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	423 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	424 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	425 return;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	426
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	427 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	428 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	429 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	430 (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	431 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	432 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	433 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	434 ctx->part->flags \|= MESSAGE_PART_FLAG_MULTIPART;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	435
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	436 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	437 ctx->part->flags \|= MESSAGE_PART_FLAG_MULTIPART_DIGEST;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	438 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	439
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	440 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	441 ctx->last_boundary != NULL)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	442 return;
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	443
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	444 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	445 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	446 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	447 break;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6082 diff changeset	448 }
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	449 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	450 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	451
874 a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 diff changeset	452 #define MUTEX_FLAGS \
a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 diff changeset	453 (MESSAGE_PART_FLAG_MESSAGE_RFC822 \| MESSAGE_PART_FLAG_MULTIPART)
a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 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 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	456 struct message_block *block_r)
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	457 {
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	458 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	459 struct message_header_line *hdr;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	460 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	461 int ret;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	462
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	463 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	464 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	465 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	466 }
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	467
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	468 ret = message_parse_header_next(ctx->hdr_parser_ctx, &hdr);
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	469 if (ret == 0 \|\| (ret < 0 && ctx->input->stream_errno != 0)) {
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	470 (void)i_stream_get_data(ctx->input, &size);
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	471 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	472 return ret;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	473 }
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	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 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	476 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	477 ;
fd315deac28f Rewrote the message bodystructure parser to allow 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, "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	479 /* 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	480 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	481 } 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	482 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	483 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	484 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	485
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	486 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	487 hdr->use_full_value = TRUE;
7226 e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and Timo Sirainen <tss@iki.fi> parents: 7214 diff changeset	488 else T_BEGIN {
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and Timo Sirainen <tss@iki.fi> parents: 7214 diff changeset	489 parse_content_type(ctx, hdr);
e6693a0ec8e1 Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and Timo Sirainen <tss@iki.fi> parents: 7214 diff changeset	490 } T_END;
1618 149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	491 }
149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	492
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	493 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	494 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	495 return 1;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	496 }
1618 149ade487f48 Ignore Content-* headers if there's no MIME-Version header. Note that this Timo Sirainen <tss@iki.fi> parents: 1543 diff changeset	497
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	498 /* 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	499 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	500 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	501 /* 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	502 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	503 }
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	504 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	505 /* 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	506 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	507 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	508 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	509 }
874 a60e12a66ad3 extra assert. Timo Sirainen <tss@iki.fi> parents: 856 diff changeset	510
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	511 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	512 (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	513 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	514 (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	515 MESSAGE_PART_FLAG_MULTIPART_DIGEST) != 0) {
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	516 /* 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	517 below multipart/digest, assume message/rfc822
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	518 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	519 part->flags \|= MESSAGE_PART_FLAG_MESSAGE_RFC822;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	520 } else {
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	521 /* 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	522 part->flags \|= MESSAGE_PART_FLAG_TEXT;
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	523 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	524 }
3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	525
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	526 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	527 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	528 message_parse_header_deinit(&ctx->hdr_parser_ctx);
0 3b1985cbc908 Initial revision Timo Sirainen <tss@iki.fi> parents: diff changeset	529
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	530 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	531
5244 aeb72263352d And more fixes Timo Sirainen <tss@iki.fi> parents: 5112 diff changeset	532 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	533 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	534 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	535 ctx->parse_next_block = parse_next_body_to_boundary;
7214 2d58b1c2dfd0 The header ending a message/rfc822 doesn't belong to its child MIME part. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	536 } else if (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822)
2d58b1c2dfd0 The header ending a message/rfc822 doesn't belong to its child MIME part. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	537 ctx->parse_next_block = parse_next_body_message_rfc822_init;
2d58b1c2dfd0 The header ending a message/rfc822 doesn't belong to its child MIME part. Timo Sirainen <tss@iki.fi> parents: 7086 diff changeset	538 else if (ctx->boundaries != NULL)
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	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
7597 f27e6f583817 If cached message part showed header's size to be smaller than in reality, Timo Sirainen <tss@iki.fi> parents: 7272 diff changeset	620 if (offset < ctx->input->v_offset) {
f27e6f583817 If cached message part showed header's size to be smaller than in reality, Timo Sirainen <tss@iki.fi> parents: 7272 diff changeset	621 /* header was actually larger than the cached size suggested */
f27e6f583817 If cached message part showed header's size to be smaller than in reality, Timo Sirainen <tss@iki.fi> parents: 7272 diff changeset	622 ctx->broken = TRUE;
f27e6f583817 If cached message part showed header's size to be smaller than in reality, Timo Sirainen <tss@iki.fi> parents: 7272 diff changeset	623 return -1;
f27e6f583817 If cached message part showed header's size to be smaller than in reality, Timo Sirainen <tss@iki.fi> parents: 7272 diff changeset	624 }
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	625 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	626
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	627 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	628 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	629 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	630
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	631 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	632 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	633 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	634 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	635 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	636 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	637 } 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	638 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	639 } else {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	640 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	641 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	642 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	643 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	644
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	645 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	646 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	647 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	648 struct message_header_line *hdr;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	649 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	650 int ret;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	651
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	652 ret = message_parse_header_next(ctx->hdr_parser_ctx, &hdr);
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	653 if (ret == 0 \|\| (ret < 0 && ctx->input->stream_errno != 0)) {
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	654 (void)i_stream_get_data(ctx->input, &size);
ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	655 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	656 return ret;
6654 ac0e7f713d70 Infinite looping fixes Timo Sirainen <tss@iki.fi> parents: 6586 diff changeset	657 }
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	658
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	659 if (hdr != NULL) {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	660 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	661 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	662 return 1;
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 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	665
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	666 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	667
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	668 /* 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	669 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	670 block_r->size = 0;
7243 289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	671
289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	672 i_assert(ctx->skip == 0);
289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	673 if (ctx->input->v_offset != ctx->part->physical_pos +
289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	674 ctx->part->header_size.physical_size)
289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	675 ctx->broken = TRUE;
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	676 return 1;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	677 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	678
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	679 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	680 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	681 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	682 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	683
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	684 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	685 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	686 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	687
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	688 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	689 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	690
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	691 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	692 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	693 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	694
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	695 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	696 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	697 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	698 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	699 {
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 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	701 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	702
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	703 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	704 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	705 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	706 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	707 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	708 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	709 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	710 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	711 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	712 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	713 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	714 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	715 }
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	716
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	717 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	718 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	719 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	720 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	721 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	722 {
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	723 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	724
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5506 diff changeset	725 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	726 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	727 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	728 return ctx;
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	729 }
6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	730
7243 289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	731 int message_parser_deinit(struct message_parser_ctx **_ctx,
289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	732 struct message_part **parts_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	733 {
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	734 struct message_parser_ctx ctx = _ctx;
7243 289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	735 int ret = ctx->broken ? -1 : 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	736
3879 928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to Timo Sirainen <tss@iki.fi> parents: 3863 diff changeset	737 *_ctx = NULL;
7243 289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	738 *parts_r = ctx->parts;
289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	739
7245 dbb7f65e6307 Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 7243 diff changeset	740 if (ctx->hdr_parser_ctx != NULL)
dbb7f65e6307 Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 7243 diff changeset	741 message_parse_header_deinit(&ctx->hdr_parser_ctx);
6082 d62bddb414ef ref/unref stream when parsing it. Timo Sirainen <tss@iki.fi> parents: 5989 diff changeset	742 i_stream_unref(&ctx->input);
6428 7cad076906eb pool_unref() now takes ** pointer. Timo Sirainen <tss@iki.fi> parents: 6411 diff changeset	743 pool_unref(&ctx->parser_pool);
7243 289765861d66 Changed message_parser_deinit() to return -1 if the parser was using Timo Sirainen <tss@iki.fi> parents: 7226 diff changeset	744 return 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	745 }
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 1253 diff changeset	746
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	747 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	748 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	749 {
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	750 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	751 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	752
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	753 while ((ret = ctx->parse_next_block(ctx, block_r)) == 0) {
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	754 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	755 if (ret == 0) {
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	756 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	757 return 0;
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	758 }
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	759 if (ret == -1) {
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	760 i_assert(!eof);
d6b2343238f9 Handle lines longer than 8192 bytes without going to infinite loop. Timo Sirainen <tss@iki.fi> parents: 6529 diff changeset	761 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	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 }
5109 312c701f453a Fixes. Timo Sirainen <tss@iki.fi> parents: 5001 diff changeset	764
4673 f5bef033a9ac message_parser_parse_next_block() returned body part wrong for first header Timo Sirainen <tss@iki.fi> parents: 4267 diff changeset	765 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	766
5506 6cd889c652b0 Removed message_parse_from_parts(). Added message_parser_init_from_parts() Timo Sirainen <tss@iki.fi> parents: 5440 diff changeset	767 if (ret < 0 && ctx->part != NULL) {
7272 1e5deb36a79f Assert fix Timo Sirainen <tss@iki.fi> parents: 7245 diff changeset	768 /* Successful EOF or unexpected failure */
1e5deb36a79f Assert fix Timo Sirainen <tss@iki.fi> parents: 7245 diff changeset	769 i_assert(ctx->input->eof \|\| ctx->input->closed \|\|
1e5deb36a79f Assert fix Timo Sirainen <tss@iki.fi> parents: 7245 diff changeset	770 ctx->input->stream_errno != 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	771 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	772 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	773 &ctx->part->body_size);
4267 bd99e8f5e3ac Some fixes and added message_parser_set_crlfs(). Timo Sirainen <timo.sirainen@movial.fi> parents: 4265 diff changeset	774 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	775 &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	776 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	777 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	778 }
fd315deac28f Rewrote the message bodystructure parser to allow 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
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	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
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4673 diff changeset	783 #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	784 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	785 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	786 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	787 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	788 {
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	789 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	790 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	791
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	792 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	793 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	794
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	795 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	796 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	797 }
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	799
fd315deac28f Rewrote the message bodystructure parser to allow 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 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	801 /* 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	802 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	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
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	805 *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	806 }
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	807
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4673 diff changeset	808 #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	809 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	810 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	811 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	812 {
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	813 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	814 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	815
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	816 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	817 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	818 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	819 }
fd315deac28f Rewrote the message bodystructure parser to allow parsing from non-blocking streams. Also did a couple of API changes and cleanups. Timo Sirainen <timo.sirainen@movial.fi> parents: 3879 diff changeset	820 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	821 }

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-mail/message-parser.c @ 7798:8e206e25a142 HEAD