Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build without sandboxing on Windows #1485

Merged
merged 5 commits into from
Aug 30, 2024
Merged

Build without sandboxing on Windows #1485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0331c9
Build without sandboxing on Windows
kylewillmon Aug 29, 2024
2c09a6e
Exclude gendocs test without default features
kylewillmon Aug 29, 2024
6631e74
Resolve compiler warnings on Windows
kylewillmon Aug 29, 2024
c2a27f2
Remove unnecessary block
kylewillmon Aug 29, 2024
18cabf1
Add windows to test rollup
kylewillmon Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ on:
- cron: '30 5 * * 1'

jobs:
windows:
kylewillmon marked this conversation as resolved.
Show resolved Hide resolved
runs-on: windows-latest
steps:
- name: Checkout the repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Install Rust toolchain
run: rustup toolchain install --no-self-update stable --profile minimal

- name: Test
run: cargo +stable test --workspace --exclude xtask --locked --no-default-features

rustfmt:
if: github.event_name != 'schedule'
runs-on: ubuntu-20.04
Expand Down
12 changes: 9 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ end-to-end-tests = ["extensions"]
anyhow = "1.0.44"
axum = "0.7.4"
base64 = "0.21.1"
birdcage = { version = "0.8.1" }
bytes = "1.1.0"
chrono = { version = "^0.4", default-features = false, features = ["serde", "clock"] }
cidr = "0.2.0"
Expand Down Expand Up @@ -71,6 +70,9 @@ vulnreach_types = { path = "../vulnreach_types", optional = true }
walkdir = "2.3.2"
zip = { version = "2.1.0", default-features = false, features = ["deflate"] }

[target.'cfg(unix)'.dependencies]
birdcage = { version = "0.8.1" }

[dev-dependencies]
assert_cmd = "2.0.4"
predicates = { version = "3.0", default-features = false, features = ["diff"] }
Expand Down
150 changes: 78 additions & 72 deletions cli/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,34 +571,6 @@ pub fn add_subcommands(command: Command) -> Command {
.about("Find all lockfile and manifest paths")
.hide(true),
)
.subcommand(
Command::new("parse-sandboxed")
.args(&[
Arg::new("depfile")
.value_name("DEPENDENCY_FILE")
.required(true)
.help("Canonical dependency file path"),
Arg::new("display-path")
.value_name("DISPLAY_PATH")
.required(true)
.help("Dependency file display path"),
Arg::new("type")
.long("type")
.value_name("TYPE")
.help("Dependency file type used (default: auto)")
.value_parser(PossibleValuesParser::new(parse::lockfile_types(true))),
Arg::new("generate-lockfile")
.long("generate-lockfile")
.help("Whether lockfile generation should be performed")
.action(ArgAction::SetTrue),
Arg::new("skip-sandbox")
.long("skip-sandbox")
.help("Skip sandbox initialization")
.action(ArgAction::SetTrue),
])
.about("Run lockfile generation inside sandbox and write it to STDOUT")
.hide(true),
)
.subcommand(
Command::new("org")
.about("Manage organizations")
Expand Down Expand Up @@ -666,50 +638,84 @@ pub fn add_subcommands(command: Command) -> Command {

#[cfg(unix)]
{
app = app.subcommand(
Command::new("sandbox").hide(true).about("Run an application in a sandbox").args(&[
Arg::new("allow-read")
.help("Add filesystem read sandbox exception")
.long("allow-read")
.value_name("PATH")
.value_hint(ValueHint::FilePath)
.action(ArgAction::Append),
Arg::new("allow-write")
.help("Add filesystem write sandbox exception")
.long("allow-write")
.value_name("PATH")
.value_hint(ValueHint::FilePath)
.action(ArgAction::Append),
Arg::new("allow-run")
.help("Add filesystem execute sandbox exception")
.long("allow-run")
.value_name("PATH")
.value_hint(ValueHint::FilePath)
.action(ArgAction::Append),
Arg::new("allow-env")
.help("Add environment variable access sandbox exception")
.long("allow-env")
.value_name("ENV_VAR")
.num_args(0..=1)
.default_missing_value("*")
.action(ArgAction::Append),
Arg::new("allow-net")
.help("Add network access sandbox exception")
.long("allow-net")
.action(ArgAction::SetTrue),
Arg::new("strict")
.help("Do not add any default sandbox exceptions")
.long("strict")
.action(ArgAction::SetTrue),
Arg::new("cmd").help("Command to be executed").value_name("CMD").required(true),
Arg::new("args")
.help("Command arguments")
.value_name("ARG")
.trailing_var_arg(true)
.allow_hyphen_values(true)
.action(ArgAction::Append),
]),
)
app = app
.subcommand(
Command::new("sandbox").hide(true).about("Run an application in a sandbox").args(
&[
Arg::new("allow-read")
.help("Add filesystem read sandbox exception")
.long("allow-read")
.value_name("PATH")
.value_hint(ValueHint::FilePath)
.action(ArgAction::Append),
Arg::new("allow-write")
.help("Add filesystem write sandbox exception")
.long("allow-write")
.value_name("PATH")
.value_hint(ValueHint::FilePath)
.action(ArgAction::Append),
Arg::new("allow-run")
.help("Add filesystem execute sandbox exception")
.long("allow-run")
.value_name("PATH")
.value_hint(ValueHint::FilePath)
.action(ArgAction::Append),
Arg::new("allow-env")
.help("Add environment variable access sandbox exception")
.long("allow-env")
.value_name("ENV_VAR")
.num_args(0..=1)
.default_missing_value("*")
.action(ArgAction::Append),
Arg::new("allow-net")
.help("Add network access sandbox exception")
.long("allow-net")
.action(ArgAction::SetTrue),
Arg::new("strict")
.help("Do not add any default sandbox exceptions")
.long("strict")
.action(ArgAction::SetTrue),
Arg::new("cmd")
.help("Command to be executed")
.value_name("CMD")
.required(true),
Arg::new("args")
.help("Command arguments")
.value_name("ARG")
.trailing_var_arg(true)
.allow_hyphen_values(true)
.action(ArgAction::Append),
],
),
)
.subcommand(
Command::new("parse-sandboxed")
.args(&[
Arg::new("depfile")
.value_name("DEPENDENCY_FILE")
.required(true)
.help("Canonical dependency file path"),
Arg::new("display-path")
.value_name("DISPLAY_PATH")
.required(true)
.help("Dependency file display path"),
Arg::new("type")
.long("type")
.value_name("TYPE")
.help("Dependency file type used (default: auto)")
.value_parser(PossibleValuesParser::new(parse::lockfile_types(true))),
Arg::new("generate-lockfile")
.long("generate-lockfile")
.help("Whether lockfile generation should be performed")
.action(ArgAction::SetTrue),
Arg::new("skip-sandbox")
.long("skip-sandbox")
.help("Skip sandbox initialization")
.action(ArgAction::SetTrue),
])
.about("Run lockfile generation inside sandbox and write it to STDOUT")
.hide(true),
);
}

#[cfg(feature = "selfmanage")]
Expand Down
1 change: 1 addition & 0 deletions cli/src/bin/phylum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ async fn handle_commands() -> CommandResult {
},
"version" => handle_version(&app_name, &ver),
"parse" => parse::handle_parse(sub_matches),
#[cfg(unix)]
"parse-sandboxed" => parse::handle_parse_sandboxed(sub_matches),
"ping" => handle_ping(Spinner::wrap(api).await?).await,
"project" => {
Expand Down
Loading
Loading