dovecot/core-2.2: src/lib-mail/message-decoder.c annotate

annotate src/lib-mail/message-decoder.c @ 6131:5f56b2eb32b3 HEAD

Use uni_utf8_to_decomposed_titlecase() to have proper case-insensitive UTF-8 comparing.

author	Timo Sirainen <tss@iki.fi>
date	Fri, 20 Jul 2007 17:27:02 +0300
parents	d86581f4a0c6
children	d01522d276f6

rev	line source
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	1 /* Copyright (C) 2006 Timo Sirainen */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	2
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	4 #include "buffer.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	5 #include "base64.h"
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	6 #include "str.h"
6131 5f56b2eb32b3 Use uni_utf8_to_decomposed_titlecase() to have proper case-insensitive UTF-8 Timo Sirainen <tss@iki.fi> parents: 6122 diff changeset	7 #include "unichar.h"
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	8 #include "charset-utf8.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	9 #include "quoted-printable.h"
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	10 #include "rfc822-parser.h"
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	11 #include "message-parser.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	12 #include "message-header-decode.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	13 #include "message-decoder.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	14
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	15 enum content_type {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	16 CONTENT_TYPE_UNKNOWN = 0,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	17 CONTENT_TYPE_BINARY,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	18 CONTENT_TYPE_QP,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	19 CONTENT_TYPE_BASE64
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	20 };
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	21
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	22 /* base64 takes max 4 bytes per character, q-p takes max 3. */
902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	23 #define MAX_ENCODING_BUF_SIZE 3
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	24
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	25 /* UTF-8 takes max 5 bytes per character. Not sure about others, but I'd think
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	26 10 is more than enough for everyone.. */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	27 #define MAX_TRANSLATION_BUF_SIZE 10
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	28
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	29 struct message_decoder_context {
5410 73032525bca0 Don't try to access output variable's contents. They are undefined at least Timo Sirainen <tss@iki.fi> parents: 4903 diff changeset	30 struct message_part *prev_part;
73032525bca0 Don't try to access output variable's contents. They are undefined at least Timo Sirainen <tss@iki.fi> parents: 4903 diff changeset	31
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	32 struct message_header_line hdr;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	33 buffer_t buf, buf2;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	34
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	35 struct charset_translation *charset_trans;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	36 char translation_buf[MAX_TRANSLATION_BUF_SIZE];
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	37 unsigned int translation_size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	38
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	39 char encoding_buf[MAX_ENCODING_BUF_SIZE];
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	40 unsigned int encoding_size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	41
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	42 char *content_charset;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	43 enum content_type content_type;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	44
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	45 unsigned int ucase:1;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	46 unsigned int charset_utf8:1;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	47 };
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	48
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	49 struct message_decoder_context *message_decoder_init(bool ucase)
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	50 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	51 struct message_decoder_context *ctx;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	52
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	53 ctx = i_new(struct message_decoder_context, 1);
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	54 ctx->ucase = ucase;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	55 ctx->buf = buffer_create_dynamic(default_pool, 8192);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	56 ctx->buf2 = buffer_create_dynamic(default_pool, 8192);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	57 return ctx;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	58 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	59
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	60 void message_decoder_deinit(struct message_decoder_context **_ctx)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	61 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	62 struct message_decoder_context ctx = _ctx;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	63
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	64 *_ctx = NULL;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	65
4888 c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	66 if (ctx->charset_trans != NULL)
c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	67 charset_to_utf8_end(&ctx->charset_trans);
c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	68
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	69 buffer_free(ctx->buf);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	70 buffer_free(ctx->buf2);
4888 c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	71 i_free(ctx->content_charset);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	72 i_free(ctx);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	73 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	74
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	75 static void
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	76 parse_content_transfer_encoding(struct message_decoder_context *ctx,
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	77 struct message_header_line *hdr)
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	78 {
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	79 struct rfc822_parser_context parser;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	80 string_t *value;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	81
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	82 t_push();
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	83 value = t_str_new(64);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	84 rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	85
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	86 (void)rfc822_skip_lwsp(&parser);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	87 (void)rfc822_parse_mime_token(&parser, value);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	88
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	89 switch (str_len(value)) {
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	90 case 4:
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	91 if (memcasecmp(str_data(value), "7bit", 4) == 0 \|\|
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	92 memcasecmp(str_data(value), "8bit", 4) == 0)
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	93 ctx->content_type = CONTENT_TYPE_BINARY;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	94 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	95 case 6:
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	96 if (memcasecmp(str_data(value), "base64", 6) == 0)
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	97 ctx->content_type = CONTENT_TYPE_BASE64;
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	98 else if (memcasecmp(str_data(value), "binary", 6) == 0)
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	99 ctx->content_type = CONTENT_TYPE_BINARY;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	100 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	101 case 16:
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	102 if (memcasecmp(str_data(value), "quoted-printable", 16) == 0)
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	103 ctx->content_type = CONTENT_TYPE_QP;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	104 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	105 }
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	106 t_pop();
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	107 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	108
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	109 static void
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	110 parse_content_type(struct message_decoder_context *ctx,
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	111 struct message_header_line *hdr)
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	112 {
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	113 struct rfc822_parser_context parser;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	114 const char key, value;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	115 string_t *str;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	116
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	117 if (ctx->content_charset != NULL)
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	118 return;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	119
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	120 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: 6114 diff changeset	121 (void)rfc822_skip_lwsp(&parser);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	122 t_push();
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	123 str = t_str_new(64);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	124 if (rfc822_parse_content_type(&parser, str) <= 0) {
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	125 t_pop();
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	126 return;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	127 }
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	128
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	129 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: 6114 diff changeset	130 if (strcasecmp(key, "charset") == 0) {
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	131 ctx->content_charset = i_strdup(value);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	132 ctx->charset_utf8 = charset_is_utf8(value);
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	133 break;
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	134 }
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	135 }
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	136 t_pop();
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	137 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	138
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	139 static bool message_decode_header(struct message_decoder_context *ctx,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	140 struct message_header_line *hdr,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	141 struct message_block *output)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	142 {
5511 518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	143 size_t value_len;
518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	144
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	145 if (hdr->continues) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	146 hdr->use_full_value = TRUE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	147 return FALSE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	148 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	149
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	150 if (hdr->name_len == 12 &&
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	151 strcasecmp(hdr->name, "Content-Type") == 0)
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	152 parse_content_type(ctx, hdr);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	153 if (hdr->name_len == 25 &&
6117 9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	154 strcasecmp(hdr->name, "Content-Transfer-Encoding") == 0)
9214044ce1f1 Removed message-content-parser. Instead added rfc822_parse_content_type() Timo Sirainen <tss@iki.fi> parents: 6114 diff changeset	155 parse_content_transfer_encoding(ctx, hdr);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	156
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	157 buffer_set_used_size(ctx->buf, 0);
6118 841b052e269e Added message_header_decode_utf8(). Use it in message decoder instead of Timo Sirainen <tss@iki.fi> parents: 6117 diff changeset	158 message_header_decode_utf8(hdr->full_value, hdr->full_value_len,
841b052e269e Added message_header_decode_utf8(). Use it in message decoder instead of Timo Sirainen <tss@iki.fi> parents: 6117 diff changeset	159 ctx->buf, ctx->ucase);
5511 518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	160 value_len = ctx->buf->used;
518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	161
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	162 if (ctx->ucase) {
6131 5f56b2eb32b3 Use uni_utf8_to_decomposed_titlecase() to have proper case-insensitive UTF-8 Timo Sirainen <tss@iki.fi> parents: 6122 diff changeset	163 (void)uni_utf8_to_decomposed_titlecase(hdr->name, hdr->name_len,
5f56b2eb32b3 Use uni_utf8_to_decomposed_titlecase() to have proper case-insensitive UTF-8 Timo Sirainen <tss@iki.fi> parents: 6122 diff changeset	164 ctx->buf);
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	165 buffer_append_c(ctx->buf, '\0');
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	166 }
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	167
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	168 ctx->hdr = *hdr;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	169 ctx->hdr.full_value = ctx->buf->data;
5511 518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	170 ctx->hdr.full_value_len = value_len;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	171 ctx->hdr.value_len = 0;
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	172 if (ctx->ucase) {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	173 ctx->hdr.name = CONST_PTR_OFFSET(ctx->buf->data,
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	174 ctx->hdr.full_value_len);
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	175 ctx->hdr.name_len = ctx->buf->used - 1 - value_len;
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	176 }
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	177
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	178 output->hdr = &ctx->hdr;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	179 return TRUE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	180 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	181
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	182 static void translation_buf_decode(struct message_decoder_context *ctx,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	183 const unsigned char *data, size_t size)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	184 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	185 unsigned char trans_buf[MAX_TRANSLATION_BUF_SIZE+1];
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	186 size_t pos, skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	187
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	188 /* @UNSAFE */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	189 memcpy(trans_buf, ctx->translation_buf, ctx->translation_size);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	190 skip = sizeof(trans_buf) - ctx->translation_size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	191 if (skip > *size)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	192 skip = *size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	193 memcpy(trans_buf + ctx->translation_size, data, skip);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	194
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	195 pos = *size;
6122 d86581f4a0c6 charset_to_utf8() isn't used anymore, so renamed charset_to_utf8_full() to it. Timo Sirainen <tss@iki.fi> parents: 6118 diff changeset	196 (void)charset_to_utf8(ctx->charset_trans, *data, &pos, ctx->buf2);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	197
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	198 i_assert(pos > ctx->translation_size);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	199 skip = (ctx->translation_size + skip) - pos;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	200
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	201 i_assert(*size >= skip);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	202 *data += skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	203 *size -= skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	204
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	205 ctx->translation_size = 0;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	206 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	207
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	208 static bool message_decode_body(struct message_decoder_context *ctx,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	209 struct message_block *input,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	210 struct message_block *output)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	211 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	212 unsigned char new_buf[MAX_ENCODING_BUF_SIZE+1];
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	213 const unsigned char *data = NULL;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	214 size_t pos, size = 0, skip = 0;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	215 bool unknown_charset;
5510 93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	216 int ret;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	217
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	218 if (ctx->charset_trans == NULL && !ctx->charset_utf8) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	219 ctx->charset_trans =
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	220 charset_to_utf8_begin(ctx->content_charset != NULL ?
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	221 ctx->content_charset : "UTF-8",
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	222 ctx->ucase,
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	223 &unknown_charset);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	224 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	225
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	226 if (ctx->encoding_size != 0) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	227 /* @UNSAFE */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	228 memcpy(new_buf, ctx->encoding_buf, ctx->encoding_size);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	229 skip = sizeof(new_buf) - ctx->encoding_size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	230 if (skip > input->size)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	231 skip = input->size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	232 memcpy(new_buf + ctx->encoding_size, input->data, skip);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	233 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	234
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	235 switch (ctx->content_type) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	236 case CONTENT_TYPE_UNKNOWN:
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	237 /* just skip this body */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	238 return FALSE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	239
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	240 case CONTENT_TYPE_BINARY:
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	241 data = input->data;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	242 size = pos = input->size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	243 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	244 case CONTENT_TYPE_QP:
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	245 buffer_set_used_size(ctx->buf, 0);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	246 if (ctx->encoding_size != 0) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	247 quoted_printable_decode(new_buf,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	248 ctx->encoding_size + skip,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	249 &pos, ctx->buf);
5422 01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	250 i_assert(pos >= ctx->encoding_size);
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	251 skip = pos - ctx->encoding_size;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	252 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	253
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	254 quoted_printable_decode(input->data + skip, input->size - skip,
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	255 &pos, ctx->buf);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	256 pos += skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	257 data = ctx->buf->data;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	258 size = ctx->buf->used;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	259 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	260 case CONTENT_TYPE_BASE64:
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	261 buffer_set_used_size(ctx->buf, 0);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	262 if (ctx->encoding_size != 0) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	263 if (base64_decode(new_buf, ctx->encoding_size + skip,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	264 &pos, ctx->buf) < 0) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	265 /* corrupted base64 data, don't bother with
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	266 the rest of it */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	267 return FALSE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	268 }
5422 01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	269 i_assert(pos >= ctx->encoding_size);
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	270 skip = pos - ctx->encoding_size;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	271 }
5510 93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	272 ret = base64_decode(input->data + skip, input->size - skip,
93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	273 &pos, ctx->buf);
93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	274 if (ret < 0) {
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	275 /* corrupted base64 data, don't bother with
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	276 the rest of it */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	277 return FALSE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	278 }
5510 93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	279 if (ret == 0) {
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	280 /* end of base64 input */
902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	281 pos = input->size - skip;
902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	282 }
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	283 pos += skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	284 data = ctx->buf->data;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	285 size = ctx->buf->used;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	286 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	287 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	288
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	289 if (pos != input->size) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	290 /* @UNSAFE */
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	291 i_assert(pos < input->size);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	292 ctx->encoding_size = input->size - pos;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	293 i_assert(ctx->encoding_size <= sizeof(ctx->encoding_buf));
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	294 memcpy(ctx->encoding_buf, input->data + pos,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	295 ctx->encoding_size);
5422 01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	296 } else {
01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	297 ctx->encoding_size = 0;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	298 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	299
5519 7b6511e67476 Some data still wasn't uppercased Timo Sirainen <tss@iki.fi> parents: 5511 diff changeset	300 if (ctx->charset_utf8) {
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	301 if (ctx->ucase) {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	302 buffer_set_used_size(ctx->buf2, 0);
6131 5f56b2eb32b3 Use uni_utf8_to_decomposed_titlecase() to have proper case-insensitive UTF-8 Timo Sirainen <tss@iki.fi> parents: 6122 diff changeset	303 (void)uni_utf8_to_decomposed_titlecase(data, size,
5f56b2eb32b3 Use uni_utf8_to_decomposed_titlecase() to have proper case-insensitive UTF-8 Timo Sirainen <tss@iki.fi> parents: 6122 diff changeset	304 ctx->buf);
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	305 output->data = ctx->buf2->data;
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	306 output->size = ctx->buf2->used;
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	307 } else {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	308 output->data = data;
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	309 output->size = size;
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	310 }
5519 7b6511e67476 Some data still wasn't uppercased Timo Sirainen <tss@iki.fi> parents: 5511 diff changeset	311 } else if (ctx->charset_trans == NULL) {
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	312 output->data = data;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	313 output->size = size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	314 } else {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	315 buffer_set_used_size(ctx->buf2, 0);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	316 if (ctx->translation_size != 0)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	317 translation_buf_decode(ctx, &data, &size);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	318
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	319 pos = size;
6122 d86581f4a0c6 charset_to_utf8() isn't used anymore, so renamed charset_to_utf8_full() to it. Timo Sirainen <tss@iki.fi> parents: 6118 diff changeset	320 (void)charset_to_utf8(ctx->charset_trans,
d86581f4a0c6 charset_to_utf8() isn't used anymore, so renamed charset_to_utf8_full() to it. Timo Sirainen <tss@iki.fi> parents: 6118 diff changeset	321 data, &pos, ctx->buf2);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	322 if (pos != size) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	323 ctx->translation_size = size - pos;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	324 i_assert(ctx->translation_size <=
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	325 sizeof(ctx->translation_buf));
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	326 memcpy(ctx->translation_buf, data + pos,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	327 ctx->translation_size);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	328 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	329 output->data = ctx->buf2->data;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	330 output->size = ctx->buf2->used;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	331 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	332
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	333 output->hdr = NULL;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	334 return TRUE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	335 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	336
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	337 bool message_decoder_decode_next_block(struct message_decoder_context *ctx,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	338 struct message_block *input,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	339 struct message_block *output)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	340 {
5410 73032525bca0 Don't try to access output variable's contents. They are undefined at least Timo Sirainen <tss@iki.fi> parents: 4903 diff changeset	341 if (input->part != ctx->prev_part) {
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	342 /* MIME part changed. */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	343 i_free_and_null(ctx->content_charset);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	344 ctx->content_type = CONTENT_TYPE_BINARY;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	345 ctx->charset_utf8 = TRUE;
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	346 ctx->encoding_size = 0;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	347 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	348
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	349 output->part = input->part;
5410 73032525bca0 Don't try to access output variable's contents. They are undefined at least Timo Sirainen <tss@iki.fi> parents: 4903 diff changeset	350 ctx->prev_part = input->part;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	351
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	352 if (input->hdr != NULL)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	353 return message_decode_header(ctx, input->hdr, output);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	354 else
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	355 return message_decode_body(ctx, input, output);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	356 }

Mercurial > dovecot > core-2.2

annotate src/lib-mail/message-decoder.c @ 6131:5f56b2eb32b3 HEAD