Attachment 357311 Details for Bug 192622 – Patch

[patch] Patch

bug-192622-20181214090018.patch (text/plain), 3.88 KB, created by Patrick Griffis on 2018-12-14 06:00:19 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Griffis

Created: 2018-12-14 06:00:19 PST

Size: 3.88 KB

patch

obsolete

>Subversion Revision: 239103
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 3260d9aed2ab3b3897342eb0dc8ac661f7c051ce..6b41bdb2991ba5555f41d88f7d621d2c5535d6e9 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-12-13  Patrick Griffis  <pgriffis@igalia.com>
>+
>+        [GTK][WPE] Fix forwarding webkit socket to flatpak sandbox
>+        https://bugs.webkit.org/show_bug.cgi?id=192622
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        This fixes running with the sandbox enabled in Flatpak.
>+
>+        * UIProcess/Launcher/glib/FlatpakLauncher.cpp:
>+        (WebKit::flatpakSpawn):
>+        * UIProcess/Launcher/glib/FlatpakLauncher.h:
>+        * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
>+        (WebKit::ProcessLauncher::launchProcess):
>+
> 2018-11-30  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [WPE] Add API to notify about frame displayed view backend callback
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp
>index c21b0edb1a9a4428c4ddeb44e17368ff021b1f67..c7d776e18cea88f9101124eaccd19e45f6f2e2b8 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp
>+++ b/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp
>@@ -29,10 +29,11 @@
> #if OS(LINUX)
> 
> #include <gio/gio.h>
>+#include <wtf/glib/GUniquePtr.h>
> 
> namespace WebKit {
> 
>-GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher* launcher, const WebKit::ProcessLauncher::LaunchOptions& launchOptions, char** argv, GError **error)
>+GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher* launcher, const WebKit::ProcessLauncher::LaunchOptions& launchOptions, char** argv, int childProcessSocket, GError** error)
> {
>     ASSERT(launcher);
> 
>@@ -44,8 +45,10 @@ GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher* launcher, const WebKit::P
>     // much outside of `--sandbox` (no permissions) and `--no-network`. We need to
>     // add some permissions in between those for this to provide meaningful security.
> 
>+    GUniquePtr<gchar> childProcessSocketArg(g_strdup_printf("--forward-fd=%d", childProcessSocket));
>     Vector<const char*> flatpakArgs = {
>         "/usr/bin/flatpak-spawn",
>+        childProcessSocketArg.get(),
>     };
> 
>     char** newArgv = g_newa(char*, g_strv_length(argv) + flatpakArgs.size() + 1);
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.h b/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.h
>index c8442c10b1bdb60c8cd3d2a6409824d58525d7e0..501e20c4baf5b4afc79c3ac8aa536a2bc9cae274 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.h
>+++ b/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.h
>@@ -36,7 +36,7 @@ typedef struct _GSubprocessLauncher GSubprocessLauncher;
> 
> namespace WebKit {
> 
>-GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher*, const WebKit::ProcessLauncher::LaunchOptions&, char** argv, GError**);
>+GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher*, const WebKit::ProcessLauncher::LaunchOptions&, char** argv, int childProcessSocket, GError**);
> 
> };
> 
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>index 7ae40b835d506e837c8e65c3021e2de77fa84a3d..c5661873a05e7109b517ea75bdfabccd8f23fb86 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>+++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>@@ -173,7 +173,7 @@ void ProcessLauncher::launchProcess()
>         sandboxEnabled = !strcmp(sandboxEnv, "1");
> 
>     if (sandboxEnabled && isInsideFlatpak())
>-        process = flatpakSpawn(launcher.get(), m_launchOptions, argv, &error.outPtr());
>+        process = flatpakSpawn(launcher.get(), m_launchOptions, argv, socketPair.client, &error.outPtr());
> #if ENABLE(BUBBLEWRAP_SANDBOX)
>     else if (sandboxEnabled)
>         process = bubblewrapSpawn(launcher.get(), m_launchOptions, argv, &error.outPtr());

Actions: View | Formatted Diff | Diff

Attachments on bug 192622: 357120 | 357126 | 357140 | 357236 | 357311