Changeset 231637 in webkit

Timestamp:

May 10, 2018, 1:37:37 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add support for settings cookies policy and storage type in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=185506

Reviewed by Philippe Normand.

Useful for testing and debugging.

• MiniBrowser/gtk/main.c:

(main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/main.c (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-05-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add support for settings cookies policy and storage type in MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=185506
+
+        Reviewed by Philippe Normand.
+
+        Useful for testing and debugging.
+
+        * MiniBrowser/gtk/main.c:
+        (main):
+
 2018-05-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/MiniBrowser/gtk/main.c

@@ -47 +47 @@
 static gboolean fullScreen;
 static gboolean enableIntelligentTrackingPrevention;
+static const char *cookiesFile;
+static const char *cookiesPolicy;
 static const char *proxy;
 
@@ -105 +107 @@
     { "automation", 0, 0, G_OPTION_ARG_NONE, &automationMode, "Run in automation mode", NULL },
     { "enable-itp", 0, 0, G_OPTION_ARG_NONE, &enableIntelligentTrackingPrevention, "Enable intelligent tracking prevention", NULL },
+    { "cookies-file", 'c', 0, G_OPTION_ARG_FILENAME, &cookiesFile, "Persistent cookie storage database file", "FILE" },
+    { "cookies-policy", 0, 0, G_OPTION_ARG_STRING, &cookiesPolicy, "Cookies accept policy (always, never, no-third-party). Default: no-third-party", "POLICY" },
     { "proxy", 0, 0, G_OPTION_ARG_STRING, &proxy, "Set proxy", "PROXY" },
     { "ignore-host", 0, 0, G_OPTION_ARG_STRING_ARRAY, &ignoreHosts, "Set proxy ignore hosts", "HOSTS" },
@@ -497 +501 @@
     WebKitWebContext *webContext = (privateMode || automationMode) ? webkit_web_context_new_ephemeral() : webkit_web_context_get_default();
 
+    if (cookiesPolicy) {
+        WebKitCookieManager *cookieManager = webkit_web_context_get_cookie_manager(webContext);
+        GEnumClass *enumClass = g_type_class_ref(WEBKIT_TYPE_COOKIE_ACCEPT_POLICY);
+        GEnumValue *enumValue = g_enum_get_value_by_nick(enumClass, cookiesPolicy);
+        if (enumValue)
+            webkit_cookie_manager_set_accept_policy(cookieManager, enumValue->value);
+        g_type_class_unref(enumClass);
+    }
+
+    if (cookiesFile && !webkit_web_context_is_ephemeral(webContext)) {
+        WebKitCookieManager *cookieManager = webkit_web_context_get_cookie_manager(webContext);
+        WebKitCookiePersistentStorage storageType = g_str_has_suffix(cookiesFile, ".txt") ? WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT : WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE;
+        webkit_cookie_manager_set_persistent_storage(cookieManager, cookiesFile, storageType);
+    }
+
     if (proxy) {
         WebKitNetworkProxySettings *webkitProxySettings = webkit_network_proxy_settings_new(proxy, ignoreHosts);