Skip to content

fix(#4886) more: panics if file is not readable #4888

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

Merged
merged 6 commits into from
May 24, 2023
Merged

fix(#4886) more: panics if file is not readable #4888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d41777c
more: change file unwrap to match
Ludmuterol May 22, 2023
50bff30
more: add test and change error type
Ludmuterol May 23, 2023
eed916a
more: disable raw mode on error
Ludmuterol May 24, 2023
53ffd55
more: run test only on unix systems
Ludmuterol May 24, 2023
ccdb76a
more: Update tests/by-util/test_more.rs
Ludmuterol May 24, 2023
7cad501
more: add output check to test
Ludmuterol May 24, 2023
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: 11 additions & 1 deletion src/uu/more/src/more.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,17 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
if length > 1 {
buff.push_str(&MULTI_FILE_TOP_PROMPT.replace("{}", file.to_str().unwrap()));
}
let mut reader = BufReader::new(File::open(file).unwrap());
let opened_file = match File::open(file) {
Err(why) => {
terminal::disable_raw_mode().unwrap();
return Err(USimpleError::new(
1,
format!("cannot open {}: {}", file.quote(), why.kind()),
));
}
Ok(opened_file) => opened_file,
};
let mut reader = BufReader::new(opened_file);
reader.read_to_string(&mut buff).unwrap();
more(&buff, &mut stdout, next_file.copied(), &options)?;
buff.clear();
Expand Down
18 changes: 18 additions & 0 deletions tests/by-util/test_more.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,21 @@ fn test_more_dir_arg() {
.usage_error("'.' is a directory.");
}
}

#[test]
#[cfg(target_family = "unix")]
fn test_more_invalid_file_perms() {
use std::fs::{set_permissions, Permissions};
use std::os::unix::fs::PermissionsExt;

if std::io::stdout().is_terminal() {
let (at, mut ucmd) = at_and_ucmd!();
let permissions = Permissions::from_mode(0o244);
at.make_file("invalid-perms.txt");
set_permissions(at.plus("invalid-perms.txt"), permissions).unwrap();
ucmd.arg("invalid-perms.txt")
.fails()
.code_is(1)
.stderr_contains("permission denied");
}
}