Changeset 239204 in webkit


Ignore:
Timestamp:
Dec 14, 2018 6:38:48 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK][WPE] Fix forwarding webkit socket to flatpak sandbox
​https://bugs.webkit.org/show_bug.cgi?id=192622

Patch by Patrick Griffis <Patrick Griffis> on 2018-12-14
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):

Location:
trunk/Source/WebKit
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r239203 r239204  
     12018-12-14  Patrick Griffis  <pgriffis@igalia.com>
     2
     3        [GTK][WPE] Fix forwarding webkit socket to flatpak sandbox
     4        https://bugs.webkit.org/show_bug.cgi?id=192622
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        This fixes running with the sandbox enabled in Flatpak.
     9
     10        * UIProcess/Launcher/glib/FlatpakLauncher.cpp:
     11        (WebKit::flatpakSpawn):
     12        * UIProcess/Launcher/glib/FlatpakLauncher.h:
     13        * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
     14        (WebKit::ProcessLauncher::launchProcess):
     15
    1162018-12-14  Carlos Garcia Campos  <cgarcia@igalia.com>
    217

  • trunk/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.cpp

    r238851 r239204  
    3030
    3131#include <gio/gio.h>
     32#include <wtf/glib/GUniquePtr.h>
    3233
    3334namespace WebKit {
    3435
    35 GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher* launcher, const WebKit::ProcessLauncher::LaunchOptions& launchOptions, char** argv, GError **error)
     36GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher* launcher, const WebKit::ProcessLauncher::LaunchOptions& launchOptions, char** argv, int childProcessSocket, GError** error)
    3637{
    3738    ASSERT(launcher);
    … …  
    4546    // add some permissions in between those for this to provide meaningful security.
    4647
     48    GUniquePtr<gchar> childProcessSocketArg(g_strdup_printf("--forward-fd=%d", childProcessSocket));
    4749    Vector<const char*> flatpakArgs = {
    4850        "/usr/bin/flatpak-spawn",
     51        childProcessSocketArg.get(),
    4952    };
    5053

  • trunk/Source/WebKit/UIProcess/Launcher/glib/FlatpakLauncher.h

    r238851 r239204  
    3737namespace WebKit {
    3838
    39 GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher*, const WebKit::ProcessLauncher::LaunchOptions&, char** argv, GError**);
     39GRefPtr<GSubprocess> flatpakSpawn(GSubprocessLauncher*, const WebKit::ProcessLauncher::LaunchOptions&, char** argv, int childProcessSocket, GError**);
    4040
    4141};

  • trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp

    r237107 r239204  
    174174
    175175    if (sandboxEnabled && isInsideFlatpak())
    176         process = flatpakSpawn(launcher.get(), m_launchOptions, argv, &error.outPtr());
     176        process = flatpakSpawn(launcher.get(), m_launchOptions, argv, socketPair.client, &error.outPtr());
    177177#if ENABLE(BUBBLEWRAP_SANDBOX)
    178178    else if (sandboxEnabled)
Note: See TracChangeset for help on using the changeset viewer.