Skip to content
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
2 changes: 1 addition & 1 deletion src/inject/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fn run_wl_copy_reports_spawn_failure() {
fn run_wl_copy_reports_non_zero_exit() {
let err = clipboard::run_wl_copy(
"/bin/sh",
&[String::from("-c"), String::from("exit 7")],
&[String::from("-c"), String::from("cat >/dev/null; exit 7")],
"hello",
)
.expect_err("non-zero exit should fail");
Expand Down
6 changes: 6 additions & 0 deletions src/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,13 @@ impl CloudSetup {
}
}

fn validate_setup_invoker(uid: libc::uid_t) -> Result<()> {
side_effects::validate_setup_user(uid)
}

pub async fn run_setup(config_path_override: Option<&Path>) -> Result<()> {
validate_setup_invoker(unsafe { libc::geteuid() })?;

let ui = SetupUi::new();
ui.print_header("whispers setup");
ui.blank();
Expand Down
11 changes: 11 additions & 0 deletions src/setup/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@ fn setup_rejects_root_before_uinput_readiness_short_circuit() {
}
}

#[test]
fn setup_rejects_root_before_any_setup_side_effects() {
let err = super::validate_setup_invoker(0).expect_err("root should be rejected up front");
match err {
WhsprError::Config(message) => {
assert!(message.contains("run `whispers setup` as your normal user, not as root"));
}
other => panic!("unexpected error variant: {other:?}"),
}
}

#[test]
fn group_membership_success_marks_logout_as_needed() {
let mut outcome = side_effects::InjectionSetupOutcome::default();
Expand Down