<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[277014] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/277014">277014</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2021-05-05 06:24:52 -0700 (Wed, 05 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[SOUP] Wrong cookie timestamp in case of long expire time
https://bugs.webkit.org/show_bug.cgi?id=225389

Reviewed by Adrian Perez de Castro.

Source/WebCore:

There's an overflow when converting the dates in both libsoup2 and libsoup3, but for two different reasons. In
the case of libsoup2 we are using an int for the conversion of milliseconds to seconds which is not enough. In
the case of libsoup3 we are passing the value in milliseconds to g_date_time_new_from_unix_utc() that expects
seconds.

* platform/network/soup/CookieSoup.cpp:
(WebCore::msToSoupDate): Use int64_t instead of int for the cast.
(WebCore::Cookie::toSoupCookie const): Convert the value to seconds.

Tools:

Add a test case.

* TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp:
(testCookieManagerLongExpires):
(beforeAll):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupCookieSoupcpp">trunk/Source/WebCore/platform/network/soup/CookieSoup.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKitGLibTestCookieManagercpp">trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (277013 => 277014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-05 13:14:26 UTC (rev 277013)
+++ trunk/Source/WebCore/ChangeLog      2021-05-05 13:24:52 UTC (rev 277014)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-05-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Wrong cookie timestamp in case of long expire time
+        https://bugs.webkit.org/show_bug.cgi?id=225389
+
+        Reviewed by Adrian Perez de Castro.
+
+        There's an overflow when converting the dates in both libsoup2 and libsoup3, but for two different reasons. In
+        the case of libsoup2 we are using an int for the conversion of milliseconds to seconds which is not enough. In
+        the case of libsoup3 we are passing the value in milliseconds to g_date_time_new_from_unix_utc() that expects
+        seconds.
+
+        * platform/network/soup/CookieSoup.cpp:
+        (WebCore::msToSoupDate): Use int64_t instead of int for the cast.
+        (WebCore::Cookie::toSoupCookie const): Convert the value to seconds.
+
</ins><span class="cx"> 2021-05-05  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Use WeakHashSet instead of HashSet of raw pointes in Document and SVGDocumentExtensions
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCookieSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CookieSoup.cpp (277013 => 277014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CookieSoup.cpp        2021-05-05 13:14:26 UTC (rev 277013)
+++ trunk/Source/WebCore/platform/network/soup/CookieSoup.cpp   2021-05-05 13:24:52 UTC (rev 277014)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> 
</span><span class="cx">     // monthFromDayInYear() returns a value in the [0,11] range, while soup_date_new() expects
</span><span class="cx">     // a value in the [1,12] range, meaning we have to manually adjust the month value.
</span><del>-    return soup_date_new(year, monthFromDayInYear(dayOfYear, leapYear) + 1, dayInMonthFromDayInYear(dayOfYear, leapYear), msToHours(ms), msToMinutes(ms), static_cast<int>(ms / 1000) % 60);
</del><ins>+    return soup_date_new(year, monthFromDayInYear(dayOfYear, leapYear) + 1, dayInMonthFromDayInYear(dayOfYear, leapYear), msToHours(ms), msToMinutes(ms), static_cast<int64_t>(ms / 1000) % 60);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">         soup_cookie_set_expires(soupCookie, date);
</span><span class="cx">         soup_date_free(date);
</span><span class="cx"> #else
</span><del>-        GRefPtr<GDateTime> date = adoptGRef(g_date_time_new_from_unix_utc(*expires));
</del><ins>+        GRefPtr<GDateTime> date = adoptGRef(g_date_time_new_from_unix_utc(*expires / 1000.));
</ins><span class="cx">         soup_cookie_set_expires(soupCookie, date.get());
</span><span class="cx"> #endif
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277013 => 277014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-05 13:14:26 UTC (rev 277013)
+++ trunk/Tools/ChangeLog       2021-05-05 13:24:52 UTC (rev 277014)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-05-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] Wrong cookie timestamp in case of long expire time
+        https://bugs.webkit.org/show_bug.cgi?id=225389
+
+        Reviewed by Adrian Perez de Castro.
+
+        Add a test case.
+
+        * TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp:
+        (testCookieManagerLongExpires):
+        (beforeAll):
+
</ins><span class="cx"> 2021-05-04  Jiewen Tan  <jiewen_tan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         PCM: Find a way to validate source_secret_token and source_secret_token_signature
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKitGLibTestCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp (277013 => 277014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp 2021-05-05 13:14:26 UTC (rev 277013)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp    2021-05-05 13:24:52 UTC (rev 277014)
</span><span class="lines">@@ -706,7 +706,34 @@
</span><span class="cx">     g_main_loop_run(test->m_mainLoop);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static void testCookieManagerLongExpires(CookieManagerTest* test, gconstpointer)
+{
+    g_unlink(test->m_cookiesTextFile.get());
+    g_unlink(test->m_cookiesSQLiteFile.get());
+
+    GRefPtr<GDateTime> now = adoptGRef(g_date_time_new_now_utc());
+    GRefPtr<GDateTime> expires = adoptGRef(g_date_time_add_years(now.get(), 35));
+    GUniquePtr<char> line(g_strdup_printf("#HttpOnly_localhost\tFALSE\t/\tFALSE\t%ld\tprov\t123\tNone", g_date_time_to_unix(expires.get())));
+    test->m_cookiesTextFile.reset(g_build_filename(Test::dataDirectory(), "cookies.txt", nullptr));
+    g_file_set_contents(test->m_cookiesTextFile.get(), line.get(), -1, nullptr);
+    test->setPersistentStorage(WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT);
+
+    GList* cookies = test->getCookies("http://localhost/");
+    g_assert_cmpint(g_list_length(cookies), ==, 1);
+    SoupCookie* cookie = static_cast<SoupCookie*>(cookies->data);
+    auto* cookiesExpires = soup_cookie_get_expires(cookie);
+    g_assert_nonnull(cookiesExpires);
</ins><span class="cx"> #if USE(SOUP2)
</span><ins>+    g_assert_cmpint(g_date_time_to_unix(expires.get()), ==, soup_date_to_time_t(cookiesExpires));
+#else
+    g_assert_cmpint(g_date_time_to_unix(expires.get()), ==, g_date_time_to_unix(cookiesExpires));
+#endif
+
+    test->deleteAllCookies();
+    g_assert_cmpint(g_strv_length(test->getDomains()), ==, 0);
+}
+
+#if USE(SOUP2)
</ins><span class="cx"> static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
</span><span class="cx"> #else
</span><span class="cx"> static void serverCallback(SoupServer* server, SoupServerMessage* message, const char* path, GHashTable*, gpointer)
</span><span class="lines">@@ -748,6 +775,7 @@
</span><span class="cx">     CookiePersistentStorageTest::add("WebKitCookieManager", "persistent-storage", testCookieManagerPersistentStorage);
</span><span class="cx">     CookieManagerTest::add("WebKitCookieManager", "persistent-storage-delete-all", testCookieManagerPersistentStorageDeleteAll);
</span><span class="cx">     CookieManagerTest::add("WebKitCookieManager", "ephemeral", testCookieManagerEphemeral);
</span><ins>+    CookieManagerTest::add("WebKitCookieManager", "long-expires", testCookieManagerLongExpires);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void afterAll()
</span></span></pre>
</div>
</div>

</body>
</html>