Changeset 44904 in webkit

Timestamp:

Jun 20, 2009 2:57:16 PM (15 years ago)

Author:

jmalonzo@webkit.org

Message:

Reviewed by Gustavo Noronha and Xan Lopez.

[Gtk] Implement DRT XSS auditor support
​https://bugs.webkit.org/show_bug.cgi?id=26571

• webkit/webkitwebsettings.cpp: (webkit_web_settings_class_init): (webkit_web_settings_set_property): (webkit_web_settings_get_property): (webkit_web_settings_copy):
• webkit/webkitwebview.cpp: (webkit_web_view_update_settings): (webkit_web_view_settings_notify):
• DumpRenderTree/gtk/DumpRenderTree.cpp: (resetWebViewToConsistentStateBeforeTesting):
• DumpRenderTree/gtk/LayoutTestControllerGtk.cpp: (LayoutTestController::setXSSAuditorEnabled):

Location:

trunk

Files:

• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebsettings.cpp (modified) (6 diffs)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (4 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-06-20  Jan Michael Alonzo  <jmalonzo@webkit.org>
+
+        Reviewed by Gustavo Noronha and Xan Lopez.
+
+        [Gtk] Implement DRT XSS auditor support
+        https://bugs.webkit.org/show_bug.cgi?id=26571
+
+        Add a setting "enable-xss-auditor" to enable this feature.
+
+        * webkit/webkitwebsettings.cpp:
+        (webkit_web_settings_class_init):
+        (webkit_web_settings_set_property):
+        (webkit_web_settings_get_property):
+        (webkit_web_settings_copy):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_update_settings):
+        (webkit_web_view_settings_notify):
+
 2009-06-20  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/WebKit/gtk/webkit/webkitwebsettings.cpp

@@ -81 +81 @@
     gboolean enable_html5_database;
     gboolean enable_html5_local_storage;
+    gboolean enable_xss_auditor;
 };
 
@@ -114 +115 @@
     PROP_ENABLE_CARET_BROWSING,
     PROP_ENABLE_HTML5_DATABASE,
-    PROP_ENABLE_HTML5_LOCAL_STORAGE
+    PROP_ENABLE_HTML5_LOCAL_STORAGE,
+    PROP_ENABLE_XSS_AUDITOR
 };
 
@@ -454 +456 @@
                                                          _("Whether to enable HTML5 Local Storage support"),
                                                          TRUE,
+                                                         flags));
+    /**
+    * WebKitWebSettings:enable-xss-auditor
+    *
+    * Whether to enable the XSS Auditor. This feature filters some kinds of
+    * reflective XSS attacks on vulnerable web sites.
+    *
+    * This is currently an experimental feature.
+    *
+    * Since 1.1.11
+    */
+    g_object_class_install_property(gobject_class,
+                                    PROP_ENABLE_XSS_AUDITOR,
+                                    g_param_spec_boolean("enable-xss-auditor",
+                                                         _("Enable XSS Auditor"),
+                                                         _("Whether to enable teh XSS auditor"),
+                                                         FALSE,
                                                          flags));
 
@@ -618 +637 @@
         priv->spell_checking_languages_list = spellLanguages;
         break;
+    case PROP_ENABLE_XSS_AUDITOR:
+        priv->enable_xss_auditor = g_value_get_boolean(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -710 +732 @@
     case PROP_SPELL_CHECKING_LANGUAGES:
         g_value_set_string(value, priv->spell_checking_languages);
+        break;
+    case PROP_ENABLE_XSS_AUDITOR:
+        g_value_set_boolean(value, priv->enable_xss_auditor);
         break;
     default:
@@ -769 +794 @@
                  "enable-html5-database", priv->enable_html5_database,
                  "enable-html5-local-storage", priv->enable_html5_local_storage,
+                 "enable-xss-auditor", priv->enable_xss_auditor,
                  NULL));
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -2050 +2050 @@
     gboolean autoLoadImages, autoShrinkImages, printBackgrounds,
         enableScripts, enablePlugins, enableDeveloperExtras, resizableTextAreas,
-        enablePrivateBrowsing, enableCaretBrowsing, enableHTML5Database, enableHTML5LocalStorage;
+        enablePrivateBrowsing, enableCaretBrowsing, enableHTML5Database, enableHTML5LocalStorage,
+        enableXSSAuditor;
 
     g_object_get(webSettings,
@@ -2072 +2073 @@
                  "enable-html5-database", &enableHTML5Database,
                  "enable-html5-local-storage", &enableHTML5LocalStorage,
+                 "enable-xss-auditor", &enableXSSAuditor,
                  NULL);
 
@@ -2093 +2095 @@
     settings->setDatabasesEnabled(enableHTML5Database);
     settings->setLocalStorageEnabled(enableHTML5LocalStorage);
+    settings->setXSSAuditorEnabled(enableXSSAuditor);
 
     g_free(defaultEncoding);
@@ -2169 +2172 @@
     else if (name == g_intern_string("enable-html5-local-storage"))
         settings->setLocalStorageEnabled(g_value_get_boolean(&value));
+    else if (name == g_intern_string("enable-xss-auditor"))
+        settings->setXSSAuditorEnabled(g_value_get_boolean(&value));
     else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name))
         g_warning("Unexpected setting '%s'", name);

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-06-20  Jan Michael Alonzo  <jmalonzo@webkit.org>
+
+        Reviewed by Gustavo Noronha and Xan Lopez.
+
+        [Gtk] Implement DRT XSS auditor support
+        https://bugs.webkit.org/show_bug.cgi?id=26571
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetWebViewToConsistentStateBeforeTesting):
+        * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+        (LayoutTestController::setXSSAuditorEnabled):
+
 2009-06-19  Darin Adler  <darin@apple.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -235 +235 @@
                  "enable-html5-database", TRUE,
                  "enable-html5-local-storage", TRUE,
+                 "enable-xss-auditor", TRUE,
                  NULL);
 

trunk/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp

@@ -246 +246 @@
 void LayoutTestController::setXSSAuditorEnabled(bool flag)
 {
-    // FIXME: implement
+    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+    ASSERT(view);
+
+    WebKitWebSettings* settings = webkit_web_view_get_settings(view);
+    g_object_set(G_OBJECT(settings), "enable-xss-auditor", flag, NULL);
 }