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

annotate src/lib-mail/message-decoder.c @ 6113:adbfce5bf7d9 HEAD

Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)

author	Timo Sirainen <tss@iki.fi>
date	Fri, 20 Jul 2007 06:11:03 +0300
parents	e5451501ff2f
children	325667778ae3

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 "strescape.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	6 #include "base64.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	7 #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	8 #include "quoted-printable.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	9 #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	10 #include "message-content-parser.h"
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	11 #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	12 #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	13
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	14 enum content_type {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	15 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	16 CONTENT_TYPE_BINARY,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	17 CONTENT_TYPE_QP,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	18 CONTENT_TYPE_BASE64
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	19 };
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	20
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	21 /* base64 takes max 4 bytes per character, q-p takes max 3. */
902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	22 #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	23
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	24 /* 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	25 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	26 #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	27
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	28 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	29 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	30
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	31 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	32 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	33
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	34 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	35 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	36 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	37
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	38 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	39 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	40
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	41 char *content_charset;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	42 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	43
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	44 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	45 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	46 };
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	47
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	48 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	49 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	50 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	51
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	52 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	53 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	54 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	55 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	56 return ctx;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	57 }
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 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	60 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	61 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	62
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	63 *_ctx = NULL;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	64
4888 c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	65 if (ctx->charset_trans != NULL)
c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	66 charset_to_utf8_end(&ctx->charset_trans);
c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	67
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	68 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	69 buffer_free(ctx->buf2);
4888 c3e15280e4cb Memory leak fixes Timo Sirainen <tss@iki.fi> parents: 4885 diff changeset	70 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	71 i_free(ctx);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	72 }
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 static bool
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	75 message_decode_header_callback(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	76 const char charset, void context)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	77 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	78 struct message_decoder_context *ctx = context;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	79 struct charset_translation *t;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	80 bool unknown_charset;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	81
5511 518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	82 if (charset == NULL \|\| charset_is_utf8(charset)) {
5522 5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds. Timo Sirainen <tss@iki.fi> parents: 5519 diff changeset	83 /* ASCII / UTF-8 */
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	84 if (ctx->ucase) {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	85 _charset_utf8_ucase(data, size, ctx->buf,
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	86 ctx->buf->used);
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	87 } else {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	88 buffer_append(ctx->buf, data, size);
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	89 }
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	90 return TRUE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	91 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	92
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	93 t = charset_to_utf8_begin(charset, ctx->ucase, &unknown_charset);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	94 if (unknown_charset) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	95 /* let's just ignore this part */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	96 return TRUE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	97 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	98
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	99 /* ignore any errors */
6112 e5451501ff2f charset_to_utf8_begin() now takes bool ucase parameter. Changed Timo Sirainen <tss@iki.fi> parents: 5524 diff changeset	100 (void)charset_to_utf8_full(t, data, &size, ctx->buf);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	101 charset_to_utf8_end(&t);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	102 return TRUE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	103 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	104
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	105 static void parse_content_encoding(const unsigned char *value, size_t value_len,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	106 void *context)
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 struct message_decoder_context *ctx = context;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	109
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	110 ctx->content_type = CONTENT_TYPE_UNKNOWN;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	111
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	112 switch (value_len) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	113 case 4:
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	114 if (memcasecmp(value, "7bit", 4) == 0 \|\|
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	115 memcasecmp(value, "8bit", 4) == 0)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	116 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	117 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	118 case 6:
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	119 if (memcasecmp(value, "base64", 6) == 0)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	120 ctx->content_type = CONTENT_TYPE_BASE64;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	121 else if (memcasecmp(value, "binary", 6) == 0)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	122 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	123 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	124 case 16:
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	125 if (memcasecmp(value, "quoted-printable", 16) == 0)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	126 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	127 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	128 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	129 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	130
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	131 static void
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	132 parse_content_type_param(const unsigned char *name, size_t name_len,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	133 const unsigned char *value, size_t value_len,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	134 bool value_quoted, void *context)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	135 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	136 struct message_decoder_context *ctx = context;
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 if (name_len == 7 && memcasecmp(name, "charset", 7) == 0 &&
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	139 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	140 ctx->content_charset = i_strndup(value, value_len);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	141 if (value_quoted) str_unescape(ctx->content_charset);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	142
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	143 ctx->charset_utf8 = charset_is_utf8(ctx->content_charset);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	144 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	145 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	146
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	147 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	148 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	149 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	150 {
5511 518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	151 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	152
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->continues) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	154 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	155 return FALSE;
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
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	158 if (hdr->name_len == 12 &&
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	159 strcasecmp(hdr->name, "Content-Type") == 0) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	160 message_content_parse_header(hdr->full_value,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	161 hdr->full_value_len,
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4888 diff changeset	162 null_parse_content_callback,
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	163 parse_content_type_param, ctx);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	164 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	165 if (hdr->name_len == 25 &&
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	166 strcasecmp(hdr->name, "Content-Transfer-Encoding") == 0) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	167 message_content_parse_header(hdr->full_value,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	168 hdr->full_value_len,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	169 parse_content_encoding,
4903 204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4888 diff changeset	170 null_parse_content_param_callback,
204d7edc7cdc Added context parameter type safety checks for most callback APIs. Timo Sirainen <tss@iki.fi> parents: 4888 diff changeset	171 ctx);
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	172 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	173
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	174 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	175 message_header_decode(hdr->full_value, hdr->full_value_len,
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	176 message_decode_header_callback, ctx);
5511 518a77f3bf49 Renamed message_decoder_init() to message_decoder_init_ucase() and changed Timo Sirainen <tss@iki.fi> parents: 5510 diff changeset	177 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	178
6113 adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	179 if (ctx->ucase) {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	180 _charset_utf8_ucase((const unsigned char *)hdr->name,
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	181 hdr->name_len, ctx->buf, ctx->buf->used);
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	182 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	183 }
4608 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 ctx->hdr = *hdr;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	186 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	187 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	188 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	189 if (ctx->ucase) {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	190 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	191 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	192 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	193 }
4608 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 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	196 return TRUE;
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
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	199 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	200 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	201 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	202 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	203 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	204
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	205 /* @UNSAFE */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	206 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	207 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	208 if (skip > *size)
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	209 skip = *size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	210 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	211
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	212 pos = *size;
6112 e5451501ff2f charset_to_utf8_begin() now takes bool ucase parameter. Changed Timo Sirainen <tss@iki.fi> parents: 5524 diff changeset	213 (void)charset_to_utf8_full(ctx->charset_trans,
e5451501ff2f charset_to_utf8_begin() now takes bool ucase parameter. Changed Timo Sirainen <tss@iki.fi> parents: 5524 diff changeset	214 *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	215
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	216 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	217 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	218
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	219 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	220 *data += skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	221 *size -= skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	222
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	223 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	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 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	227 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	228 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	229 {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	230 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	231 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	232 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	233 bool unknown_charset;
5510 93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	234 int ret;
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	235
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	236 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	237 ctx->charset_trans =
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	238 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	239 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	240 ctx->ucase,
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	241 &unknown_charset);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	242 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	243
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	244 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	245 /* @UNSAFE */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	246 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	247 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	248 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	249 skip = input->size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	250 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	251 }
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 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	254 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	255 /* 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	256 return FALSE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	257
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	258 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	259 data = input->data;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	260 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	261 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	262 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	263 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	264 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	265 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	266 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	267 &pos, ctx->buf);
5422 01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	268 i_assert(pos >= ctx->encoding_size);
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	269 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	270 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	271
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	272 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	273 &pos, ctx->buf);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	274 pos += skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	275 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	276 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	277 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	278 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	279 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	280 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	281 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	282 &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	283 /* 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	284 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	285 return FALSE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	286 }
5422 01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	287 i_assert(pos >= ctx->encoding_size);
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	288 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	289 }
5510 93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	290 ret = base64_decode(input->data + skip, input->size - skip,
93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	291 &pos, ctx->buf);
93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	292 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	293 /* 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	294 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	295 return FALSE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	296 }
5510 93e9e081855a Fix for base64 handling Timo Sirainen <tss@iki.fi> parents: 5422 diff changeset	297 if (ret == 0) {
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	298 /* end of base64 input */
902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	299 pos = input->size - skip;
902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	300 }
4608 61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	301 pos += skip;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	302 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	303 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	304 break;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	305 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	306
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	307 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	308 /* @UNSAFE */
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	309 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	310 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	311 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	312 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	313 ctx->encoding_size);
5422 01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	314 } else {
01c63c0adc3b fixes Timo Sirainen <tss@iki.fi> parents: 5410 diff changeset	315 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	316 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	317
5519 7b6511e67476 Some data still wasn't uppercased Timo Sirainen <tss@iki.fi> parents: 5511 diff changeset	318 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	319 if (ctx->ucase) {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	320 buffer_set_used_size(ctx->buf2, 0);
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	321 _charset_utf8_ucase(data, size, ctx->buf2, 0);
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	322 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	323 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	324 } else {
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	325 output->data = data;
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	326 output->size = size;
adbfce5bf7d9 Changed message_decoder_init_ucase() to message_decoder_init(bool ucase) Timo Sirainen <tss@iki.fi> parents: 6112 diff changeset	327 }
5519 7b6511e67476 Some data still wasn't uppercased Timo Sirainen <tss@iki.fi> parents: 5511 diff changeset	328 } 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	329 output->data = 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 = size;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	331 } else {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	332 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	333 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	334 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	335
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	336 pos = size;
6112 e5451501ff2f charset_to_utf8_begin() now takes bool ucase parameter. Changed Timo Sirainen <tss@iki.fi> parents: 5524 diff changeset	337 (void)charset_to_utf8_full(ctx->charset_trans,
e5451501ff2f charset_to_utf8_begin() now takes bool ucase parameter. Changed Timo Sirainen <tss@iki.fi> parents: 5524 diff changeset	338 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	339 if (pos != size) {
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	340 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	341 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	342 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	343 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	344 ctx->translation_size);
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	345 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	346 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	347 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	348 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	349
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	350 output->hdr = NULL;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	351 return TRUE;
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	352 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	353
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	354 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	355 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	356 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	357 {
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	358 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	359 /* MIME part changed. */
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	360 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	361 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	362 ctx->charset_utf8 = TRUE;
4885 902d24d14932 Fixes Timo Sirainen <tss@iki.fi> parents: 4708 diff changeset	363 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	364 }
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	365
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	366 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	367 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	368
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	369 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	370 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	371 else
61e0fe257a83 Added message-decoder to decode message's contents into readable UTF-8. Timo Sirainen <tss@iki.fi> parents: diff changeset	372 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	373 }

Mercurial > dovecot > core-2.2

annotate src/lib-mail/message-decoder.c @ 6113:adbfce5bf7d9 HEAD