Bug 1576052 - Use configuration/macro definition to selectively enable wasm sandbox for graphite r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D43710

--HG--
extra : moz-landing-system : lando

config/external/moz.build

@@ -9,6 +9,7 @@ external_dirs = []
 DIRS += [
     'lgpllibs',
     'rlbox',
+    'rlbox_lucet_sandbox',
     'sqlite',
 ]
 if not CONFIG['MOZ_SYSTEM_JPEG']:

config/external/rlbox_lucet_sandbox/moz.build

@@ -0,0 +1,16 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXPORTS.mozilla.rlbox += [
+    '/third_party/rust/rlbox_lucet_sandbox/include/lucet_sandbox.h',
+    '/third_party/rust/rlbox_lucet_sandbox/include/rlbox_lucet_sandbox.hpp',
+]
+
+SOURCES += [
+    'rlbox_lucet_thread_locals.cpp'
+]
+
+FINAL_LIBRARY = 'xul'

config/external/rlbox_lucet_sandbox/rlbox_lucet_thread_locals.cpp

@@ -0,0 +1,20 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifdef MOZ_USING_WASM_SANDBOXING
+
+// Load general firefox configuration of RLBox
+#  include "mozilla/rlbox/rlbox_config.h"
+
+#  include "mozilla/rlbox/rlbox_lucet_sandbox.hpp"
+
+#  include "mozilla/rlbox/rlbox.hpp"
+
+// The MingW compiler does not correctly handle static thread_local inline
+// members. We instead TLS storage via functions. This can be removed if the
+// MingW bug is fixed.
+RLBOX_LUCET_SANDBOX_STATIC_VARIABLES();
+
+#endif

gfx/thebes/ThebesRLBox.h

@@ -11,9 +11,13 @@
 // Load general firefox configuration of RLBox
 #include "mozilla/rlbox/rlbox_config.h"
 
+#ifdef MOZ_WASM_SANDBOXING_GRAPHITE
+#  include "mozilla/rlbox/rlbox_lucet_sandbox.hpp"
+#else
 // Extra configuration for no-op sandbox
-#define RLBOX_USE_STATIC_CALLS() rlbox_noop_sandbox_lookup_symbol
+#  define RLBOX_USE_STATIC_CALLS() rlbox_noop_sandbox_lookup_symbol
-#include "mozilla/rlbox/rlbox_noop_sandbox.hpp"
+#  include "mozilla/rlbox/rlbox_noop_sandbox.hpp"
+#endif
 
 #include "mozilla/rlbox/rlbox.hpp"
 

gfx/thebes/ThebesRLBoxTypes.h

@@ -8,7 +8,15 @@
 
 #include "mozilla/rlbox/rlbox_types.hpp"
 
+#ifdef MOZ_WASM_SANDBOXING_GRAPHITE
+namespace rlbox {
+class rlbox_lucet_sandbox;
+}
+using rlbox_gr_sandbox_type = rlbox::rlbox_lucet_sandbox;
+#else
 using rlbox_gr_sandbox_type = rlbox::rlbox_noop_sandbox;
+#endif
+
 using rlbox_sandbox_gr = rlbox::rlbox_sandbox<rlbox_gr_sandbox_type>;
 template <typename T>
 using sandbox_callback_gr = rlbox::sandbox_callback<T, rlbox_gr_sandbox_type>;

gfx/thebes/gfxFontEntry.cpp

@@ -609,7 +609,11 @@ struct gfxFontEntry::GrSandboxData {
       grGetGlyphAdvanceCallback;
 
   GrSandboxData() {
+#ifdef MOZ_WASM_SANDBOXING_GRAPHITE
+#  error "Sandboxed graphite not yet implemented"
+#else
     sandbox.create_sandbox();
+#endif
     grGetTableCallback = sandbox.register_callback(GrGetTable);
     grReleaseTableCallback = sandbox.register_callback(GrReleaseTable);
     grGetGlyphAdvanceCallback =

toolkit/library/rust/gkrust-features.mozbuild

@@ -73,3 +73,6 @@ if CONFIG['ENABLE_REMOTE_AGENT']:
 
 if CONFIG['MOZ_FOGOTYPE']:
     gkrust_features += ['fogotype']
+
+if CONFIG['MOZ_USING_WASM_SANDBOXING']:
+    gkrust_features += ['wasm_library_sandboxing']

toolkit/moz.configure

@@ -1767,8 +1767,7 @@ def has_remote(toolkit):
 set_config('MOZ_HAS_REMOTE', has_remote)
 set_define('MOZ_HAS_REMOTE', has_remote)
 
-
+# RLBox Library Sandboxing wasm support
-# wasm sandboxing support
 # ==============================================================
 
 def wasm_sandboxing_libraries():
@@ -1785,6 +1784,7 @@ def requires_wasm_sandboxing(libraries):
         return True
 
 set_config('MOZ_USING_WASM_SANDBOXING', requires_wasm_sandboxing)
+set_define('MOZ_USING_WASM_SANDBOXING', requires_wasm_sandboxing)
 
 lucetc = check_prog('LUCETC', ['lucetc'],
                     paths=toolchain_search_path, when=requires_wasm_sandboxing)