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.

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

Support $HOME/.config/build-wrap/allow.txt #104

Merged
merged 1 commit into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ once_cell = "1.20"
regex = "1.11"
tempfile = "3.14"
toml = "0.8"
xdg = "2.5"

[dev-dependencies]
assert_cmd = "2.0"
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ Note that the below environment variables are read **when a build script is link
BUILD_WRAP_ALLOW=1 cargo build -vv
```

If a package must always be built with this strategy, put the package's name in [`$HOME/.config/build-wrap/allow.txt`] (see below).

- `BUILD_WRAP_CMD`: Command used to execute a build script. Linux default:

- With comments:
Expand Down Expand Up @@ -90,6 +92,17 @@ Note that the below environment variables are read **when a build script is link
(deny network*) ;; Deny network access
```

## `$HOME/.config/build-wrap/allow.txt`

If a file at `$HOME/.config/build-wrap/allow.txt` exists, `build-wrap` treats each line as the name of a package. Such packages are built as though `BUILD_WRAP_ALLOW` were set to `1`.

For example, [`svm-rs-builds`] downloads information about Solc releases when it is built. So if you build [`svm-rs`] frequently, you might do the following:

```sh
mkdir -p "$HOME/.config/build-wrap"
echo 'svm-rs-builds' > "$HOME/.config/build-wrap/allow.txt"
```

## Environment variables that `build-wrap` treats as set

Note that we say "treats as set" because these are considered only when [`BUILD_WRAP_CMD` is expanded].
Expand Down Expand Up @@ -134,9 +147,12 @@ The "wrapped" version of the build script does the following when invoked:
[How `build-wrap` works]: #how-build-wrap-works
[Ubuntu Community Wiki]: https://help.ubuntu.com/community/AppArmor
[Ubuntu Server]: https://documentation.ubuntu.com/server/how-to/security/apparmor/
[`$HOME/.config/build-wrap/allow.txt`]: #homeconfigbuild-wrapallowtxt
[`BUILD_WRAP_CMD` is expanded]: #how-build_wrap_cmd-is-expanded
[`cc-rs`]: https://github.com/rust-lang/cc-rs
[`sandbox-exec`]: https://keith.github.io/xcode-man-pages/sandbox-exec.1.html
[`svm-rs-builds`]: https://github.com/alloy-rs/svm-rs/tree/master/crates/svm-builds
[`svm-rs`]: https://github.com/alloy-rs/svm-rs
[affect Bubblewrap]: https://github.com/containers/bubblewrap/issues/505#issuecomment-2093203129
[as it would `BUILD_WRAP_CMD`]: #how-build_wrap_cmd-is-expanded
[changed with version 24.04]: https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
Expand Down
20 changes: 18 additions & 2 deletions src/util/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use anyhow::{anyhow, bail, ensure, Context, Result};
use once_cell::sync::Lazy;
use std::{
env,
fs::canonicalize,
fs::{canonicalize, read_to_string},
io::Write,
os::unix::ffi::OsStrExt,
path::Path,
Expand Down Expand Up @@ -84,7 +84,7 @@ fn exec_sibling(sibling_path_as_str: &str) -> Result<()> {
// They will cause the wrapped build script to be rerun, however.
let expanded_args = split_and_expand(sibling_path)?;

let allow_enabled = enabled("BUILD_WRAP_ALLOW");
let allow_enabled = enabled("BUILD_WRAP_ALLOW") || package_name_allowed();

let mut command = Command::new(&expanded_args[0]);
command.args(&expanded_args[1..]);
Expand Down Expand Up @@ -275,6 +275,22 @@ fn enabled(name: &str) -> bool {
env::var(name).is_ok_and(|value| value != "0")
}

static ALLOWED_PACKAGE_NAMES: Lazy<Vec<String>> = Lazy::new(|| {
let base_directories = xdg::BaseDirectories::new().unwrap();
let Some(allowed) = base_directories.find_config_file("build-wrap/allow.txt") else {
return Vec::new();
};
let contents = read_to_string(allowed).unwrap();
contents.lines().map(ToOwned::to_owned).collect()
});

fn package_name_allowed() -> bool {
let Ok(package_name) = env::var("CARGO_PKG_NAME") else {
return false;
};
ALLOWED_PACKAGE_NAMES.contains(&package_name)
}

#[cfg(test)]
pub use test::assert_readme_contains_code_block;

Expand Down
1 change: 1 addition & 0 deletions src/wrapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ publish = false
anyhow = "1.0"
once_cell = "1.19"
tempfile = "3.10"
xdg = "2.5"
"#;

/// A wrapper build script's src/main.rs consists of the following:
Expand Down
Loading