X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=99cb7107410146b5481e8a5c2f5c15ac4d03df15;hp=2b7cbb5abee79cbd60f180ae1dc9a97a1150a095;hb=06546fe50ce8a03df5fe73027873467aa21e6244;hpb=28fbc4e0d124d6c3d41cfd970ad699fe48555182

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 2b7cbb5..99cb710 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -316,7 +316,23 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
 			tmp += prefix_len;
 			tmp = g_strchug (tmp);
 		} else {
-			break;
+			gchar *prefix_down, *tmp_down;
+
+			/* We need this to properly check the cases of
+			   some clients adding FW: instead of Fw: for
+			   example */
+			prefix_down = g_utf8_strdown (prefix, -1);
+			tmp_down = g_utf8_strdown (tmp, -1);
+			if (g_str_has_prefix (tmp_down, prefix_down)) {
+				tmp += prefix_len;
+				tmp = g_strchug (tmp);
+				g_free (prefix_down);
+				g_free (tmp_down);
+			} else {
+				g_free (prefix_down);
+				g_free (tmp_down);
+				break;
+			}
 		}
 	} while (tmp);
 
@@ -326,6 +342,39 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
 	return retval;
 }
 
+
+/* Performs a case-insensitive strstr for ASCII strings */
+static const gchar *
+ascii_stristr(const gchar *haystack, const gchar *needle)
+{
+	int needle_len;
+	int haystack_len;
+	const gchar *pos;
+	const gchar *max_pos;
+
+	if (haystack == NULL || needle == NULL) {
+		return haystack;  /* as in strstr */
+	}
+
+	needle_len = strlen(needle);
+
+	if (needle_len == 0) {
+		return haystack;  /* as in strstr */
+	}
+
+	haystack_len = strlen(haystack);
+	max_pos = haystack + haystack_len - needle_len;
+
+	for (pos = haystack; pos <= max_pos; pos++) {
+		if (g_ascii_strncasecmp (pos, needle, needle_len) == 0) {
+			return pos;
+		}
+	}
+
+	return NULL;
+}
+
+
 gchar*
 modest_text_utils_remove_address (const gchar *address_list, const gchar *address)
 {
@@ -334,26 +383,26 @@ modest_text_utils_remove_address (const gchar *address_list, const gchar *addres
 	gchar *email_address;
 
 	g_return_val_if_fail (address_list, NULL);
-	
+
 	if (!address)
 		return g_strdup (address_list);
 
 	email_address = get_email_from_address (address);
-	
+
 	/* search for substring */
-	if (!strstr ((const char *) address_list, (const char *) email_address)) {
+	if (!ascii_stristr ((const char *) address_list, (const char *) email_address)) {
 		g_free (email_address);
 		return g_strdup (address_list);
 	}
 
 	dup = g_strdup (address_list);
 	filtered_emails = g_string_new (NULL);
-	
+
 	token = strtok_r (dup, ",", &ptr);
 
 	while (token != NULL) {
 		/* Add to list if not found */
-		if (!strstr ((const char *) token, (const char *) email_address)) {
+		if (!ascii_stristr ((const char *) token, (const char *) email_address)) {
 			if (filtered_emails->len == 0)
 				g_string_append_printf (filtered_emails, "%s", g_strstrip (token));
 			else
@@ -438,7 +487,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
 		guchar kar = data[i];
 		
 		if (space_seen && kar != ' ') {
-			g_string_append (html, "&nbsp;");
+			g_string_append (html, " ");
 			space_seen = FALSE;
 		}
 		
@@ -475,7 +524,6 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
 			break_dist = 0;
 			if (space_seen) { /* second space in a row */
 				g_string_append (html, "&nbsp; ");
-				space_seen = FALSE;
 			} else
 				space_seen = TRUE;
 			break;
@@ -925,6 +973,7 @@ modest_text_utils_quote_body (GString *output, const gchar *text,
 				g_string_prepend (l, remaining->str);
 			} else {
 				do {
+					gunichar remaining_first;
 					breakpoint =
 						get_breakpoint (remaining->str,
 								rem_indent,
@@ -933,9 +982,11 @@ modest_text_utils_quote_body (GString *output, const gchar *text,
 						       remaining, breakpoint);
 					g_string_erase (remaining, 0,
 							breakpoint);
-					if (remaining->str[0] == ' ') {
-						g_string_erase (remaining, 0,
-								1);
+					remaining_first = g_utf8_get_char_validated (remaining->str, remaining->len);
+					if (remaining_first != ((gunichar) -1)) {
+						if (g_unichar_isspace (remaining_first)) {
+							g_string_erase (remaining, 0, g_utf8_next_char (remaining->str) - remaining->str);
+						}
 					}
 				} while (remaining->len);
 			}
@@ -1922,6 +1973,7 @@ modest_text_utils_simplify_recipients (const gchar *recipients)
 	for (node = addresses; node != NULL; node = g_slist_next (node)) {
 		const gchar *address = (const gchar *) node->data;
 		gchar *left_limit, *right_limit;
+
 		left_limit = strstr (address, "<");
 		right_limit = g_strrstr (address, ">");
 
@@ -1991,3 +2043,38 @@ modest_text_utils_remove_duplicate_addresses_list (GSList *address_list)
 
 	return new_list;
 }
+
+gchar *
+modest_text_utils_get_secure_header (const gchar *value,
+				     const gchar *header)
+{
+	const gint max_len = 128;
+	gchar *new_value = NULL;
+	gchar *needle = g_strrstr (value, header);
+
+	if (needle && value != needle)
+		new_value = g_strdup (needle + strlen (header));
+
+	if (!new_value)
+		new_value = g_strdup (value);
+
+	/* Do a max length check to prevent DoS attacks caused by huge
+	   malformed headers */
+	if (g_utf8_validate (new_value, -1, NULL)) {
+		if (g_utf8_strlen (new_value, -1) > max_len) {
+			gchar *tmp = g_malloc0 (max_len * 4);
+			g_utf8_strncpy (tmp, (const gchar *) new_value, max_len);
+			g_free (new_value);
+			new_value = tmp;
+		}
+	} else {
+		if (strlen (new_value) > max_len) {
+			gchar *tmp = g_malloc0 (max_len);
+			strncpy (new_value, tmp, max_len);
+			g_free (new_value);
+			new_value = tmp;
+		}
+	}
+
+	return new_value;
+}