X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=e0c303abdffbf2cea80a32e79f079a4e00015468;hp=c4b8cf0294c813f0172cf0cd1498ff0ee445866a;hb=9dd0650122bcb4bbcd29a28b8cae0343299a71cc;hpb=4a10996cb5c1ef242512a5516da6499c272b2958 diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c index c4b8cf0..e0c303a 100644 --- a/src/modest-tny-msg.c +++ b/src/modest-tny-msg.c @@ -167,12 +167,12 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch if (in_reply_to) tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "In-Reply-To", in_reply_to); - - /* Add the body of the new mail */ + + /* Add the body of the new mail */ add_body_part (new_msg, plain_body, content_type); add_html_body_part (new_msg, html_body); g_free (content_type); - + /* Add attachments */ tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err); if (attached) @@ -334,8 +334,8 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline old_attachment = pos->data; if (!tny_mime_part_is_purged (old_attachment)) { - const gchar *old_cid; - old_cid = tny_mime_part_get_content_id (old_attachment); + gchar *old_cid; + old_cid = g_strdup (tny_mime_part_get_content_id (old_attachment)); attachment_part = copy_mime_part (old_attachment, err); if (attachment_part != NULL) { if (add_inline) { @@ -343,12 +343,19 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline "inline"); } else { const gchar *filename; + filename = tny_mime_part_get_filename (old_attachment); - if (filename) - tny_mime_part_set_filename (attachment_part, filename); - else + if (filename) { + /* If the mime part has a filename do not set it again + because Camel won't replace the old one. Instead it + will append the filename to the old one and that will + mislead email clients */ + if (!tny_mime_part_get_filename (attachment_part)) + tny_mime_part_set_filename (attachment_part, filename); + } else { tny_mime_part_set_header_pair (attachment_part, "Content-Disposition", "attachment"); + } } if (!TNY_IS_MSG (old_attachment)) { tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64"); @@ -359,6 +366,7 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline tny_mime_part_set_content_id (attachment_part, old_cid); g_object_unref (attachment_part); } + g_free (old_cid); } } return attached; @@ -382,7 +390,7 @@ add_images (TnyMsg *msg, GList *images_list, GError **err) while (!tny_iterator_is_done (iter)) { TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) { + if (part && !g_ascii_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) { related_part = part; break; } @@ -631,6 +639,132 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht * part */ } +static TnyMimePart* +modest_tny_msg_find_calendar_from_mime_part (TnyMimePart *msg) +{ + TnyMimePart *part = NULL; + TnyList *parts = NULL; + TnyIterator *iter = NULL; + gchar *header_content_type; + gchar *header_content_type_lower = NULL; + + if (!msg) + return NULL; + + /* If it's an application multipart, then we don't get into as we don't + * support them (for example application/sml or wap messages */ + header_content_type = modest_tny_mime_part_get_header_value (msg, "Content-Type"); + if (header_content_type) { + header_content_type = g_strstrip (header_content_type); + header_content_type_lower = g_ascii_strdown (header_content_type, -1); + } + if (header_content_type_lower && + g_str_has_prefix (header_content_type_lower, "multipart/") && + !g_str_has_prefix (header_content_type_lower, "multipart/signed") && + strstr (header_content_type_lower, "application/")) { + g_free (header_content_type_lower); + g_free (header_content_type); + return NULL; + } + g_free (header_content_type_lower); + g_free (header_content_type); + + parts = TNY_LIST (tny_simple_list_new()); + tny_mime_part_get_parts (TNY_MIME_PART (msg), parts); + + iter = tny_list_create_iterator(parts); + + /* no parts? assume it's single-part message */ + if (tny_iterator_is_done(iter)) { + gchar *content_type; + gboolean is_calendar_part; + g_object_unref (G_OBJECT(iter)); + content_type = modest_tny_mime_part_get_content_type (msg); + if (content_type == NULL) + return NULL; + is_calendar_part = + g_str_has_prefix (content_type, "text/calendar"); + g_free (content_type); + /* if this part cannot be a supported body return NULL */ + if (!is_calendar_part) { + return NULL; + } else { + return TNY_MIME_PART (g_object_ref(G_OBJECT(msg))); + } + } else { + do { + gchar *tmp, *content_type = NULL; + gboolean has_content_disp_name = FALSE; + + part = TNY_MIME_PART(tny_iterator_get_current (iter)); + + if (!part) { + g_warning ("%s: not a valid mime part", __FUNCTION__); + tny_iterator_next (iter); + continue; + } + + /* it's a message --> ignore */ + if (part && TNY_IS_MSG (part)) { + g_object_unref (part); + part = NULL; + tny_iterator_next (iter); + continue; + } + + /* we need to strdown the content type, because + * tny_mime_part_has_content_type does not do it... + */ + content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1); + + /* mime-parts with a content-disposition header (either 'inline' or 'attachment') + * and a 'name=' thingy cannot be body parts + */ + + tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition"); + if (tmp) { + gchar *content_disp = g_ascii_strdown(tmp, -1); + g_free (tmp); + has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL; + g_free (content_disp); + } + + if (g_str_has_prefix (content_type, "text/calendar") && + !has_content_disp_name && + !modest_tny_mime_part_is_attachment_for_modest (part)) { + /* we found the body. Doesn't have to be the desired mime part, first + text/ part in a mixed is the body */ + g_free (content_type); + break; + + } else if (g_str_has_prefix(content_type, "multipart")) { + + /* multipart? recurse! */ + g_object_unref (part); + g_free (content_type); + part = modest_tny_msg_find_calendar_from_mime_part (part); + if (part) + break; + } else + g_free (content_type); + + if (part) { + g_object_unref (G_OBJECT(part)); + part = NULL; + } + + tny_iterator_next (iter); + + } while (!tny_iterator_is_done(iter)); + } + + g_object_unref (G_OBJECT(iter)); + g_object_unref (G_OBJECT(parts)); + + return part; /* this maybe NULL, this is not an error; some message just don't have a body + * part */ +} + TnyMimePart* modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html) @@ -641,6 +775,14 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html) want_html); } +TnyMimePart* +modest_tny_msg_find_calendar (TnyMsg *msg) +{ + g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL); + + return modest_tny_msg_find_calendar_from_mime_part (TNY_MIME_PART(msg)); +} + #define MODEST_TNY_MSG_PARENT_UID "parent-uid" @@ -656,7 +798,6 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, TnyMimePart *body = NULL; TnyMimePart *html_body = NULL; ModestFormatter *formatter; - gchar *subject_prefix; gboolean no_text_part; gchar *parent_uid; gboolean forward_as_attach = FALSE; @@ -710,16 +851,10 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, tny_header_set_replyto (new_header, from); /* Change the subject */ - if (is_reply) - subject_prefix = g_strconcat (_("mail_va_re"), ":", NULL); - else - subject_prefix = g_strconcat (_("mail_va_fw"), ":", NULL); old_subject = tny_header_dup_subject (header); new_subject = - (gchar *) modest_text_utils_derived_subject (old_subject, - subject_prefix); + (gchar *) modest_text_utils_derived_subject (old_subject, is_reply); g_free (old_subject); - g_free (subject_prefix); tny_header_set_subject (new_header, (const gchar *) new_subject); g_free (new_subject); @@ -861,7 +996,7 @@ add_if_attachment (gpointer data, gpointer user_data) part = TNY_MIME_PART (data); attachments_list = ((GList **) user_data); - if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part))) { + if (!tny_mime_part_is_purged (part) && ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part)))) { *attachments_list = g_list_prepend (*attachments_list, part); g_object_ref (part); } @@ -920,6 +1055,38 @@ count_addresses (const gchar* addresses) return count; } +static void +remove_undisclosed_recipients (gchar **recipients) +{ + GSList *addresses, *node; + gboolean is_first; + GString *result; + + g_return_if_fail (recipients); + addresses = modest_text_utils_split_addresses_list (*recipients); + + is_first = TRUE; + result = g_string_new (""); + for (node = addresses; node != NULL; node = g_slist_next (node)) { + const gchar *address = (const gchar *) node->data; + + if (address && strstr (address, "undisclosed-recipients")) + continue; + + if (is_first) + is_first = FALSE; + else + result = g_string_append (result, ", "); + + result = g_string_append (result, address); + } + g_slist_foreach (addresses, (GFunc)g_free, NULL); + g_slist_free (addresses); + + g_free (*recipients); + *recipients = g_string_free (result, FALSE); +} + /* get the new To:, based on the old header, * result is newly allocated or NULL in case of error @@ -928,6 +1095,8 @@ static gchar* get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, ModestTnyMsgReplyMode reply_mode) { + const gchar *reply_header = "Reply-To:"; + const gchar *from_header = "From:"; gchar* old_reply_to; gchar* old_from; gchar* new_to; @@ -948,13 +1117,25 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, old_reply_to = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg), "Reply-To"); old_from = tny_header_dup_from (header); - + if (!old_from && !old_reply_to) { g_debug ("%s: failed to get either Reply-To: or From: from header", __FUNCTION__); return NULL; } - + + /* Prevent DoS attacks caused by malformed emails */ + if (old_from) { + gchar *tmp = old_from; + old_from = modest_text_utils_get_secure_header ((const gchar *) tmp, from_header); + g_free (tmp); + } + if (old_reply_to) { + gchar *tmp = old_reply_to; + old_reply_to = modest_text_utils_get_secure_header ((const gchar *) tmp, reply_header); + g_free (tmp); + } + /* for mailing lists, use both Reply-To and From if we did a * 'Reply All:' * */ @@ -996,6 +1177,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from, } tmp = modest_text_utils_simplify_recipients (new_to); + remove_undisclosed_recipients (&tmp); g_free (new_to); new_to = tmp; @@ -1033,6 +1215,10 @@ get_new_cc (TnyHeader *header, const gchar* from, const gchar *new_to) result = modest_text_utils_remove_duplicate_addresses (dup); g_free (dup); + dup = result; + result = modest_text_utils_simplify_recipients (dup); + remove_undisclosed_recipients (&result); + g_free (dup); g_free (old_cc); return result; } @@ -1062,13 +1248,13 @@ modest_tny_msg_get_references (TnyMsg *msg, gchar **message_id, gchar **referenc pair = TNY_PAIR (tny_iterator_get_current (iterator)); name = tny_pair_get_name (pair); - if (!g_strcasecmp (name, "References")) { + if (!g_ascii_strcasecmp (name, "References")) { if (l_references) g_free (l_references); l_references = g_strdup (tny_pair_get_value (pair)); - } else if (!g_strcasecmp (name, "In-Reply-To")) { + } else if (!g_ascii_strcasecmp (name, "In-Reply-To")) { if (l_in_reply_to) g_free (l_in_reply_to); l_in_reply_to = g_strdup (tny_pair_get_value (pair)); - } else if (!g_strcasecmp (name, "Message-ID")) { + } else if (!g_ascii_strcasecmp (name, "Message-ID")) { if (l_message_id) g_free (l_message_id); l_message_id = g_strdup (tny_pair_get_value (pair)); } @@ -1099,6 +1285,14 @@ modest_tny_msg_get_references (TnyMsg *msg, gchar **message_id, gchar **referenc } } +static void +remove_line_breaks (gchar *str) +{ + gchar *needle = g_strrstr (str, "\r\n"); + if (needle) + *needle = '\0'; +} + static void set_references (TnyMsg *reply_msg, TnyMsg *original_msg) { @@ -1133,14 +1327,18 @@ set_references (TnyMsg *reply_msg, TnyMsg *original_msg) g_free (orig_message_id); if (in_reply_to) { + remove_line_breaks (in_reply_to); tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "In-Reply-To", in_reply_to); + g_free (in_reply_to); } if (references) { + remove_line_breaks (references); tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "References", references); + g_free (references); } } -TnyMsg* +TnyMsg* modest_tny_msg_create_reply_msg (TnyMsg *msg, TnyHeader *header, const gchar *from, @@ -1271,56 +1469,32 @@ modest_tny_msg_header_get_all_recipients_list (TnyHeader *header) { GSList *recipients = NULL; gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL; - gchar *after_remove; - GString *buffer; - gboolean add_separator = TRUE; + gchar *after_remove, *joined; if (header == NULL) return NULL; - buffer = g_string_new (""); - from = tny_header_dup_from (header); to = tny_header_dup_to (header); cc = tny_header_dup_cc (header); bcc = tny_header_dup_bcc (header); - recipients = NULL; - if (from) { - buffer = g_string_append (buffer, from); - add_separator = TRUE; - } - if (to) { - if (add_separator) - buffer = g_string_append (buffer, "; "); - else - add_separator = TRUE; - - buffer = g_string_append (buffer, to); - } - if (cc) { - if (add_separator) - buffer = g_string_append (buffer, "; "); - else - add_separator = TRUE; - - buffer = g_string_append (buffer, cc); - } - if (bcc) { - if (add_separator) - buffer = g_string_append (buffer, "; "); - else - add_separator = TRUE; - - buffer = g_string_append (buffer, bcc); - } - - after_remove = modest_text_utils_remove_duplicate_addresses (buffer->str); - g_string_free (buffer, TRUE); + joined = modest_text_utils_join_addresses (from, to, cc, bcc); + after_remove = modest_text_utils_remove_duplicate_addresses (joined); + g_free (joined); recipients = modest_text_utils_split_addresses_list (after_remove); g_free (after_remove); + if (from) + g_free (from); + if (to) + g_free (to); + if (cc) + g_free (cc); + if (bcc) + g_free (bcc); + return recipients; }