Attachment 357120 Details for Bug 192622 – [GTK][WPE] Fix forwarding webkit socket to flatpak sandbox

[patch] [GTK][WPE] Fix forwarding webkit socket to flatpak sandbox

0001-GTK-WPE-Fix-forwarding-webkit-socket-to-flatpak-sand.patch (text/plain), 4.05 KB, created by Patrick Griffis on 2018-12-12 06:09:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Griffis

Created: 2018-12-12 06:09:55 PST

Size: 4.05 KB

patch

obsolete

>From 9da5e8deceab86f968271067f1466b1dc1ea99bf Mon Sep 17 00:00:00 2001
>From: Patrick Griffis <pgriffis@igalia.com>
>Date: Wed, 12 Dec 2018 09:02:07 -0500
>Subject: [PATCH xserver] [GTK][WPE] Fix forwarding webkit socket to flatpak
> sandbox
>
>---
> Source/WebKit/ChangeLog                             | 13 +++++++++++++
> .../UIProcess/Launcher/glib/FlatpakLauncher.cpp     |  6 +++++-
> .../UIProcess/Launcher/glib/FlatpakLauncher.h       |  2 +-
> .../UIProcess/Launcher/glib/ProcessLauncherGLib.cpp |  2 +-
> 4 files changed, 20 insertions(+), 3 deletions(-)
>
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 3260d9aed2..aac902c466 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-12  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 NOBODY (OOPS!).
>+
>+        * 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 c21b0edb1a..9b661f87cf 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp
>+++ b/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp
>@@ -30,9 +30,11 @@
> 
> #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, GError **error, int webkitSocket)
> {
>     ASSERT(launcher);
> 
>@@ -44,8 +46,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> webkitSocketArg(g_strdup_printf("--forward-fd=%d", webkitSocket));
>     Vector<const char*> flatpakArgs = {
>         "/usr/bin/flatpak-spawn",
>+        webkitSocketArg.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 c8442c10b1..c1aa7601b9 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, GError**, int);
> 
> };
> 
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>index 7ae40b835d..93091738a4 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, &error.outPtr(), socketPair.client);
> #if ENABLE(BUBBLEWRAP_SANDBOX)
>     else if (sandboxEnabled)
>         process = bubblewrapSpawn(launcher.get(), m_launchOptions, argv, &error.outPtr());
>-- 
>2.19.2
>

Actions: View | Formatted Diff | Diff

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