-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
113 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,81 +1,31 @@ | ||
use birdcage::process::Command; | ||
use birdcage::{Birdcage, Sandbox}; | ||
use clap::Parser; | ||
|
||
// A shim for the sandbox that is used on non-supported platforms | ||
#[cfg(not(any( | ||
all(target_os = "linux", target_arch = "x86_64"), | ||
all(target_os = "linux", target_arch = "aarch64"), | ||
all(target_os = "macos", target_arch = "x86_64"), | ||
all(target_os = "macos", target_arch = "aarch64"), | ||
)))] | ||
mod sandbox_shim; | ||
#[cfg(not(any( | ||
all(target_os = "linux", target_arch = "x86_64"), | ||
all(target_os = "linux", target_arch = "aarch64"), | ||
all(target_os = "macos", target_arch = "x86_64"), | ||
all(target_os = "macos", target_arch = "aarch64"), | ||
)))] | ||
pub use sandbox_shim::*; | ||
|
||
/// The actual implementation of the sandbox that is used on supported platforms | ||
#[cfg(any( | ||
all(target_os = "linux", target_arch = "x86_64"), | ||
all(target_os = "linux", target_arch = "aarch64"), | ||
all(target_os = "macos", target_arch = "x86_64"), | ||
all(target_os = "macos", target_arch = "aarch64"), | ||
))] | ||
pub mod sandbox; | ||
#[cfg(feature = "tokio")] | ||
pub mod tokio; | ||
|
||
pub use sandbox::{sandboxed_command, Exception}; | ||
|
||
#[derive(clap::Parser)] | ||
struct Opts { | ||
#[clap(long)] | ||
fs_exec_and_read: Option<Vec<String>>, | ||
|
||
#[clap(long)] | ||
fs_write_and_read: Option<Vec<String>>, | ||
|
||
#[clap(long)] | ||
fs_read: Option<Vec<String>>, | ||
|
||
#[clap(long)] | ||
network: bool, | ||
|
||
#[arg(trailing_var_arg = true, allow_hyphen_values = true)] | ||
args: Vec<String>, | ||
} | ||
|
||
// This function checks if the current executable should execute as a sandboxed process | ||
pub fn init() { | ||
let mut args = std::env::args().collect::<Vec<String>>(); | ||
// Remove the first `__sandbox_trampoline__` argument | ||
args.remove(1); | ||
let opts = Opts::parse_from(args.iter()); | ||
// Allow access to our test executable. | ||
let mut sandbox = Birdcage::new(); | ||
|
||
if let Some(fs_exec_and_read) = opts.fs_exec_and_read { | ||
for path in fs_exec_and_read { | ||
let _ = sandbox.add_exception(birdcage::Exception::ExecuteAndRead(path.into())); | ||
} | ||
} | ||
|
||
if let Some(fs_read) = opts.fs_read { | ||
for path in fs_read { | ||
let _ = sandbox.add_exception(birdcage::Exception::Read(path.into())); | ||
} | ||
} | ||
|
||
if let Some(fs_write_and_read) = opts.fs_write_and_read { | ||
for path in fs_write_and_read { | ||
let _ = sandbox.add_exception(birdcage::Exception::WriteAndRead(path.into())); | ||
} | ||
} | ||
if let Some((exe, args)) = opts.args.split_first() { | ||
// Initialize the sandbox; by default everything is prohibited. | ||
let mut command = Command::new(exe); | ||
command.args(args); | ||
|
||
let mut child = sandbox.spawn(command).unwrap(); | ||
|
||
let status = child.wait().unwrap(); | ||
std::process::exit(status.code().unwrap()); | ||
} else { | ||
panic!("No executable provided"); | ||
} | ||
} | ||
|
||
pub fn init_sandbox() { | ||
// TODO ideally we check that we are single threaded, but birdcage will also check it later on | ||
|
||
if std::env::args().any(|arg| arg == "__sandbox_trampoline__") { | ||
// This is a sandboxed process | ||
println!("Running in sandbox mode"); | ||
// Initialize the sandbox | ||
init(); | ||
} else { | ||
// This is the main process | ||
println!("Running in main process mode"); | ||
} | ||
} | ||
#[cfg(any( | ||
all(target_os = "linux", target_arch = "x86_64"), | ||
all(target_os = "linux", target_arch = "aarch64"), | ||
all(target_os = "macos", target_arch = "x86_64"), | ||
all(target_os = "macos", target_arch = "aarch64"), | ||
))] | ||
pub use sandbox::*; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
use birdcage::process::Command; | ||
use birdcage::{Birdcage, Sandbox}; | ||
use clap::Parser; | ||
|
||
pub mod sandbox; | ||
#[cfg(feature = "tokio")] | ||
pub mod tokio; | ||
|
||
pub use sandbox::{sandboxed_command, Exception}; | ||
|
||
#[derive(clap::Parser)] | ||
struct Opts { | ||
#[clap(long)] | ||
fs_exec_and_read: Option<Vec<String>>, | ||
|
||
#[clap(long)] | ||
fs_write_and_read: Option<Vec<String>>, | ||
|
||
#[clap(long)] | ||
fs_read: Option<Vec<String>>, | ||
|
||
#[clap(long)] | ||
network: bool, | ||
|
||
#[arg(trailing_var_arg = true, allow_hyphen_values = true)] | ||
args: Vec<String>, | ||
} | ||
|
||
// This function checks if the current executable should execute as a sandboxed process | ||
pub fn init() { | ||
let mut args = std::env::args().collect::<Vec<String>>(); | ||
// Remove the first `__sandbox_trampoline__` argument | ||
args.remove(1); | ||
let opts = Opts::parse_from(args.iter()); | ||
// Allow access to our test executable. | ||
let mut sandbox = Birdcage::new(); | ||
|
||
if let Some(fs_exec_and_read) = opts.fs_exec_and_read { | ||
for path in fs_exec_and_read { | ||
let _ = sandbox.add_exception(birdcage::Exception::ExecuteAndRead(path.into())); | ||
} | ||
} | ||
|
||
if let Some(fs_read) = opts.fs_read { | ||
for path in fs_read { | ||
let _ = sandbox.add_exception(birdcage::Exception::Read(path.into())); | ||
} | ||
} | ||
|
||
if let Some(fs_write_and_read) = opts.fs_write_and_read { | ||
for path in fs_write_and_read { | ||
let _ = sandbox.add_exception(birdcage::Exception::WriteAndRead(path.into())); | ||
} | ||
} | ||
if let Some((exe, args)) = opts.args.split_first() { | ||
// Initialize the sandbox; by default everything is prohibited. | ||
let mut command = Command::new(exe); | ||
command.args(args); | ||
|
||
let mut child = sandbox.spawn(command).unwrap(); | ||
|
||
let status = child.wait().unwrap(); | ||
std::process::exit(status.code().unwrap()); | ||
} else { | ||
panic!("No executable provided"); | ||
} | ||
} | ||
|
||
pub fn init_sandbox() { | ||
// TODO ideally we check that we are single threaded, but birdcage will also check it later on | ||
if std::env::args().any(|arg| arg == "__sandbox_trampoline__") { | ||
// This is a sandboxed process | ||
eprintln!("Running in sandbox mode"); | ||
// Initialize the sandbox | ||
init(); | ||
} else { | ||
// This is the main process | ||
eprintln!("Running in main process mode"); | ||
} | ||
} |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
pub fn init() { | ||
panic!("Sandbox is not supported on this platform"); | ||
} |