nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Disable sandboxing for now

Browse source 
https://bugs.webkit.org/show_bug.cgi?id=213174
This commit is contained in:
Cédric Bellegarde 2023-02-23 16:03:10 +01:00
parent 62b89db042
commit 80aa742686
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/client/components/components-web-view.vala
View file

@ -77,12 +77,15 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
*/ */
public static void init_web_context(Application.Configuration config, public static void init_web_context(Application.Configuration config,
File web_extension_dir, File web_extension_dir,
File cache_dir) { File cache_dir,
bool sandboxed=true) {
WebsiteDataManager data_manager = new WebsiteDataManager(cache_dir.get_path()); WebsiteDataManager data_manager = new WebsiteDataManager(cache_dir.get_path());
WebKit.WebContext context = new WebKit.WebContext.with_website_data_manager(data_manager); WebKit.WebContext context = new WebKit.WebContext.with_website_data_manager(data_manager);
// Enable WebProcess sandboxing // Enable WebProcess sandboxing
context.add_path_to_sandbox(web_extension_dir.get_path(), true); if (sandboxed) {
context.set_sandbox_enabled(true); context.add_path_to_sandbox(web_extension_dir.get_path(), true);
context.set_sandbox_enabled(true);
}
// Use the doc browser model so that we get some caching of // Use the doc browser model so that we get some caching of
// resources between email body loads. // resources between email body loads.
context.set_cache_model(WebKit.CacheModel.DOCUMENT_BROWSER); context.set_cache_model(WebKit.CacheModel.DOCUMENT_BROWSER);

3
test/client/components/components-web-view-test-case.vala
View file

@ -22,7 +22,8 @@ public abstract class Components.WebViewTestCase<V> : TestCase {
WebView.init_web_context( WebView.init_web_context(
this.config, this.config,
File.new_for_path(_BUILD_ROOT_DIR).get_child("src"), File.new_for_path(_BUILD_ROOT_DIR).get_child("src"),
File.new_for_path("/tmp") // XXX use something better here File.new_for_path("/tmp"), // XXX use something better here
false // https://bugs.webkit.org/show_bug.cgi?id=213174
); );
try { try {
WebView.load_resources(GLib.File.new_for_path("/tmp")); WebView.load_resources(GLib.File.new_for_path("/tmp"));

3
test/client/components/components-web-view-test.vala
View file

@ -21,7 +21,8 @@ public class Components.WebViewTest : TestCase {
WebView.init_web_context( WebView.init_web_context(
config, config,
File.new_for_path(_BUILD_ROOT_DIR).get_child("src"), File.new_for_path(_BUILD_ROOT_DIR).get_child("src"),
File.new_for_path("/tmp") // XXX use something better here File.new_for_path("/tmp"), // XXX use something better here
false // https://bugs.webkit.org/show_bug.cgi?id=213174
); );
} }