Check emails addresses case when checking the presence of our email address when...

[modest] / src / modest-text-utils.c

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 99c4bf6..020b160 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -342,6 +342,39 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix)
        return retval;
 }
 
        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)
 {
 gchar*
 modest_text_utils_remove_address (const gchar *address_list, const gchar *address)
 {

@@ -350,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);
        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);
        if (!address)
                return g_strdup (address_list);
 
        email_address = get_email_from_address (address);

-       
+

        /* search for substring */
        /* 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);
                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 */
        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
                        if (filtered_emails->len == 0)
                                g_string_append_printf (filtered_emails, "%s", g_strstrip (token));
                        else

@@ -454,7 +487,7 @@ modest_text_utils_convert_buffer_to_html_start (GString *html, const gchar *data
                guchar kar = data[i];
                
                if (space_seen && kar != ' ') {
                guchar kar = data[i];
                
                if (space_seen && kar != ' ') {

-                       g_string_append (html, "&nbsp;");
+                       g_string_append (html, " ");

                        space_seen = FALSE;
                }
                
                        space_seen = FALSE;
                }
                

@@ -491,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; ");
                        break_dist = 0;
                        if (space_seen) { /* second space in a row */
                                g_string_append (html, "&nbsp; ");

-                               space_seen = FALSE;

                        } else
                                space_seen = TRUE;
                        break;
                        } else
                                space_seen = TRUE;
                        break;

@@ -1938,6 +1970,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;
        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, ">");
 
                left_limit = strstr (address, "<");
                right_limit = g_strrstr (address, ">");
 

@@ -2007,3 +2040,38 @@ modest_text_utils_remove_duplicate_addresses_list (GSList *address_list)
 
        return new_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;
+}