Diff
Modified: trunk/Source/WebKit/ChangeLog (263084 => 263085)
--- trunk/Source/WebKit/ChangeLog 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/ChangeLog 2020-06-16 09:31:14 UTC (rev 263085)
@@ -1,3 +1,32 @@
+2020-06-16 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Add API to configure and enable resource load statistics
+ https://bugs.webkit.org/show_bug.cgi?id=177943
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/API/glib/WebKitWebsiteData.cpp:
+ (recordContainsSupportedDataTypes):
+ (toWebKitWebsiteDataTypes):
+ * UIProcess/API/glib/WebKitWebsiteDataManager.cpp:
+ (webkitWebsiteDataManagerGetProperty):
+ (webkitWebsiteDataManagerSetProperty):
+ (webkitWebsiteDataManagerConstructed):
+ (webkit_website_data_manager_class_init):
+ (webkitWebsiteDataManagerGetDataStore):
+ (webkit_website_data_manager_get_itp_directory):
+ (webkit_website_data_manager_set_itp_enabled):
+ (webkit_website_data_manager_get_itp_enabled):
+ (toWebsiteDataTypes):
+ * UIProcess/API/gtk/WebKitWebsiteData.h:
+ * UIProcess/API/gtk/WebKitWebsiteDataManager.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt:
+ * UIProcess/API/wpe/WebKitWebsiteData.h:
+ * UIProcess/API/wpe/WebKitWebsiteDataManager.h:
+ * UIProcess/API/wpe/docs/wpe-1.0-sections.txt:
+ * UIProcess/glib/WebsiteDataStoreGLib.cpp:
+ (WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory):
+
2020-06-16 Darryl Pogue <[email protected]>
IndexedDB: Support IDBFactory databases method
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp 2020-06-16 09:31:14 UTC (rev 263085)
@@ -78,7 +78,8 @@
WebsiteDataType::PlugInData,
#endif
WebsiteDataType::Cookies,
- WebsiteDataType::DeviceIdHashSalt
+ WebsiteDataType::DeviceIdHashSalt,
+ WebsiteDataType::ResourceLoadStatistics
});
}
@@ -109,6 +110,8 @@
returnValue |= WEBKIT_WEBSITE_DATA_COOKIES;
if (types.contains(WebsiteDataType::DeviceIdHashSalt))
returnValue |= WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT;
+ if (types.contains(WebsiteDataType::ResourceLoadStatistics))
+ returnValue |= WEBKIT_WEBSITE_DATA_ITP;
return static_cast<WebKitWebsiteDataTypes>(returnValue);
}
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp 2020-06-16 09:31:14 UTC (rev 263085)
@@ -86,6 +86,7 @@
PROP_INDEXEDDB_DIRECTORY,
PROP_WEBSQL_DIRECTORY,
PROP_HSTS_CACHE_DIRECTORY,
+ PROP_ITP_DIRECTORY,
PROP_IS_EPHEMERAL
};
@@ -104,6 +105,7 @@
GUniquePtr<char> indexedDBDirectory;
GUniquePtr<char> webSQLDirectory;
GUniquePtr<char> hstsCacheDirectory;
+ GUniquePtr<char> itpDirectory;
GRefPtr<WebKitCookieManager> cookieManager;
Vector<WebProcessPool*> processPools;
@@ -142,6 +144,9 @@
case PROP_HSTS_CACHE_DIRECTORY:
g_value_set_string(value, webkit_website_data_manager_get_hsts_cache_directory(manager));
break;
+ case PROP_ITP_DIRECTORY:
+ g_value_set_string(value, webkit_website_data_manager_get_itp_directory(manager));
+ break;
case PROP_IS_EPHEMERAL:
g_value_set_boolean(value, webkit_website_data_manager_is_ephemeral(manager));
break;
@@ -179,6 +184,9 @@
case PROP_HSTS_CACHE_DIRECTORY:
manager->priv->hstsCacheDirectory.reset(g_value_dup_string(value));
break;
+ case PROP_ITP_DIRECTORY:
+ manager->priv->itpDirectory.reset(g_value_dup_string(value));
+ break;
case PROP_IS_EPHEMERAL:
if (g_value_get_boolean(value))
manager->priv->websiteDataStore = WebKit::WebsiteDataStore::createNonPersistent();
@@ -200,6 +208,8 @@
priv->indexedDBDirectory.reset(g_build_filename(priv->baseDataDirectory.get(), "databases", "indexeddb", nullptr));
if (!priv->webSQLDirectory)
priv->webSQLDirectory.reset(g_build_filename(priv->baseDataDirectory.get(), "databases", nullptr));
+ if (!priv->itpDirectory)
+ priv->itpDirectory.reset(g_build_filename(priv->baseDataDirectory.get(), "itp", nullptr));
}
if (priv->baseCacheDirectory) {
@@ -361,6 +371,23 @@
static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
/**
+ * WebKitWebsiteDataManager:itp-directory:
+ *
+ * The directory where Intelligent Tracking Prevention (ITP) data will be stored.
+ *
+ * Since: 2.30
+ */
+ g_object_class_install_property(
+ gObjectClass,
+ PROP_ITP_DIRECTORY,
+ g_param_spec_string(
+ "itp-directory",
+ _("ITP Direcory"),
+ _("The directory where Intelligent Tracking Prevention data will be stored"),
+ nullptr,
+ static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
+
+ /**
* WebKitWebsiteDataManager:is-ephemeral:
*
* Whether the #WebKitWebsiteDataManager is ephemeral. An ephemeral #WebKitWebsiteDataManager
@@ -398,6 +425,8 @@
WebKit::WebsiteDataStore::defaultWebSQLDatabaseDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->webSQLDirectory.get()));
configuration->setHSTSStorageDirectory(!priv->hstsCacheDirectory ?
WebKit::WebsiteDataStore::defaultHSTSDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->hstsCacheDirectory.get()));
+ configuration->setResourceLoadStatisticsDirectory(!priv->itpDirectory ?
+ WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory() : FileSystem::stringFromFileSystemRepresentation(priv->itpDirectory.get()));
configuration->setMediaKeysStorageDirectory(WebKit::WebsiteDataStore::defaultMediaKeysStorageDirectory());
priv->websiteDataStore = WebKit::WebsiteDataStore::create(WTFMove(configuration), PAL::SessionID::defaultSessionID());
}
@@ -660,6 +689,29 @@
}
/**
+ * webkit_website_data_manager_get_itp_directory:
+ * @manager: a #WebKitWebsiteDataManager
+ *
+ * Get the #WebKitWebsiteDataManager:itp-directory property.
+ *
+ * Returns: (allow-none): the directory where Intelligent Tracking Prevention data is stored or %NULL if @manager is ephemeral.
+ *
+ * Since: 2.30
+ */
+const gchar* webkit_website_data_manager_get_itp_directory(WebKitWebsiteDataManager* manager)
+{
+ g_return_val_if_fail(WEBKIT_IS_WEBSITE_DATA_MANAGER(manager), nullptr);
+
+ WebKitWebsiteDataManagerPrivate* priv = manager->priv;
+ if (priv->websiteDataStore && !priv->websiteDataStore->isPersistent())
+ return nullptr;
+
+ if (!priv->itpDirectory)
+ priv->itpDirectory.reset(g_strdup(WebKit::WebsiteDataStore::defaultResourceLoadStatisticsDirectory().utf8().data()));
+ return priv->itpDirectory.get();
+}
+
+/**
* webkit_website_data_manager_get_cookie_manager:
* @manager: a #WebKitWebsiteDataManager
*
@@ -679,6 +731,42 @@
return manager->priv->cookieManager.get();
}
+/**
+ * webkit_website_data_manager_set_itp_enabled:
+ * @manager: a #WebKitWebsiteDataManager
+ * @enabled: value to set
+ *
+ * Enable or disable Intelligent Tracking Prevention (ITP). When ITP is enabled resource load statistics
+ * are collected and used to decide whether to allow or block third-party cookies and prevent user tracking.
+ * Note that when ITP is enabled the resources for which cookies are allowed will follow the accept policy
+ * set with webkit_cookie_manager_set_accept_policy().
+ *
+ * Since: 2.30
+ */
+void webkit_website_data_manager_set_itp_enabled(WebKitWebsiteDataManager* manager, gboolean enabled)
+{
+ g_return_if_fail(WEBKIT_IS_WEBSITE_DATA_MANAGER(manager));
+
+ webkitWebsiteDataManagerGetDataStore(manager).setResourceLoadStatisticsEnabled(enabled);
+}
+
+/**
+ * webkit_website_data_manager_get_itp_enabled:
+ * @manager: a #WebKitWebsiteDataManager
+ *
+ * Get whether Intelligent Tracking Prevention (ITP) is enabled or not.
+ *
+ * Returns: %TRUE if ITP is enabled, or %FALSE otherwise.
+ *
+ * Since: 2.30
+ */
+gboolean webkit_website_data_manager_get_itp_enabled(WebKitWebsiteDataManager* manager)
+{
+ g_return_val_if_fail(WEBKIT_IS_WEBSITE_DATA_MANAGER(manager), FALSE);
+
+ return webkitWebsiteDataManagerGetDataStore(manager).resourceLoadStatisticsEnabled();
+}
+
static OptionSet<WebsiteDataType> toWebsiteDataTypes(WebKitWebsiteDataTypes types)
{
OptionSet<WebsiteDataType> returnValue;
@@ -706,6 +794,8 @@
returnValue.add(WebsiteDataType::Cookies);
if (types & WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT)
returnValue.add(WebsiteDataType::DeviceIdHashSalt);
+ if (types & WEBKIT_WEBSITE_DATA_ITP)
+ returnValue.add(WebsiteDataType::ResourceLoadStatistics);
return returnValue;
}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteData.h (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteData.h 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteData.h 2020-06-16 09:31:14 UTC (rev 263085)
@@ -46,6 +46,7 @@
* @WEBKIT_WEBSITE_DATA_COOKIES: Cookies.
* @WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT: Hash salt used to generate the device ids used by webpages. Since 2.24
* @WEBKIT_WEBSITE_DATA_HSTS_CACHE: HSTS cache. Since 2.26
+ * @WEBKIT_WEBSITE_DATA_ITP: Intelligent Tracking Prevention data. Since 2.30.
* @WEBKIT_WEBSITE_DATA_ALL: All types.
*
* Enum values with flags representing types of Website data.
@@ -64,7 +65,8 @@
WEBKIT_WEBSITE_DATA_COOKIES = 1 << 8,
WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT = 1 << 9,
WEBKIT_WEBSITE_DATA_HSTS_CACHE = 1 << 10,
- WEBKIT_WEBSITE_DATA_ALL = (1 << 11) - 1
+ WEBKIT_WEBSITE_DATA_ITP = 1 << 11,
+ WEBKIT_WEBSITE_DATA_ALL = (1 << 12) - 1
} WebKitWebsiteDataTypes;
WEBKIT_API GType
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataManager.h (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataManager.h 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebsiteDataManager.h 2020-06-16 09:31:14 UTC (rev 263085)
@@ -93,10 +93,20 @@
WEBKIT_API const gchar *
webkit_website_data_manager_get_hsts_cache_directory (WebKitWebsiteDataManager *manager);
+WEBKIT_API const gchar *
+webkit_website_data_manager_get_itp_directory (WebKitWebsiteDataManager *manager);
+
WEBKIT_API WebKitCookieManager *
webkit_website_data_manager_get_cookie_manager (WebKitWebsiteDataManager *manager);
WEBKIT_API void
+webkit_website_data_manager_set_itp_enabled (WebKitWebsiteDataManager *manager,
+ gboolean enabled);
+
+WEBKIT_API gboolean
+webkit_website_data_manager_get_itp_enabled (WebKitWebsiteDataManager *manager);
+
+WEBKIT_API void
webkit_website_data_manager_fetch (WebKitWebsiteDataManager *manager,
WebKitWebsiteDataTypes types,
GCancellable *cancellable,
Modified: trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2020-06-16 09:31:14 UTC (rev 263085)
@@ -1458,7 +1458,10 @@
webkit_website_data_manager_get_indexeddb_directory
webkit_website_data_manager_get_websql_directory
webkit_website_data_manager_get_hsts_cache_directory
+webkit_website_data_manager_get_itp_directory
webkit_website_data_manager_get_cookie_manager
+webkit_website_data_manager_set_itp_enabled
+webkit_website_data_manager_get_itp_enabled
webkit_website_data_manager_fetch
webkit_website_data_manager_fetch_finish
webkit_website_data_manager_remove
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteData.h (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteData.h 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteData.h 2020-06-16 09:31:14 UTC (rev 263085)
@@ -46,6 +46,7 @@
* @WEBKIT_WEBSITE_DATA_COOKIES: Cookies.
* @WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT: Hash salt used to generate the device ids used by webpages. Since 2.24
* @WEBKIT_WEBSITE_DATA_HSTS_CACHE: HSTS cache. Since 2.26
+ * @WEBKIT_WEBSITE_DATA_ITP: Intelligent Tracking Prevention data. Since 2.30.
* @WEBKIT_WEBSITE_DATA_ALL: All types.
*
* Enum values with flags representing types of Website data.
@@ -64,7 +65,8 @@
WEBKIT_WEBSITE_DATA_COOKIES = 1 << 8,
WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT = 1 << 9,
WEBKIT_WEBSITE_DATA_HSTS_CACHE = 1 << 10,
- WEBKIT_WEBSITE_DATA_ALL = (1 << 11) - 1
+ WEBKIT_WEBSITE_DATA_ITP = 1 << 11,
+ WEBKIT_WEBSITE_DATA_ALL = (1 << 12) - 1
} WebKitWebsiteDataTypes;
WEBKIT_API GType
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataManager.h (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataManager.h 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebsiteDataManager.h 2020-06-16 09:31:14 UTC (rev 263085)
@@ -93,10 +93,20 @@
WEBKIT_API const gchar *
webkit_website_data_manager_get_hsts_cache_directory (WebKitWebsiteDataManager *manager);
+WEBKIT_API const gchar *
+webkit_website_data_manager_get_itp_directory (WebKitWebsiteDataManager *manager);
+
WEBKIT_API WebKitCookieManager *
webkit_website_data_manager_get_cookie_manager (WebKitWebsiteDataManager *manager);
WEBKIT_API void
+webkit_website_data_manager_set_itp_enabled (WebKitWebsiteDataManager *manager,
+ gboolean enabled);
+
+WEBKIT_API gboolean
+webkit_website_data_manager_get_itp_enabled (WebKitWebsiteDataManager *manager);
+
+WEBKIT_API void
webkit_website_data_manager_fetch (WebKitWebsiteDataManager *manager,
WebKitWebsiteDataTypes types,
GCancellable *cancellable,
Modified: trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-1.0-sections.txt 2020-06-16 09:31:14 UTC (rev 263085)
@@ -1392,7 +1392,10 @@
webkit_website_data_manager_get_indexeddb_directory
webkit_website_data_manager_get_websql_directory
webkit_website_data_manager_get_hsts_cache_directory
+webkit_website_data_manager_get_itp_directory
webkit_website_data_manager_get_cookie_manager
+webkit_website_data_manager_set_itp_enabled
+webkit_website_data_manager_get_itp_enabled
webkit_website_data_manager_fetch
webkit_website_data_manager_fetch_finish
webkit_website_data_manager_remove
Modified: trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp (263084 => 263085)
--- trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Source/WebKit/UIProcess/glib/WebsiteDataStoreGLib.cpp 2020-06-16 09:31:14 UTC (rev 263085)
@@ -91,7 +91,7 @@
WTF::String WebsiteDataStore::defaultResourceLoadStatisticsDirectory()
{
- return websiteDataDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "resourceloadstatistics");
+ return websiteDataDirectoryFileSystemRepresentation(BASE_DIRECTORY G_DIR_SEPARATOR_S "itp");
}
WTF::String WebsiteDataStore::cacheDirectoryFileSystemRepresentation(const WTF::String& directoryName)
Modified: trunk/Tools/ChangeLog (263084 => 263085)
--- trunk/Tools/ChangeLog 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/ChangeLog 2020-06-16 09:31:14 UTC (rev 263085)
@@ -1,3 +1,31 @@
+2020-06-16 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Add API to configure and enable resource load statistics
+ https://bugs.webkit.org/show_bug.cgi?id=177943
+
+ Reviewed by Michael Catanzaro.
+
+ Add --enable-itp command line version to MiniBrowser and unit tests to check the new API.
+
+ * MiniBrowser/gtk/main.c:
+ (gotWebsiteDataCallback):
+ (activate):
+ * MiniBrowser/wpe/main.cpp:
+ (main):
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp:
+ (serverCallback):
+ (testWebsiteDataConfiguration):
+ (testWebsiteDataEphemeral):
+ (testWebsiteDataITP):
+ (beforeAll):
+ * TestWebKitAPI/glib/TestExpectations.json:
+ * TestWebKitAPI/glib/WebKitGLib/TestMain.h:
+ (Test::Test):
+ * TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp:
+ (directoryChangedCallback):
+ (WebViewTest::waitUntilFileChanged):
+ * TestWebKitAPI/glib/WebKitGLib/WebViewTest.h:
+
2020-06-16 Philippe Normand <[email protected]>
REGRESSION(r263029): [Flatpak SDK] Broke initial SDK installation
Modified: trunk/Tools/MiniBrowser/gtk/main.c (263084 => 263085)
--- trunk/Tools/MiniBrowser/gtk/main.c 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/MiniBrowser/gtk/main.c 2020-06-16 09:31:14 UTC (rev 263085)
@@ -53,6 +53,7 @@
static const char *cookiesPolicy;
static const char *proxy;
static gboolean darkMode;
+static gboolean enableITP;
static gboolean printVersion;
typedef enum {
@@ -120,6 +121,7 @@
{ "ignore-host", 0, 0, G_OPTION_ARG_STRING_ARRAY, &ignoreHosts, "Set proxy ignore hosts", "HOSTS" },
{ "ignore-tls-errors", 0, 0, G_OPTION_ARG_NONE, &ignoreTLSErrors, "Ignore TLS errors", NULL },
{ "content-filter", 0, 0, G_OPTION_ARG_FILENAME, &contentFilter, "JSON with content filtering rules", "FILE" },
+ { "enable-itp", 0, 0, G_OPTION_ARG_NONE, &enableITP, "Enable Intelligent Tracking Prevention (ITP)", NULL },
{ "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WebKitGTK version", NULL },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, 0, "[URL…]" },
{ 0, 0, 0, 0, 0, 0, 0 }
@@ -422,6 +424,7 @@
aboutDataFillTable(result, dataRequest, dataList, "Plugins Data", WEBKIT_WEBSITE_DATA_PLUGIN_DATA, NULL, pageID);
aboutDataFillTable(result, dataRequest, dataList, "Offline Web Applications Cache", WEBKIT_WEBSITE_DATA_OFFLINE_APPLICATION_CACHE, webkit_website_data_manager_get_offline_application_cache_directory(manager), pageID);
aboutDataFillTable(result, dataRequest, dataList, "HSTS Cache", WEBKIT_WEBSITE_DATA_HSTS_CACHE, webkit_website_data_manager_get_hsts_cache_directory(manager), pageID);
+ aboutDataFillTable(result, dataRequest, dataList, "ITP data", WEBKIT_WEBSITE_DATA_ITP, webkit_website_data_manager_get_itp_directory(manager), pageID);
result = g_string_append(result, "</body></html>");
gsize streamLength = result->len;
@@ -531,6 +534,7 @@
static void activate(GApplication *application, WebKitSettings *webkitSettings)
{
WebKitWebsiteDataManager *manager = (privateMode || automationMode) ? webkit_website_data_manager_new_ephemeral() : webkit_website_data_manager_new(NULL);
+ webkit_website_data_manager_set_itp_enabled(manager, enableITP);
WebKitWebContext *webContext = g_object_new(WEBKIT_TYPE_WEB_CONTEXT, "website-data-manager", manager, "process-swap-on-cross-site-navigation-enabled", TRUE,
#if !GTK_CHECK_VERSION(3, 98, 0)
"use-system-appearance-for-scrollbars", FALSE,
Modified: trunk/Tools/MiniBrowser/wpe/main.cpp (263084 => 263085)
--- trunk/Tools/MiniBrowser/wpe/main.cpp 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/MiniBrowser/wpe/main.cpp 2020-06-16 09:31:14 UTC (rev 263085)
@@ -48,6 +48,7 @@
static const char* cookiesPolicy;
static const char* proxy;
const char* bgColor;
+static gboolean enableITP;
static gboolean printVersion;
static GHashTable* openViews;
@@ -63,6 +64,7 @@
{ "ignore-tls-errors", 0, 0, G_OPTION_ARG_NONE, &ignoreTLSErrors, "Ignore TLS errors", nullptr },
{ "content-filter", 0, 0, G_OPTION_ARG_FILENAME, &contentFilter, "JSON with content filtering rules", "FILE" },
{ "bg-color", 0, 0, G_OPTION_ARG_STRING, &bgColor, "Window background color. Default: white", "COLOR" },
+ { "enable-itp", 0, 0, G_OPTION_ARG_NONE, &enableITP, "Enable Intelligent Tracking Prevention (ITP)", nullptr },
{ "version", 'v', 0, G_OPTION_ARG_NONE, &printVersion, "Print the WPE version", nullptr },
{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &uriArguments, nullptr, "[URL]" },
{ nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr }
@@ -220,7 +222,10 @@
return 1;
}
- auto* webContext = (privateMode || automationMode) ? webkit_web_context_new_ephemeral() : webkit_web_context_get_default();
+ auto* manager = (privateMode || automationMode) ? webkit_website_data_manager_new_ephemeral() : webkit_website_data_manager_new(nullptr);
+ webkit_website_data_manager_set_itp_enabled(manager, enableITP);
+ auto* webContext = webkit_web_context_new_with_website_data_manager(manager);
+ g_object_unref(manager);
if (cookiesPolicy) {
auto* cookieManager = webkit_web_context_get_cookie_manager(webContext);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp (263084 => 263085)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebsiteData.cpp 2020-06-16 09:31:14 UTC (rev 263085)
@@ -33,7 +33,12 @@
return;
}
- if (g_str_equal(path, "/empty")) {
+ if (g_str_equal(path, "/")) {
+ const char* html = "<html><body></body></html>";
+ soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, html, strlen(html));
+ soup_message_body_complete(message->response_body);
+ soup_message_set_status(message, SOUP_STATUS_OK);
+ } else if (g_str_equal(path, "/empty")) {
static const char* emptyHTML = "<html><body></body></html>";
soup_message_headers_replace(message->response_headers, "Set-Cookie", "foo=bar; Max-Age=60");
soup_message_headers_replace(message->response_headers, "Strict-Transport-Security", "max-age=3600");
@@ -168,10 +173,13 @@
g_assert_cmpstr(hstsCacheDirectory.get(), ==, webkit_website_data_manager_get_hsts_cache_directory(test->m_manager));
g_assert_true(g_file_test(hstsCacheDirectory.get(), G_FILE_TEST_IS_DIR));
+ GUniquePtr<char> itpDirectory(g_build_filename(Test::dataDirectory(), "itp", nullptr));
+ g_assert_cmpstr(itpDirectory.get(), ==, webkit_website_data_manager_get_itp_directory(test->m_manager));
+
// Clear all persistent caches, since the data dir is common to all test cases. Note: not cleaning the HSTS cache here as its data
// is needed for the HSTS tests, where data cleaning will be tested.
static const WebKitWebsiteDataTypes persistentCaches = static_cast<WebKitWebsiteDataTypes>(WEBKIT_WEBSITE_DATA_DISK_CACHE | WEBKIT_WEBSITE_DATA_LOCAL_STORAGE
- | WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES | WEBKIT_WEBSITE_DATA_OFFLINE_APPLICATION_CACHE | WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT);
+ | WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES | WEBKIT_WEBSITE_DATA_OFFLINE_APPLICATION_CACHE | WEBKIT_WEBSITE_DATA_DEVICE_ID_HASH_SALT | WEBKIT_WEBSITE_DATA_ITP);
test->clear(persistentCaches, 0);
g_assert_null(test->fetch(persistentCaches));
@@ -198,6 +206,8 @@
applicationCacheDirectory.reset(g_build_filename(Test::dataDirectory(), "applications", nullptr));
g_assert_cmpstr(webkit_website_data_manager_get_offline_application_cache_directory(baseDataManager.get()), ==, applicationCacheDirectory.get());
+ g_assert_cmpstr(webkit_website_data_manager_get_itp_directory(baseDataManager.get()), ==, itpDirectory.get());
+
g_assert_cmpstr(webkit_website_data_manager_get_disk_cache_directory(baseDataManager.get()), ==, Test::dataDirectory());
// Any specific configuration provided takes precedence over base dirs.
@@ -209,6 +219,7 @@
g_assert_cmpstr(webkit_website_data_manager_get_offline_application_cache_directory(baseDataManager.get()), ==, applicationCacheDirectory.get());
// The result should be the same as previous manager.
g_assert_cmpstr(webkit_website_data_manager_get_local_storage_directory(baseDataManager.get()), ==, localStorageDirectory.get());
+ g_assert_cmpstr(webkit_website_data_manager_get_itp_directory(baseDataManager.get()), ==, itpDirectory.get());
g_assert_cmpstr(webkit_website_data_manager_get_disk_cache_directory(baseDataManager.get()), ==, Test::dataDirectory());
}
@@ -231,6 +242,7 @@
g_assert_null(webkit_website_data_manager_get_offline_application_cache_directory(manager.get()));
g_assert_null(webkit_website_data_manager_get_indexeddb_directory(manager.get()));
g_assert_null(webkit_website_data_manager_get_hsts_cache_directory(manager.get()));
+ g_assert_null(webkit_website_data_manager_get_itp_directory(manager.get()));
// Configuration is ignored when is-ephemeral is used.
manager = adoptGRef(WEBKIT_WEBSITE_DATA_MANAGER(g_object_new(WEBKIT_TYPE_WEBSITE_DATA_MANAGER, "base-data-directory", Test::dataDirectory(), "is-ephemeral", TRUE, nullptr)));
@@ -237,6 +249,9 @@
g_assert_true(webkit_website_data_manager_is_ephemeral(manager.get()));
g_assert_null(webkit_website_data_manager_get_base_data_directory(manager.get()));
+ webkit_website_data_manager_set_itp_enabled(manager.get(), TRUE);
+ g_assert(webkit_website_data_manager_get_itp_enabled(manager.get()));
+
// Non persistent data can be queried in an ephemeral manager.
GRefPtr<WebKitWebContext> webContext = adoptGRef(webkit_web_context_new_with_website_data_manager(manager.get()));
g_assert_true(webkit_web_context_is_ephemeral(webContext.get()));
@@ -248,6 +263,9 @@
webkit_web_view_load_uri(webView.get(), kServer->getURIForPath("/empty").data());
g_main_loop_run(test->m_mainLoop);
+ GUniquePtr<char> itpDirectory(g_build_filename(Test::dataDirectory(), "itp", nullptr));
+ g_assert(!g_file_test(itpDirectory.get(), G_FILE_TEST_IS_DIR));
+
webkit_website_data_manager_fetch(manager.get(), WEBKIT_WEBSITE_DATA_MEMORY_CACHE, nullptr, [](GObject* manager, GAsyncResult* result, gpointer userData) {
auto* test = static_cast<WebViewTest*>(userData);
GList* dataList = webkit_website_data_manager_fetch_finish(WEBKIT_WEBSITE_DATA_MANAGER(manager), result, nullptr);
@@ -262,6 +280,8 @@
test->quitMainLoop();
}, test);
g_main_loop_run(test->m_mainLoop);
+
+ webkit_website_data_manager_set_itp_enabled(manager.get(), FALSE);
}
static void testWebsiteDataCache(WebsiteDataTest* test, gconstpointer)
@@ -616,6 +636,43 @@
webkit_settings_set_enable_media_stream(settings, enabled);
}
+static void testWebsiteDataITP(WebsiteDataTest* test, gconstpointer)
+{
+ const char* itpDirectory = webkit_website_data_manager_get_itp_directory(test->m_manager);
+ GUniquePtr<char> itpLogFile(g_build_filename(itpDirectory, "full_browsing_session_resourceLog.plist", nullptr));
+
+ // Delete any previous data.
+ g_unlink(itpLogFile.get());
+ g_rmdir(itpDirectory);
+
+ g_assert_false(webkit_website_data_manager_get_itp_enabled(test->m_manager));
+ test->loadURI(kServer->getURIForPath("/").data());
+ test->waitUntilLoadFinished();
+
+ webkit_website_data_manager_set_itp_enabled(test->m_manager, TRUE);
+ g_assert_true(webkit_website_data_manager_get_itp_enabled(test->m_manager));
+ g_assert_false(g_file_test(itpDirectory, G_FILE_TEST_IS_DIR));
+ g_assert_false(g_file_test(itpLogFile.get(), G_FILE_TEST_IS_REGULAR));
+
+ test->loadURI(kServer->getURIForPath("/").data());
+ test->waitUntilLoadFinished();
+
+ test->waitUntilFileChanged(itpLogFile.get(), G_FILE_MONITOR_EVENT_CREATED);
+
+ g_assert_true(g_file_test(itpDirectory, G_FILE_TEST_IS_DIR));
+ g_assert_true(g_file_test(itpLogFile.get(), G_FILE_TEST_IS_REGULAR));
+
+ // Clear all.
+ static const WebKitWebsiteDataTypes cacheAndITP = static_cast<WebKitWebsiteDataTypes>(WEBKIT_WEBSITE_DATA_ITP | WEBKIT_WEBSITE_DATA_MEMORY_CACHE | WEBKIT_WEBSITE_DATA_DISK_CACHE);
+ test->clear(cacheAndITP, 0);
+ test->waitUntilFileChanged(itpLogFile.get(), G_FILE_MONITOR_EVENT_DELETED);
+
+ webkit_website_data_manager_set_itp_enabled(test->m_manager, FALSE);
+ g_assert_false(webkit_website_data_manager_get_itp_enabled(test->m_manager));
+
+ g_rmdir(itpDirectory);
+}
+
void beforeAll()
{
kServer = new WebKitTestServer();
@@ -636,6 +693,7 @@
WebsiteDataTest::add("WebKitWebsiteData", "hsts", testWebsiteDataHsts);
#endif
WebsiteDataTest::add("WebKitWebsiteData", "deviceidhashsalt", testWebsiteDataDeviceIdHashSalt);
+ WebsiteDataTest::add("WebKitWebsiteData", "itp", testWebsiteDataITP);
}
void afterAll()
Modified: trunk/Tools/TestWebKitAPI/glib/TestExpectations.json (263084 => 263085)
--- trunk/Tools/TestWebKitAPI/glib/TestExpectations.json 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/TestWebKitAPI/glib/TestExpectations.json 2020-06-16 09:31:14 UTC (rev 263085)
@@ -57,9 +57,6 @@
"/webkit/WebKitWebsiteData/storage": {
"expected": {"wpe": {"status": ["PASS", "FAIL"]}}
},
- "/webkit/WebKitWebsiteData/resource-load-statistics": {
- "expected": {"wpe": {"status": ["PASS", "FAIL"]}}
- },
"/webkit/WebKitWebsiteData/configuration": {
"expected": {"gtk": {"status": ["PASS", "FAIL"], "bug": "webkit.org/b/205441"}}
}
Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h (263084 => 263085)
--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2020-06-16 09:31:14 UTC (rev 263085)
@@ -124,10 +124,12 @@
GUniquePtr<char> applicationCacheDirectory(g_build_filename(dataDirectory(), "appcache", nullptr));
GUniquePtr<char> webSQLDirectory(g_build_filename(dataDirectory(), "websql", nullptr));
GUniquePtr<char> hstsDirectory(g_build_filename(dataDirectory(), "hsts", nullptr));
+ GUniquePtr<char> itpDirectory(g_build_filename(dataDirectory(), "itp", nullptr));
GRefPtr<WebKitWebsiteDataManager> websiteDataManager = adoptGRef(webkit_website_data_manager_new(
"local-storage-directory", localStorageDirectory.get(), "indexeddb-directory", indexedDBDirectory.get(),
"disk-cache-directory", diskCacheDirectory.get(), "offline-application-cache-directory", applicationCacheDirectory.get(),
- "websql-directory", webSQLDirectory.get(), "hsts-cache-directory", hstsDirectory.get(), nullptr));
+ "websql-directory", webSQLDirectory.get(), "hsts-cache-directory", hstsDirectory.get(),
+ "itp-directory", itpDirectory.get(), nullptr));
m_webContext = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT,
"website-data-manager", websiteDataManager.get(),
Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp (263084 => 263085)
--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.cpp 2020-06-16 09:31:14 UTC (rev 263085)
@@ -236,6 +236,24 @@
webkit_web_view_set_editable(m_webView, editable);
}
+static void directoryChangedCallback(GFileMonitor*, GFile* file, GFile*, GFileMonitorEvent event, WebViewTest* test)
+{
+ if (event == test->m_expectedFileChangeEvent && g_file_equal(file, test->m_monitoredFile.get()))
+ test->quitMainLoop();
+}
+
+void WebViewTest::waitUntilFileChanged(const char* filename, GFileMonitorEvent event)
+{
+ m_monitoredFile = adoptGRef(g_file_new_for_path(filename));
+ m_expectedFileChangeEvent = event;
+ GRefPtr<GFile> directory = adoptGRef(g_file_get_parent(m_monitoredFile.get()));
+ GRefPtr<GFileMonitor> monitor = adoptGRef(g_file_monitor_directory(directory.get(), G_FILE_MONITOR_NONE, nullptr, nullptr));
+ g_assert(monitor.get());
+ g_signal_connect(monitor.get(), "changed", G_CALLBACK(directoryChangedCallback), this);
+ if (!g_file_query_exists(m_monitoredFile.get(), nullptr))
+ g_main_loop_run(m_mainLoop);
+}
+
static void resourceGetDataCallback(GObject* object, GAsyncResult* result, gpointer userData)
{
size_t dataSize;
Modified: trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h (263084 => 263085)
--- trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h 2020-06-16 09:18:09 UTC (rev 263084)
+++ trunk/Tools/TestWebKitAPI/glib/WebKitGLib/WebViewTest.h 2020-06-16 09:31:14 UTC (rev 263085)
@@ -52,6 +52,7 @@
void waitUntilLoadFinished();
void waitUntilTitleChangedTo(const char* expectedTitle);
void waitUntilTitleChanged();
+ void waitUntilFileChanged(const char*, GFileMonitorEvent);
void resizeView(int width, int height);
void hideView();
void selectAll();
@@ -111,6 +112,8 @@
size_t m_resourceDataSize { 0 };
cairo_surface_t* m_surface { nullptr };
bool m_expectedWebProcessCrash { false };
+ GRefPtr<GFile> m_monitoredFile;
+ GFileMonitorEvent m_expectedFileChangeEvent;
#if PLATFORM(GTK)
GtkWidget* m_parentWindow { nullptr };