Changeset 249569 in webkit

Timestamp:

Sep 6, 2019 2:00:04 AM (5 years ago)

Author:

Patrick Griffis

Message:

[GTK][WPE] Do not enable the sandbox in Snap
​https://bugs.webkit.org/show_bug.cgi?id=201486

Reviewed by Carlos Garcia Campos.

Running inside of Snap adds its own complications and is simply
not supported for now.

Also update isInsideFlatpak() for consistency.

• UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:

(WebKit::isInsideFlatpak):
(WebKit::isInsideSnap):
(WebKit::ProcessLauncher::launchProcess):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/glib/ProcessLauncherGLib.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-06  Patrick Griffis  <pgriffis@igalia.com>
+
+        [GTK][WPE] Do not enable the sandbox in Snap
+        https://bugs.webkit.org/show_bug.cgi?id=201486
+
+        Reviewed by Carlos Garcia Campos.
+
+        Running inside of Snap adds its own complications and is simply
+        not supported for now.
+
+        Also update isInsideFlatpak() for consistency.
+
+        * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
+        (WebKit::isInsideFlatpak):
+        (WebKit::isInsideSnap):
+        (WebKit::ProcessLauncher::launchProcess):
+
 2019-09-05  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -53 +53 @@
 static bool isInsideFlatpak()
 {
-    static int ret = -1;
-    if (ret != -1)
-        return ret;
+    static Optional<bool> ret;
+    if (ret)
+        return *ret;
 
     ret = g_file_test("/.flatpak-info", G_FILE_TEST_EXISTS);
-    return ret;
+    return *ret;
+}
+
+static bool isInsideSnap()
+{
+    static Optional<bool> ret;
+    if (ret)
+        return *ret;
+
+    ret = g_getenv("SNAP");
+    return *ret;
 }
 #endif
@@ -138 +148 @@
 
     // You cannot use bubblewrap within Flatpak so lets ensure it never happens.
-    if (sandboxEnabled && !isInsideFlatpak())
+    // Snap can allow it but has its own limitations that require workarounds.
+    if (sandboxEnabled && !isInsideFlatpak() && !isInsideSnap())
         process = bubblewrapSpawn(launcher.get(), m_launchOptions, argv, &error.outPtr());
     else