Diff
Modified: trunk/Source/WebKit/ChangeLog (241257 => 241258)
--- trunk/Source/WebKit/ChangeLog 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Source/WebKit/ChangeLog 2019-02-11 06:36:04 UTC (rev 241258)
@@ -1,3 +1,23 @@
+2019-02-04 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Add enable-_javascript_-markup setting
+ https://bugs.webkit.org/show_bug.cgi?id=193439
+
+ Reviewed by Michael Catanzaro.
+
+ Expose _javascript_MarkupEnabled setting in the GLib API.
+
+ * UIProcess/API/glib/WebKitSettings.cpp:
+ (webKitSettingsSetProperty):
+ (webKitSettingsGetProperty):
+ (webkit_settings_class_init):
+ (webkit_settings_get_enable_javascript_markup):
+ (webkit_settings_set_enable_javascript_markup):
+ * UIProcess/API/gtk/WebKitSettings.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt:
+ * UIProcess/API/wpe/WebKitSettings.h:
+ * UIProcess/API/wpe/docs/wpe-0.1-sections.txt:
+
2019-02-10 Darin Adler <[email protected]>
Switch uses of StringBuilder with String::format for hex numbers to use HexNumber.h instead
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (241257 => 241258)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp 2019-02-11 06:36:04 UTC (rev 241258)
@@ -166,6 +166,7 @@
PROP_HARDWARE_ACCELERATION_POLICY,
PROP_ENABLE_BACK_FORWARD_NAVIGATION_GESTURES,
#endif
+ PROP_ENABLE_JAVASCRIPT_MARKUP,
};
static void webKitSettingsDispose(GObject* object)
@@ -389,6 +390,9 @@
webkit_settings_set_enable_back_forward_navigation_gestures(settings, g_value_get_boolean(value));
break;
#endif
+ case PROP_ENABLE_JAVASCRIPT_MARKUP:
+ webkit_settings_set_enable_javascript_markup(settings, g_value_get_boolean(value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -571,6 +575,9 @@
g_value_set_boolean(value, webkit_settings_get_enable_back_forward_navigation_gestures(settings));
break;
#endif
+ case PROP_ENABLE_JAVASCRIPT_MARKUP:
+ g_value_set_boolean(value, webkit_settings_get_enable_javascript_markup(settings));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -1469,6 +1476,23 @@
FALSE,
readWriteConstructParamFlags));
#endif // PLATFOTM(GTK)
+
+ /**
+ * WebKitSettings:enable-_javascript_-markup:
+ *
+ * Determines whether or not _javascript_ markup is allowed in document. When this setting is disabled,
+ * all _javascript_-related elements and attributes are removed from the document during parsing. Note that
+ * executing _javascript_ is still allowed if #WebKitSettings:enable-_javascript_ is %TRUE.
+ *
+ * Since: 2.24
+ */
+ g_object_class_install_property(gObjectClass,
+ PROP_ENABLE_JAVASCRIPT_MARKUP,
+ g_param_spec_boolean("enable-_javascript_-markup",
+ _("Enable _javascript_ Markup"),
+ _("Enable _javascript_ in document markup."),
+ TRUE,
+ readWriteConstructParamFlags));
}
WebPreferences* webkitSettingsGetPreferences(WebKitSettings* settings)
@@ -3611,3 +3635,42 @@
return std::round(points * WebCore::screenDPI() / 72);
}
#endif // PLATFORM(GTK)
+
+/**
+ * webkit_settings_get_enable_javascript_markup:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:enable-_javascript_-markup property.
+ *
+ * Returns: %TRUE if _javascript_ markup is enabled or %FALSE otherwise.
+ *
+ * Since: 2.24
+ */
+gboolean webkit_settings_get_enable_javascript_markup(WebKitSettings* settings)
+{
+ g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+ return settings->priv->preferences->_javascript_MarkupEnabled();
+}
+
+/**
+ * webkit_settings_set_enable_javascript_markup:
+ * @settings: a #WebKitSettings
+ * @enabled: Value to be set
+ *
+ * Set the #WebKitSettings:enable-_javascript_-markup property.
+ *
+ * Since: 2.24
+ */
+void webkit_settings_set_enable_javascript_markup(WebKitSettings* settings, gboolean enabled)
+{
+ g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+ WebKitSettingsPrivate* priv = settings->priv;
+ bool currentValue = priv->preferences->_javascript_MarkupEnabled();
+ if (currentValue == enabled)
+ return;
+
+ priv->preferences->setJavaScriptMarkupEnabled(enabled);
+ g_object_notify(G_OBJECT(settings), "enable-_javascript_-markup");
+}
Modified: trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h (241257 => 241258)
--- trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Source/WebKit/UIProcess/API/gtk/WebKitSettings.h 2019-02-11 06:36:04 UTC (rev 241258)
@@ -485,6 +485,13 @@
WEBKIT_API guint32
webkit_settings_font_size_to_pixels (guint32 points);
+WEBKIT_API gboolean
+webkit_settings_get_enable_javascript_markup (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_enable_javascript_markup (WebKitSettings *settings,
+ gboolean enabled);
+
G_END_DECLS
#endif /* WebKitSettings_h */
Modified: trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt (241257 => 241258)
--- trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt 2019-02-11 06:36:04 UTC (rev 241258)
@@ -393,6 +393,8 @@
webkit_settings_set_enable_java
webkit_settings_get_enable_javascript
webkit_settings_set_enable_javascript
+webkit_settings_get_enable_javascript_markup
+webkit_settings_set_enable_javascript_markup
webkit_settings_get_enable_offline_web_application_cache
webkit_settings_set_enable_offline_web_application_cache
webkit_settings_get_enable_plugins
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h (241257 => 241258)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitSettings.h 2019-02-11 06:36:04 UTC (rev 241258)
@@ -442,6 +442,13 @@
webkit_settings_set_allow_universal_access_from_file_urls (WebKitSettings *settings,
gboolean allowed);
+WEBKIT_API gboolean
+webkit_settings_get_enable_javascript_markup (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_enable_javascript_markup (WebKitSettings *settings,
+ gboolean enabled);
+
G_END_DECLS
#endif /* WebKitSettings_h */
Modified: trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt (241257 => 241258)
--- trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt 2019-02-11 06:36:04 UTC (rev 241258)
@@ -376,6 +376,8 @@
webkit_settings_set_enable_java
webkit_settings_get_enable_javascript
webkit_settings_set_enable_javascript
+webkit_settings_get_enable_javascript_markup
+webkit_settings_set_enable_javascript_markup
webkit_settings_get_enable_offline_web_application_cache
webkit_settings_set_enable_offline_web_application_cache
webkit_settings_get_enable_plugins
Modified: trunk/Tools/ChangeLog (241257 => 241258)
--- trunk/Tools/ChangeLog 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Tools/ChangeLog 2019-02-11 06:36:04 UTC (rev 241258)
@@ -1,3 +1,17 @@
+2019-02-04 Carlos Garcia Campos <[email protected]>
+
+ [GTK][WPE] Add enable-_javascript_-markup setting
+ https://bugs.webkit.org/show_bug.cgi?id=193439
+
+ Reviewed by Michael Catanzaro.
+
+ Add test cases to check the new setting.
+
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp:
+ (testWebKitSettings):
+ (testWebKitSettingsJavaScriptMarkup):
+ (beforeAll):
+
2019-02-10 Darin Adler <[email protected]>
Switch uses of StringBuilder with String::format for hex numbers to use HexNumber.h instead
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp (241257 => 241258)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2019-02-11 06:17:53 UTC (rev 241257)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp 2019-02-11 06:36:04 UTC (rev 241258)
@@ -355,6 +355,11 @@
g_assert_true(webkit_settings_get_enable_back_forward_navigation_gestures(settings));
#endif
+ // _javascript_ markup is enabled by default.
+ g_assert_true(webkit_settings_get_enable_javascript_markup(settings));
+ webkit_settings_set_enable_javascript_markup(settings, FALSE);
+ g_assert_false(webkit_settings_get_enable_javascript_markup(settings));
+
g_object_unref(G_OBJECT(settings));
}
@@ -425,6 +430,31 @@
}
#endif // PLATFORM(GTK)
+static void testWebKitSettingsJavaScriptMarkup(WebViewTest* test, gconstpointer)
+{
+ webkit_settings_set_enable_javascript_markup(webkit_web_view_get_settings(test->m_webView), FALSE);
+ static const char* html =
+ "<html>"
+ " <head>"
+ " <title>No _javascript_ allowed</title>"
+ " <script>document.title = '_javascript_ allowed from head script'</script>"
+ " </head>"
+ " <body _onload_='document.title = \"_javascript_ allowed from body onload attribute\"'>"
+ " <p>No _javascript_ markup should be allowed</p>"
+ " <script>document.title = '_javascript_ allowed from body script'</script>"
+ " </body>"
+ "</html>";
+ test->loadHtml(html, nullptr);
+ test->waitUntilLoadFinished();
+
+ g_assert_cmpstr(webkit_web_view_get_title(test->m_webView), ==, "No _javascript_ allowed");
+ auto* jsResult = test->runJavaScriptAndWaitUntilFinished("document.getElementsByTagName('script').length", nullptr);
+ g_assert(jsResult);
+ g_assert_cmpfloat(WebViewTest::_javascript_ResultToNumber(jsResult), ==, 0);
+
+ webkit_settings_set_enable_javascript_markup(webkit_web_view_get_settings(test->m_webView), TRUE);
+}
+
static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
{
if (message->method != SOUP_METHOD_GET) {
@@ -451,6 +481,7 @@
#if PLATFORM(GTK)
WebViewTest::add("WebKitSettings", "user-agent", testWebKitSettingsUserAgent);
#endif
+ WebViewTest::add("WebKitSettings", "_javascript_-markup", testWebKitSettingsJavaScriptMarkup);
}
void afterAll()