Add a setting to allow closing windows from scripts

Author: magomez

Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml

@@ -291,6 +291,20 @@ AllowRunningOfInsecureContent:
     WebCore:
       default: false
 
+AllowScriptsToCloseWindows:
+  type: bool
+  status: embedder
+  humanReadableName: "Allow scripts to close windows"
+  humanReadableDescription: "Allow scripts to close windows"
+  condition: PLATFORM(WPE)
+  defaultValue:
+    WebKitLegacy:
+      default: false
+    WebKit:
+      default: false
+    WebCore:
+      default: false
+
 AllowSettingAnyXHRHeaderFromFileURLs:
   type: bool
   status: embedder

Source/WebCore/page/DOMWindow.cpp

@@ -112,7 +112,7 @@ void DOMWindow::close()
     if (!frame->isMainFrame())
         return;
 
-    if (!(page->openedByDOM() || page->backForward().count() <= 1)) {
+    if (!(page->openedByDOM() || page->backForward().count() <= 1 || frame->settings().allowScriptsToCloseWindows())) {
         checkedConsole()->addMessage(MessageSource::JS, MessageLevel::Warning, "Can't close the window since it was not opened by JavaScript"_s);
         return;
     }

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

@@ -174,6 +174,7 @@ enum {
     PROP_MEDIA_CONTENT_TYPES_REQUIRING_HARDWARE_SUPPORT,
     PROP_ENABLE_WEBRTC,
     PROP_DISABLE_WEB_SECURITY,
+    PROP_ALLOW_SCRIPTS_TO_CLOSE_WINDOWS,
     N_PROPERTIES,
 };
 
@@ -409,6 +410,9 @@ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     case PROP_DISABLE_WEB_SECURITY:
         webkit_settings_set_disable_web_security(settings, g_value_get_boolean(value));
         break;
+    case PROP_ALLOW_SCRIPTS_TO_CLOSE_WINDOWS:
+        webkit_settings_set_allow_scripts_to_close_windows(settings, g_value_get_boolean(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
         break;
@@ -617,6 +621,9 @@ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     case PROP_DISABLE_WEB_SECURITY:
         g_value_set_boolean(value, webkit_settings_get_disable_web_security(settings));
         break;
+    case PROP_ALLOW_SCRIPTS_TO_CLOSE_WINDOWS:
+        g_value_set_boolean(value, webkit_settings_get_allow_scripts_to_close_windows(settings));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
         break;
@@ -1618,6 +1625,19 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
         FALSE,
         readWriteConstructParamFlags);
 
+    /**
+     * WebKitSettings:allow-scripts-to-close-windows:
+     *
+     * Allow scripts to close windows they didn't open.
+     *
+     */
+    sObjProperties[PROP_ALLOW_SCRIPTS_TO_CLOSE_WINDOWS] = g_param_spec_boolean(
+        "allow-scripts-to-close-windows",
+        _("Allow scripts to close windows"),
+        _("Whether scripts can close windows they didn't open."),
+        FALSE,
+        readWriteConstructParamFlags);
+
     g_object_class_install_properties(gObjectClass, N_PROPERTIES, sObjProperties);
 }
 
@@ -4131,3 +4151,39 @@ WebKitFeatureList* webkit_settings_get_development_features(void)
 {
     return webkitFeatureListCreate(WebPreferences::internalDebugFeatures());
 }
+
+/**
+ * webkit_settings_get_allow_scripts_to_close_windows:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:allow-scripts-to-close-windows property.
+ *
+ * Returns: %TRUE If script can close windows not opened by them or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_allow_scripts_to_close_windows (WebKitSettings *settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+    return settings->priv->preferences->allowScriptsToCloseWindows();
+}
+
+/**
+ * webkit_settings_set_allow_scripts_to_close_windows
+ * @settings: a #WebKitSettings
+ * @allowed: Value to be set
+ *
+ * Set the #WebKitSettings:allow-scripts-to-close-windows property.
+ */
+WEBKIT_API void
+webkit_settings_set_allow_scripts_to_close_windows(WebKitSettings *settings, gboolean allowed)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    bool currentValue = priv->preferences->allowScriptsToCloseWindows();
+    if (currentValue == allowed)
+        return;
+
+    priv->preferences->setAllowScriptsToCloseWindows(allowed);
+    g_object_notify(G_OBJECT(settings), "allow-scripts-to-close-windows");
+}

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

@@ -562,6 +562,13 @@ webkit_settings_get_experimental_features                      (void);
 WEBKIT_API WebKitFeatureList *
 webkit_settings_get_development_features                       (void);
 
+WEBKIT_API gboolean
+webkit_settings_get_allow_scripts_to_close_windows              (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_allow_scripts_to_close_windows              (WebKitSettings *settings,
+                                                                 gboolean        allowed);
+
 G_END_DECLS
 
 #endif /* WebKitSettings_h */