Merge lp:~kalikiana/midori/cookiesdebug into lp:midori

[Cris Dywan]

Revise "cookies" debug output, merge expiry check and disallow revival of old cookies

Related to bug 1199445 I made the debug output for cookies actually useful by printing all values, and indeed the changes applied on the Midori side.

r6334:
Soup API uses absolute points in time. We always need to double-check if a cookie has a too long life span before trying to limit it - or we inadvertendly extend it.

r6335:
Cookies may be happily overwritten by their owner and thereby resetting the expiry. The most reliable solution is probably to lock expiry changes.

[lp:~kalikiana/midori/cookiesdebug]

6334. By Cris Dywan on 2013-08-10

Merge cookie age checks for age > 0 and 0

6335. By Cris Dywan on 2013-08-10

Don't allow revival of expiring cookies

[André Stösel (ivaldi)]

Finally fixed, thank you.

review: Approve

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-07-29 20:58:17 +0000
+++ midori/midori-session.c	2013-08-10 14:25:14 +0000
@@ -263,28 +263,41 @@
                                       SoupCookie*        new_cookie,
                                       MidoriWebSettings* settings)
 {
+
+    if (midori_debug ("cookies"))
+    {
+        gchar* old = old_cookie ? soup_cookie_to_cookie_header (old_cookie) : NULL;
+        gchar* new = new_cookie ? soup_cookie_to_cookie_header (new_cookie) : NULL;
+        g_print ("cookie changed from %s to %s\n", old, new);
+        g_free (old);
+        g_free (new);
+    }
+
+    /* Don't allow revival of expiring cookies */
+    if (new_cookie && old_cookie && old_cookie->expires)
+        soup_cookie_set_expires (new_cookie, old_cookie->expires);
+
     if (new_cookie && new_cookie->expires)
     {
         time_t expires = soup_date_to_time_t (new_cookie->expires);
         gint age = katze_object_get_int (settings, "maximum-cookie-age");
-        if (age > 0)
-        {
-            SoupDate* max_date = soup_date_new_from_now (
-                   age * SOUP_COOKIE_MAX_AGE_ONE_DAY);
-            if (soup_date_to_time_t (new_cookie->expires)
-                > soup_date_to_time_t (max_date))
-                   soup_cookie_set_expires (new_cookie, max_date);
-        }
-        else
-        {
-            /* An age of 0 to SoupCookie means already-expired
-            A user choosing 0 days probably expects 1 hour. */
-            soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR);
-        }
+        /* An age of 0 to SoupCookie means already-expired
+           A user choosing 0 days probably expects 1 hour.
+         */
+        int seconds = age > 0 ? age * SOUP_COOKIE_MAX_AGE_ONE_DAY : SOUP_COOKIE_MAX_AGE_ONE_HOUR;
+        SoupDate* max_date = soup_date_new_from_now (seconds);
+        if (expires > soup_date_to_time_t (max_date))
+        {
+            if (midori_debug ("cookies"))
+            {
+                gchar* new_date = soup_date_to_string (max_date, SOUP_DATE_COOKIE);
+                g_print ("^^ enforcing expiry: %s\n", new_date);
+                g_free (new_date);
+            }
+            soup_cookie_set_expires (new_cookie, max_date);
+        }
+        soup_date_free (max_date);
     }
-
-    if (midori_debug ("cookies"))
-        g_print ("cookie changed: old %p new %p\n", old_cookie, new_cookie);
 }
 #endif