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) {
tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
"attachment");
}
- tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
+ if (!TNY_IS_MSG (old_attachment)) {
+ tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
+ }
ret = tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
attached++;
if (old_cid)
tny_mime_part_set_content_id (attachment_part, old_cid);
g_object_unref (attachment_part);
}
+ g_free (old_cid);
}
}
return attached;
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;
}
gchar *subject_prefix;
gboolean no_text_part;
gchar *parent_uid;
+ gboolean forward_as_attach = FALSE;
if (header)
g_object_ref (header);
/* when we're reply, include the text part if we have it, or nothing otherwise. */
if (is_reply)
- new_msg = modest_formatter_quote (formatter, no_text_part ? NULL: body, header,
+ new_msg = modest_formatter_quote (formatter, body, header,
attachments);
else {
if (no_text_part || (html_body && (strcmp (tny_mime_part_get_content_type (html_body), "text/html")==0))) {
+ forward_as_attach = TRUE;
new_msg = modest_formatter_attach (formatter, msg, header);
} else {
+ forward_as_attach = FALSE;
new_msg = modest_formatter_inline (formatter, body, header,
attachments);
}
g_object_unref (G_OBJECT (header));
/* ugly to unref it here instead of in the calling func */
- if (!is_reply & !no_text_part) {
+ if (!is_reply & !forward_as_attach) {
add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL);
}
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
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;
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)
+ old_from = modest_text_utils_get_secure_header (old_from,
+ from_header);
+ if (old_reply_to)
+ old_reply_to = modest_text_utils_get_secure_header (old_reply_to,
+ reply_header);
+
/* for mailing lists, use both Reply-To and From if we did a
* 'Reply All:'
* */
}
tmp = modest_text_utils_simplify_recipients (new_to);
+ remove_undisclosed_recipients (&tmp);
g_free (new_to);
new_to = tmp;
/* get the new Cc:, based on the old header,
* result is newly allocated or NULL in case of error */
static gchar*
-get_new_cc (TnyHeader *header, const gchar* from)
+get_new_cc (TnyHeader *header, const gchar* from, const gchar *new_to)
{
gchar *old_cc, *result, *dup;
/* remove me (the new From:) from the Cc: list */
dup = modest_text_utils_remove_address (old_cc, from);
+
+ if (new_to) {
+ gchar **to_parts, **current;
+
+ to_parts = g_strsplit (new_to, ",", 0);
+ for (current = to_parts; current && *current != '\0'; current++) {
+ gchar *dup2;
+
+ dup2 = modest_text_utils_remove_address (dup, g_strstrip (*current));
+ g_free (dup);
+ dup = dup2;
+ }
+ g_strfreev (to_parts);
+ }
+
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;
}
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));
}
g_debug ("%s: failed to get new To:", __FUNCTION__);
else {
tny_header_set_to (new_header, new_to);
- g_free (new_to);
}
if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {
- gchar *new_cc = get_new_cc (header, from);
+ gchar *new_cc = get_new_cc (header, from, new_to);
if (new_cc) {
tny_header_set_cc (new_header, new_cc);
g_free (new_cc);
}
}
+ if (new_to)
+ g_free (new_to);
+
/* Clean */
g_object_unref (G_OBJECT (new_header));
g_object_unref (G_OBJECT (header));
{
GSList *recipients = NULL;
gchar *from = NULL, *to = NULL, *cc = NULL, *bcc = NULL;
- gchar *tmp = NULL, *old_tmp = NULL;
+ gchar *after_remove;
+ GString *buffer;
+ gboolean add_separator = TRUE;
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);
recipients = NULL;
if (from) {
- tmp = g_strdup (from);
- old_tmp = tmp;
- g_free (from);
+ buffer = g_string_append (buffer, from);
+ add_separator = TRUE;
}
if (to) {
- tmp = g_strjoin ("; ", old_tmp, to, NULL);
- g_free (old_tmp);
- old_tmp = tmp;
- g_free (to);
+ if (add_separator)
+ buffer = g_string_append (buffer, "; ");
+ else
+ add_separator = TRUE;
+
+ buffer = g_string_append (buffer, to);
}
if (cc) {
- tmp = g_strjoin ("; ", old_tmp, cc, NULL);
- g_free (old_tmp);
- old_tmp = tmp;
- g_free (cc);
+ if (add_separator)
+ buffer = g_string_append (buffer, "; ");
+ else
+ add_separator = TRUE;
+
+ buffer = g_string_append (buffer, cc);
}
if (bcc) {
- tmp = g_strjoin ("; ", old_tmp, bcc, NULL);
- g_free (old_tmp);
- old_tmp = tmp;
- g_free (bcc);
+ if (add_separator)
+ buffer = g_string_append (buffer, "; ");
+ else
+ add_separator = TRUE;
+
+ buffer = g_string_append (buffer, bcc);
}
- old_tmp = modest_text_utils_remove_duplicate_addresses (tmp);
- recipients = modest_text_utils_split_addresses_list (old_tmp);
- g_free (tmp);
+ after_remove = modest_text_utils_remove_duplicate_addresses (buffer->str);
+ g_string_free (buffer, TRUE);
+
+ recipients = modest_text_utils_split_addresses_list (after_remove);
+ g_free (after_remove);
return recipients;
}
projects / modest / blobdiff