Add settings to allow running and displaying insecure content

Don't upgrade mixed content when insecure content is allowed

Author: pgorszkowski-igalia

Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp

@@ -191,6 +191,8 @@ enum {
     PROP_WEBRTC_UDP_PORTS_RANGE,
     PROP_ALLOW_SCRIPTS_TO_CLOSE_WINDOWS,
     PROP_ENABLE_DIRECTORY_UPLOAD,
+    PROP_ALLOW_RUNNING_OF_INSECURE_CONTENT,
+    PROP_ALLOW_DISPLAY_OF_INSECURE_CONTENT,
     N_PROPERTIES,
 };
 
@@ -427,6 +429,12 @@ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     case PROP_ENABLE_DIRECTORY_UPLOAD:
         webkit_settings_set_enable_directory_upload(settings, g_value_get_boolean(value));
         break;
+    case PROP_ALLOW_RUNNING_OF_INSECURE_CONTENT:
+        webkit_settings_set_allow_running_of_insecure_content(settings, g_value_get_boolean(value));
+        break;
+    case PROP_ALLOW_DISPLAY_OF_INSECURE_CONTENT:
+        webkit_settings_set_allow_display_of_insecure_content(settings, g_value_get_boolean(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
         break;
@@ -647,6 +655,12 @@ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     case PROP_ENABLE_DIRECTORY_UPLOAD:
         g_value_set_boolean(value, webkit_settings_get_enable_directory_upload(settings));
         break;
+    case PROP_ALLOW_RUNNING_OF_INSECURE_CONTENT:
+        g_value_set_boolean(value, webkit_settings_get_allow_running_of_insecure_content(settings));
+        break;
+    case PROP_ALLOW_DISPLAY_OF_INSECURE_CONTENT:
+        g_value_set_boolean(value, webkit_settings_get_allow_display_of_insecure_content(settings));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
         break;
@@ -1755,6 +1769,30 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
         TRUE,
         readWriteConstructParamFlags);
 
+    /**
+     * WebKitSettings:allow-running-of-insecure-content:
+     *
+     * Allow running of insecure content on pages
+     */
+    sObjProperties[PROP_ALLOW_RUNNING_OF_INSECURE_CONTENT] = g_param_spec_boolean(
+        "allow-running-of-insecure-content",
+        _("Allow running insecure content"),
+        _("Whether running insecure content should be allowed."),
+        FALSE,
+        readWriteConstructParamFlags);
+
+    /**
+     * WebKitSettings:allow-display-of-insecure-content:
+     *
+     * Allow display of insecure content on pages
+     */
+    sObjProperties[PROP_ALLOW_DISPLAY_OF_INSECURE_CONTENT] = g_param_spec_boolean(
+        "allow-display-of-insecure-content",
+        _("Allow display insecure content"),
+        _("Whether display insecure content should be allowed."),
+        FALSE,
+        readWriteConstructParamFlags);
+
     g_object_class_install_properties(gObjectClass, N_PROPERTIES, sObjProperties.data());
 }
 
@@ -4549,3 +4587,83 @@ void webkit_settings_set_enable_directory_upload(WebKitSettings* settings, gbool
     priv->preferences->setDirectoryUploadEnabled(enabled);
     g_object_notify(G_OBJECT(settings), "enable-directory-upload");
 }
+
+/**
+ * webkit_settings_get_allow_running_of_insecure_content:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:allow-running-of-insecure-content property.
+ *
+ * Returns: %TRUE If running of insecure content is allowed or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_allow_running_of_insecure_content(WebKitSettings* settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+    return settings->priv->preferences->allowRunningOfInsecureContent();
+}
+
+/**
+ * webkit_settings_set_allow_running_of_insecure_content:
+ * @settings: a #WebKitSettings
+ * @allowed: Value to be set
+ *
+ * Set the #WebKitSettings:allow-running-of-insecure-content property.
+ */
+void webkit_settings_set_allow_running_of_insecure_content(WebKitSettings* settings, gboolean allowed)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    bool currentValue = priv->preferences->allowRunningOfInsecureContent();
+    if (currentValue == allowed)
+        return;
+
+    priv->preferences->setAllowRunningOfInsecureContent(allowed);
+
+    // If we are allowed to run insecure content, then upgrade mixed content should not be performed
+    if (allowed)
+        priv->preferences->setUpgradeMixedContentEnabled(false);
+
+    g_object_notify_by_pspec(G_OBJECT(settings), sObjProperties[PROP_ALLOW_RUNNING_OF_INSECURE_CONTENT]);
+}
+
+/**
+ * webkit_settings_get_allow_display_of_insecure_content:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:allow-display-of-insecure-content property.
+ *
+ * Returns: %TRUE If display of insecure content is allowed or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_allow_display_of_insecure_content(WebKitSettings* settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+    return settings->priv->preferences->allowDisplayOfInsecureContent();
+}
+
+/**
+ * webkit_settings_set_allow_display_of_insecure_content:
+ * @settings: a #WebKitSettings
+ * @allowed: Value to be set
+ *
+ * Set the #WebKitSettings:allow-display-of-insecure-content property.
+ */
+void webkit_settings_set_allow_display_of_insecure_content(WebKitSettings* settings, gboolean allowed)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    bool currentValue = priv->preferences->allowDisplayOfInsecureContent();
+    if (currentValue == allowed)
+        return;
+
+    priv->preferences->setAllowDisplayOfInsecureContent(allowed);
+
+    // If we are allowed to display insecure content, then upgrade mixed content should not be performed
+    if (allowed)
+        priv->preferences->setUpgradeMixedContentEnabled(false);
+
+    g_object_notify_by_pspec(G_OBJECT(settings), sObjProperties[PROP_ALLOW_DISPLAY_OF_INSECURE_CONTENT]);
+}

Source/WebKit/UIProcess/API/glib/WebKitSettings.h.in

@@ -582,6 +582,20 @@ WEBKIT_API void
 webkit_settings_set_webrtc_udp_ports_range                     (WebKitSettings *settings,
                                                                 const gchar    *udp_port_range);
 
+WEBKIT_API gboolean
+webkit_settings_get_allow_running_of_insecure_content          (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_allow_running_of_insecure_content          (WebKitSettings *settings,
+                                                                gboolean        allowed);
+
+WEBKIT_API gboolean
+webkit_settings_get_allow_display_of_insecure_content          (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_allow_display_of_insecure_content          (WebKitSettings *settings,
+                                                                gboolean        allowed);
+
 WEBKIT_API gboolean
 webkit_settings_get_allow_scripts_to_close_windows              (WebKitSettings *settings);