mirror of
https://github.com/servo/servo.git
synced 2025-06-20 23:28:59 +01:00
b631202e66
The main issue was resources_dir_path. Every time it was called it would start from the executable's path and walk up the hierarchy to find a directory named "resources". The sandbox was granted permission to read from the found resources dir, but after the sandbox had been activated resources_dir_path would again start from the executable's path and try to find the resources dir. It would then fail with "Operation not permitted" when trying to canonicalize the path because it didn't have permissions to read metadata under ./target. To fix this the resources dir path is now cached between resources_dir_path calls.
69 lines
2.1 KiB
Rust
69 lines
2.1 KiB
Rust
/* 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/. */
|
|
|
|
use std::env;
|
|
use std::fs::File;
|
|
use std::io::{self, Read};
|
|
use std::path::PathBuf;
|
|
use std::sync::{Arc, Mutex};
|
|
|
|
lazy_static! {
|
|
static ref CMD_RESOURCE_DIR: Arc<Mutex<Option<String>>> = {
|
|
Arc::new(Mutex::new(None))
|
|
};
|
|
}
|
|
|
|
pub fn set_resources_path(path: Option<String>) {
|
|
let mut dir = CMD_RESOURCE_DIR.lock().unwrap();
|
|
*dir = path;
|
|
}
|
|
|
|
#[cfg(target_os = "android")]
|
|
pub fn resources_dir_path() -> PathBuf {
|
|
PathBuf::from("/sdcard/servo/")
|
|
}
|
|
|
|
#[cfg(not(target_os = "android"))]
|
|
pub fn resources_dir_path() -> PathBuf {
|
|
let mut dir = CMD_RESOURCE_DIR.lock().unwrap();
|
|
|
|
if let Some(ref path) = *dir {
|
|
return PathBuf::from(path);
|
|
}
|
|
|
|
// FIXME: Find a way to not rely on the executable being
|
|
// under `<servo source>[/$target_triple]/target/debug`
|
|
// or `<servo source>[/$target_triple]/target/release`.
|
|
let mut path = env::current_exe().expect("can't get exe path");
|
|
// Follow symlink
|
|
path = path.canonicalize().expect("path does not exist");
|
|
path.pop();
|
|
path.push("resources");
|
|
if !path.is_dir() { // resources dir not in same dir as exe?
|
|
// exe is probably in target/{debug,release} so we need to go back to topdir
|
|
path.pop();
|
|
path.pop();
|
|
path.pop();
|
|
path.push("resources");
|
|
if !path.is_dir() {
|
|
// exe is probably in target/$target_triple/{debug,release} so go back one more
|
|
path.pop();
|
|
path.pop();
|
|
path.push("resources");
|
|
}
|
|
}
|
|
*dir = Some(path.to_str().unwrap().to_owned());
|
|
path
|
|
}
|
|
|
|
pub fn read_resource_file(relative_path_components: &[&str]) -> io::Result<Vec<u8>> {
|
|
let mut path = resources_dir_path();
|
|
for component in relative_path_components {
|
|
path.push(component);
|
|
}
|
|
let mut file = try!(File::open(&path));
|
|
let mut data = Vec::new();
|
|
try!(file.read_to_end(&mut data));
|
|
Ok(data)
|
|
}
|