Attachment 361824 Details for Bug 194553 – Patch

[patch] Patch

bug-194553-20190212145500.patch (text/plain), 9.62 KB, created by Michael Catanzaro on 2019-02-12 12:55:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-02-12 12:55:01 PST

Size: 9.62 KB

patch

obsolete

>Subversion Revision: 241304
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index fca2de30ac1e71e47e6ef786bea2293234b368aa..db088b19bf46c98cd684867437b01abf1a33b81c 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-02-12  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK][STABLE] Remove sandbox APIs from 2.24 branch
>+        https://bugs.webkit.org/show_bug.cgi?id=194553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/API/glib/WebKitWebContext.cpp:
>+        (webkit_web_context_set_sandbox_enabled): Deleted.
>+        (webkit_web_context_add_path_to_sandbox): Deleted.
>+        (webkit_web_context_get_sandbox_enabled): Deleted.
>+        * UIProcess/API/gtk/WebKitWebContext.h:
>+        * UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt:
>+        * UIProcess/API/wpe/WebKitWebContext.h:
>+        * UIProcess/API/wpe/docs/wpe-0.1-sections.txt:
>+
> 2019-02-12  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK] Unsafe g_unsetenv() use in WebProcessPool::platformInitialize
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
>index 724c5fbf5e847ced1f30fb08cfd58d8d1f569f0b..deb5e06c8b13c9d0e46efce211a2b120d6693c28 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
>@@ -1147,73 +1147,6 @@ void webkit_web_context_register_uri_scheme(WebKitWebContext* context, const cha
>         context->priv->processPool->registerSchemeForCustomProtocol(String::fromUTF8(scheme));
> }
> 
>-/**
>- * webkit_web_context_set_sandbox_enabled:
>- * @context: a #WebKitWebContext
>- * @enabled: if %TRUE enable sandboxing
>- *
>- * Set whether WebKit subprocesses will be sandboxed, limiting access to the system.
>- *
>- * This method **must be called before any web process has been created**,
>- * as early as possible in your application. Calling it later is a fatal error.
>- *
>- * This is only implemented on Linux and is a no-op otherwise.
>- *
>- * Since: 2.24
>- */
>-void webkit_web_context_set_sandbox_enabled(WebKitWebContext* context, gboolean enabled)
>-{
>-    g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
>-
>-    if (context->priv->processPool->processes().size())
>-        g_error("Sandboxing cannot be changed after subprocesses were spawned.");
>-
>-    context->priv->processPool->setSandboxEnabled(enabled);
>-}
>-
>-/**
>- * webkit_web_context_add_path_to_sandbox:
>- * @context: a #WebKitWebContext
>- * @path: (type filename): an absolute path to mount in the sandbox
>- * @read_only: if %TRUE the path will be read-only
>- *
>- * Adds a path to be mounted in the sandbox. @path must exist before any web process
>- * has been created otherwise it will be silently ignored. It is a fatal error to
>- * add paths after a web process has been spawned.
>- *
>- * See also webkit_web_context_set_sandbox_enabled()
>- *
>- * Since: 2.24
>- */
>-void webkit_web_context_add_path_to_sandbox(WebKitWebContext* context, const char* path, gboolean readOnly)
>-{
>-    g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
>-    g_return_if_fail(g_path_is_absolute(path));
>-
>-    if (context->priv->processPool->processes().size())
>-        g_error("Sandbox paths cannot be changed after subprocesses were spawned.");
>-
>-    auto permission = readOnly ? SandboxPermission::ReadOnly : SandboxPermission::ReadWrite;
>-    context->priv->processPool->addSandboxPath(path, permission);
>-}
>-
>-/**
>- * webkit_web_context_get_sandbox_enabled:
>- * @context: a #WebKitWebContext
>- *
>- * Get whether sandboxing is currently enabled.
>- *
>- * Returns: %TRUE if sandboxing is enabled, or %FALSE otherwise.
>- *
>- * Since: 2.24
>- */
>-gboolean webkit_web_context_get_sandbox_enabled(WebKitWebContext* context)
>-{
>-    g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), FALSE);
>-
>-    return context->priv->processPool->sandboxEnabled();
>-}
>-
> /**
>  * webkit_web_context_get_spell_checking_enabled:
>  * @context: a #WebKitWebContext
>diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h
>index 81351af3c51080eb73c24505c6af822f6220c9a2..3149a329c27821ac4448f5dc24d0b0395229d4ad 100644
>--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h
>+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebContext.h
>@@ -247,18 +247,6 @@ webkit_web_context_register_uri_scheme              (WebKitWebContext
>                                                      gpointer                       user_data,
>                                                      GDestroyNotify                 user_data_destroy_func);
> 
>-WEBKIT_API void
>-webkit_web_context_set_sandbox_enabled              (WebKitWebContext              *context,
>-                                                     gboolean                       enabled);
>-
>-WEBKIT_API gboolean
>-webkit_web_context_get_sandbox_enabled              (WebKitWebContext              *context);
>-
>-WEBKIT_API void
>-webkit_web_context_add_path_to_sandbox              (WebKitWebContext              *context,
>-                                                     const char                    *path,
>-                                                     gboolean                       read_only);
>-
> WEBKIT_API gboolean
> webkit_web_context_get_spell_checking_enabled       (WebKitWebContext              *context);
> 
>diff --git a/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt b/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt
>index 4efb952584672511ee95d062a96e7ff4ea33fb10..38745d0e6d95c6a8308091364933d8ac3a568b14 100644
>--- a/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt
>+++ b/Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-4.0-sections.txt
>@@ -51,9 +51,6 @@ webkit_web_context_get_security_manager
> webkit_web_context_set_additional_plugins_directory
> webkit_web_context_get_plugins
> webkit_web_context_get_plugins_finish
>-webkit_web_context_get_sandbox_enabled
>-webkit_web_context_set_sandbox_enabled
>-webkit_web_context_add_path_to_sandbox
> webkit_web_context_get_spell_checking_enabled
> webkit_web_context_set_spell_checking_enabled
> webkit_web_context_get_spell_checking_languages
>diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h
>index 081cd11a342a9f611a4f4198cec293294c2a2701..8cf646f4ede340e5276cee7da84fcd9308938764 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h
>+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebContext.h
>@@ -247,18 +247,6 @@ webkit_web_context_register_uri_scheme              (WebKitWebContext
>                                                      gpointer                       user_data,
>                                                      GDestroyNotify                 user_data_destroy_func);
> 
>-WEBKIT_API void
>-webkit_web_context_set_sandbox_enabled              (WebKitWebContext               *context,
>-                                                     gboolean                       enabled);
>-
>-WEBKIT_API gboolean
>-webkit_web_context_get_sandbox_enabled              (WebKitWebContext              *context);
>-
>-WEBKIT_API void
>-webkit_web_context_add_path_to_sandbox              (WebKitWebContext              *context,
>-                                                     const char                    *path,
>-                                                     gboolean                       read_only);
>-
> WEBKIT_API gboolean
> webkit_web_context_get_spell_checking_enabled       (WebKitWebContext              *context);
> 
>diff --git a/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt b/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt
>index a5ecfe4637f8f3917af26127face01517f378806..446bb2229a1fd54fc6d9a8c247769a050f06ee79 100644
>--- a/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt
>+++ b/Source/WebKit/UIProcess/API/wpe/docs/wpe-0.1-sections.txt
>@@ -29,9 +29,6 @@ webkit_web_context_get_security_manager
> webkit_web_context_set_additional_plugins_directory
> webkit_web_context_get_plugins
> webkit_web_context_get_plugins_finish
>-webkit_web_context_get_sandbox_enabled
>-webkit_web_context_set_sandbox_enabled
>-webkit_web_context_add_path_to_sandbox
> webkit_web_context_get_spell_checking_enabled
> webkit_web_context_set_spell_checking_enabled
> webkit_web_context_get_spell_checking_languages
>diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
>index 718ca0a9676f5b7a9fecaac5fcb476ae50042492..90e47b1976add178a1643eee0f7047e7bfa01fbc 100644
>--- a/Source/cmake/OptionsGTK.cmake
>+++ b/Source/cmake/OptionsGTK.cmake
>@@ -120,11 +120,7 @@ else ()
>     WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
> endif ()
> 
>-if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT EXISTS "/.flatpak-info")
>-    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PUBLIC ON)
>-else ()
>-    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PRIVATE OFF)
>-endif ()
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_BUBBLEWRAP_SANDBOX PRIVATE OFF)
> 
> # Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
> if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
>diff --git a/ChangeLog b/ChangeLog
>index 031b5e2547a3f4b7c2eb4382b9159f0e977fd18a..42ccc54c11b2a33b194b4444cb189406fc7bbecc 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-02-12  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK][STABLE] Remove sandbox APIs from 2.24 branch
>+        https://bugs.webkit.org/show_bug.cgi?id=194553
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsGTK.cmake:
>+
> 2019-02-11  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [GTK][WPE] Add content extensions support in WKTR and unskip layout tests

Actions: View | Formatted Diff | Diff

Attachments on bug 194553: 361824 | 361925