Compare commits

...

1 Commits

Author SHA1 Message Date
David Wiesen
a68f7fcc7c Avoid fatal ACL probe errors during sandbox refresh 2026-04-08 10:00:43 -07:00

View File

@@ -160,7 +160,6 @@ fn apply_read_acls(
/*label*/ None,
access_mask,
access_label,
refresh_errors,
log,
)?;
if builtin_has {
@@ -172,7 +171,6 @@ fn apply_read_acls(
Some("sandbox_group"),
access_mask,
access_label,
refresh_errors,
log,
)?;
if sandbox_has {
@@ -216,7 +214,6 @@ fn read_mask_allows_or_log(
label: Option<&str>,
read_mask: u32,
access_label: &str,
refresh_errors: &mut Vec<String>,
log: &mut File,
) -> Result<bool> {
match path_mask_allows(root, psids, read_mask, /*require_all_bits*/ true) {
@@ -225,16 +222,10 @@ fn read_mask_allows_or_log(
let label_suffix = label
.map(|value| format!(" for {value}"))
.unwrap_or_default();
refresh_errors.push(format!(
"{access_label} mask check failed on {}{}: {}",
root.display(),
label_suffix,
e
));
log_line(
log,
&format!(
"{access_label} mask check failed on {}{}: {}; continuing",
"{access_label} mask check failed on {}{}: {}; will attempt grant",
root.display(),
label_suffix,
e
@@ -676,15 +667,10 @@ fn run_setup_full(payload: &Payload, log: &mut File, sbx_dir: &Path) -> Result<(
match path_mask_allows(root, &[psid], write_mask, /*require_all_bits*/ true) {
Ok(h) => h,
Err(e) => {
refresh_errors.push(format!(
"write mask check failed on {} for {label}: {}",
root.display(),
e
));
log_line(
log,
&format!(
"write mask check failed on {} for {label}: {}; continuing",
"write mask check failed on {} for {label}: {}; will attempt grant",
root.display(),
e
),