Skip to content

fix(permissions): ignore NotADirectory and strip BOM before empty check #4658

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

Open
webdevsamran wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(permissions): ignore NotADirectory and strip BOM before empty check #4658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 35 additions & 2 deletions src/hooks/permissions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use super::constants::{
use super::init::resolve_claude_dir;
use crate::core::user_dirs;
use crate::core::user_env;
use crate::core::utils::strip_leading_bom;
use crate::discover::lexer::{
is_word_boundary_whitespace, split_for_permissions, split_for_wrappers,
};
Expand Down Expand Up @@ -288,7 +289,14 @@ fn load_permission_rules_from(paths: &[PathBuf]) -> (Vec<String>, Vec<String>, V
for path in paths {
let content = match std::fs::read_to_string(path) {
Ok(content) => content,
Err(e) if e.kind() == std::io::ErrorKind::NotFound => continue,
Err(e)
if matches!(
e.kind(),
std::io::ErrorKind::NotFound | std::io::ErrorKind::NotADirectory
) =>
{
continue;
}
Err(e) => {
eprintln!(
"[rtk] warning: failed to read permissions from {}: {}",
Expand All @@ -299,10 +307,11 @@ fn load_permission_rules_from(paths: &[PathBuf]) -> (Vec<String>, Vec<String>, V
continue;
}
};
let content = strip_leading_bom(&content);
if content.trim().is_empty() {
continue;
}
let Ok(json) = crate::core::utils::from_json_str::<Value>(&content) else {
let Ok(json) = crate::core::utils::from_json_str::<Value>(content) else {
eprintln!(
"[rtk] warning: failed to parse permissions from {}",
path.display()
Expand Down Expand Up @@ -821,6 +830,30 @@ mod tests {
assert!(deny.is_empty() && ask.is_empty() && allow.is_empty());
}

#[test]
fn test_bom_only_settings_file_adds_no_rules() {
let tmp = tempfile::tempdir().expect("tempdir");
let bom_empty = tmp.path().join("settings.local.json");
std::fs::write(&bom_empty, b"\xEF\xBB\xBF").expect("write settings");
let (deny, ask, allow) = load_permission_rules_from(&[bom_empty]);
assert!(deny.is_empty() && ask.is_empty() && allow.is_empty());

let bom_whitespace = tmp.path().join("settings.json");
std::fs::write(&bom_whitespace, b"\xEF\xBB\xBF \r\n").expect("write settings");
let (deny, ask, allow) = load_permission_rules_from(&[bom_whitespace]);
assert!(deny.is_empty() && ask.is_empty() && allow.is_empty());
}

#[test]
fn test_not_a_directory_settings_file_adds_no_rules() {
let tmp = tempfile::tempdir().expect("tempdir");
let file_path = tmp.path().join("not_a_dir");
std::fs::write(&file_path, "regular file content").expect("write file");
let settings_path = file_path.join("settings.json");
let (deny, ask, allow) = load_permission_rules_from(&[settings_path]);
assert!(deny.is_empty() && ask.is_empty() && allow.is_empty());
}

#[test]
fn test_parse_bash_pattern() {
assert_eq!(
Expand Down