Attachment 358040 Details for Bug 193021 – Patch

[patch] Patch

bug-193021-20181224102300.patch (text/plain), 2.93 KB, created by Patrick Griffis on 2018-12-24 07:23:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Griffis

Created: 2018-12-24 07:23:01 PST

Size: 2.93 KB

patch

obsolete

>Subversion Revision: 239547
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index effac72476161450c545a3d9a8c37982911091c1..73eb2eea3b7421805efe335714fc5dac4ee64dfd 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-24  Patrick Griffis  <pgriffis@igalia.com>
>+
>+        [GTK][WPE] Remove DConf permissions from sandbox
>+        https://bugs.webkit.org/show_bug.cgi?id=193021
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The latest development releases of xdg-desktop-portal and gtk3 use a
>+        new portal for settings on Wayland org.freedesktop.portal.Settings.
>+
>+        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
>+        (WebKit::bubblewrapSpawn):
>+
> 2018-12-23  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Remove some unnecessary editing SPI after <rdar://problem/46047546>
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
>index f234bb721910f758ce080cc321c8c6de43ebcca4..e434e0333987a92749c00ddc5b53360904def1be 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
>+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
>@@ -308,22 +308,6 @@ static void bindX11(Vector<CString>& args)
>         bindIfExists(args, xauth);
> }
> 
>-static void bindDconf(Vector<CString>& args)
>-{
>-    const char* runtimeDir = g_get_user_runtime_dir();
>-    GUniquePtr<char> dconfRuntimeDir(g_build_filename(runtimeDir, "dconf", nullptr));
>-    args.appendVector(Vector<CString>({ "--bind", dconfRuntimeDir.get(), dconfRuntimeDir.get() }));
>-
>-    const char* dconfDir = g_getenv("DCONF_USER_CONFIG_DIR");
>-    if (dconfDir)
>-        bindIfExists(args, dconfDir);
>-    else {
>-        const char* configDir = g_get_user_config_dir();
>-        GUniquePtr<char> dconfConfigDir(g_build_filename(configDir, "dconf", nullptr));
>-        bindIfExists(args, dconfConfigDir.get(), BindFlags::ReadWrite);
>-    }
>-}
>-
> #if PLATFORM(WAYLAND) && USE(EGL)
> static void bindWayland(Vector<CString>& args)
> {
>@@ -795,8 +779,6 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
>         }
> 
>         bindDBusSession(sandboxArgs, proxy);
>-        // FIXME: This needs to be restricted, upstream is working on it.
>-        bindDconf(sandboxArgs);
>         // FIXME: We should move to Pipewire as soon as viable, Pulse doesn't restrict clients atm.
>         bindPulse(sandboxArgs);
>         bindFonts(sandboxArgs);
>@@ -811,8 +793,6 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
> 
>         if (!proxy.isRunning()) {
>             Vector<CString> permissions = {
>-                // FIXME: Used by GTK on Wayland.
>-                "--talk=ca.desrt.dconf",
>                 // GStreamers plugin install helper.
>                 "--call=org.freedesktop.PackageKit=org.freedesktop.PackageKit.Modify2.InstallGStreamerResources@/org/freedesktop/PackageKit"
>             };

Actions: View | Formatted Diff | Diff

Attachments on bug 193021: 358040