diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs index a4ca55449e..133901c913 100644 --- a/crates/nu-command/src/filesystem/rm.rs +++ b/crates/nu-command/src/filesystem/rm.rs @@ -149,7 +149,31 @@ fn rm( let mut targets: Vec> = call.rest(engine_state, stack, 0)?; + let mut unique_argument_check = None; + + let currentdir_path = current_dir(engine_state, stack)?; + + let home: Option = nu_path::home_dir().map(|path| { + { + if path.exists() { + match nu_path::canonicalize_with(&path, ¤tdir_path) { + Ok(canon_path) => canon_path, + Err(_) => path, + } + } else { + path + } + } + .to_string_lossy() + .into() + }); + for (idx, path) in targets.clone().into_iter().enumerate() { + if let Some(ref home) = home { + if &path.item == home { + unique_argument_check = Some(path.span); + } + } let corrected_path = Spanned { item: nu_utils::strip_ansi_string_unlikely(path.item), span: path.span, @@ -199,6 +223,16 @@ fn rm( )); } + if unique_argument_check.is_some() && !(interactive_once || interactive) { + return Err(ShellError::GenericError( + "You are trying to remove your home dir".into(), + "If you really want to remove your home dir, please use -I or -i".into(), + unique_argument_check, + None, + Vec::new(), + )); + } + let targets_span = Span::new( targets .iter() @@ -212,18 +246,12 @@ fn rm( .expect("targets were empty"), ); - let path = current_dir(engine_state, stack)?; - let (mut target_exists, mut empty_span) = (false, call.head); let mut all_targets: HashMap = HashMap::new(); for target in targets { - if path.to_string_lossy() == target.item - || path.as_os_str().to_string_lossy().starts_with(&format!( - "{}{}", - target.item, - std::path::MAIN_SEPARATOR - )) + if currentdir_path.to_string_lossy() == target.item + || currentdir_path.starts_with(&format!("{}{}", target.item, std::path::MAIN_SEPARATOR)) { return Err(ShellError::GenericError( "Cannot remove any parent directory".into(), @@ -234,7 +262,7 @@ fn rm( )); } - let path = path.join(&target.item); + let path = currentdir_path.join(&target.item); match nu_glob::glob_with( &path.to_string_lossy(), nu_glob::MatchOptions { diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs index 77b8bd17bf..cf19301056 100644 --- a/crates/nu-command/tests/commands/rm.rs +++ b/crates/nu-command/tests/commands/rm.rs @@ -135,6 +135,18 @@ fn errors_if_attempting_to_delete_a_directory_with_content_without_recursive_fla }) } +#[test] +fn errors_if_attempting_to_delete_home() { + Playground::setup("rm_test_8", |dirs, _| { + let actual = nu!( + cwd: dirs.root(), + "let-env HOME = myhome ; rm -rf ~" + ); + + assert!(actual.err.contains("please use -I or -i")); + }) +} + #[test] fn errors_if_attempting_to_delete_single_dot_as_argument() { Playground::setup("rm_test_7", |dirs, _| {