1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00

Remove users crate

This commit is contained in:
Daniel Hofstetter 2023-06-04 14:55:16 +02:00
parent 99fa504257
commit 29f011e28c
6 changed files with 17 additions and 29 deletions

11
Cargo.lock generated
View file

@ -424,7 +424,6 @@ dependencies = [
"textwrap", "textwrap",
"time", "time",
"unindent", "unindent",
"users",
"uu_arch", "uu_arch",
"uu_base32", "uu_base32",
"uu_base64", "uu_base64",
@ -2369,16 +2368,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f" checksum = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f"
[[package]]
name = "users"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032"
dependencies = [
"libc",
"log",
]
[[package]] [[package]]
name = "utf8parse" name = "utf8parse"
version = "0.2.1" version = "0.2.1"

View file

@ -499,7 +499,6 @@ rlimit = "0.9.1"
[target.'cfg(unix)'.dev-dependencies] [target.'cfg(unix)'.dev-dependencies]
nix = { workspace=true, features=["process", "signal", "user"] } nix = { workspace=true, features=["process", "signal", "user"] }
rust-users = { version="0.11", package="users" }
rand_pcg = "0.3" rand_pcg = "0.3"
[build-dependencies] [build-dependencies]

View file

@ -1,7 +1,7 @@
// spell-checker:ignore (words) nosuchgroup groupname // spell-checker:ignore (words) nosuchgroup groupname
use crate::common::util::TestScenario; use crate::common::util::TestScenario;
use rust_users::get_effective_gid; use uucore::process::getegid;
#[test] #[test]
fn test_invalid_option() { fn test_invalid_option() {
@ -53,7 +53,7 @@ fn test_invalid_group() {
#[test] #[test]
fn test_1() { fn test_1() {
if get_effective_gid() != 0 { if getegid() != 0 {
new_ucmd!().arg("bin").arg(DIR).fails().stderr_contains( new_ucmd!().arg("bin").arg(DIR).fails().stderr_contains(
// linux fails with "Operation not permitted (os error 1)" // linux fails with "Operation not permitted (os error 1)"
// because of insufficient permissions, // because of insufficient permissions,
@ -66,7 +66,7 @@ fn test_1() {
#[test] #[test]
fn test_fail_silently() { fn test_fail_silently() {
if get_effective_gid() != 0 { if getegid() != 0 {
for opt in ["-f", "--silent", "--quiet", "--sil", "--qui"] { for opt in ["-f", "--silent", "--quiet", "--sil", "--qui"] {
new_ucmd!() new_ucmd!()
.arg(opt) .arg(opt)
@ -137,7 +137,7 @@ fn test_reference() {
// skip for root or MS-WSL // skip for root or MS-WSL
// * MS-WSL is bugged (as of 2019-12-25), allowing non-root accounts su-level privileges for `chgrp` // * MS-WSL is bugged (as of 2019-12-25), allowing non-root accounts su-level privileges for `chgrp`
// * for MS-WSL, succeeds and stdout == 'group of /etc retained as root' // * for MS-WSL, succeeds and stdout == 'group of /etc retained as root'
if !(get_effective_gid() == 0 || uucore::os::is_wsl_1()) { if !(getegid() == 0 || uucore::os::is_wsl_1()) {
new_ucmd!() new_ucmd!()
.arg("-v") .arg("-v")
.arg("--reference=/etc/passwd") .arg("--reference=/etc/passwd")
@ -203,7 +203,7 @@ fn test_missing_files() {
#[test] #[test]
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn test_big_p() { fn test_big_p() {
if get_effective_gid() != 0 { if getegid() != 0 {
new_ucmd!() new_ucmd!()
.arg("-RP") .arg("-RP")
.arg("bin") .arg("bin")
@ -218,7 +218,7 @@ fn test_big_p() {
#[test] #[test]
#[cfg(any(target_os = "linux", target_os = "android"))] #[cfg(any(target_os = "linux", target_os = "android"))]
fn test_big_h() { fn test_big_h() {
if get_effective_gid() != 0 { if getegid() != 0 {
assert!( assert!(
new_ucmd!() new_ucmd!()
.arg("-RH") .arg("-RH")

View file

@ -2,7 +2,7 @@
use crate::common::util::{is_ci, run_ucmd_as_root, CmdResult, TestScenario}; use crate::common::util::{is_ci, run_ucmd_as_root, CmdResult, TestScenario};
#[cfg(any(target_os = "linux", target_os = "android"))] #[cfg(any(target_os = "linux", target_os = "android"))]
use rust_users::get_effective_uid; use uucore::process::geteuid;
// Apparently some CI environments have configuration issues, e.g. with 'whoami' and 'id'. // Apparently some CI environments have configuration issues, e.g. with 'whoami' and 'id'.
// If we are running inside the CI and "needle" is in "stderr" skipping this test is // If we are running inside the CI and "needle" is in "stderr" skipping this test is
@ -701,7 +701,7 @@ fn test_root_preserve() {
#[cfg(any(target_os = "linux", target_os = "android"))] #[cfg(any(target_os = "linux", target_os = "android"))]
#[test] #[test]
fn test_big_p() { fn test_big_p() {
if get_effective_uid() != 0 { if geteuid() != 0 {
new_ucmd!() new_ucmd!()
.arg("-RP") .arg("-RP")
.arg("bin") .arg("bin")

View file

@ -1,7 +1,7 @@
use crate::common::util::TestScenario; use crate::common::util::TestScenario;
use regex::Regex; use regex::Regex;
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(target_os = "macos")))]
use rust_users::get_effective_uid; use uucore::process::geteuid;
#[test] #[test]
fn test_invalid_arg() { fn test_invalid_arg() {
@ -213,7 +213,7 @@ fn test_date_format_literal() {
#[test] #[test]
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(target_os = "macos")))]
fn test_date_set_valid() { fn test_date_set_valid() {
if get_effective_uid() == 0 { if geteuid() == 0 {
new_ucmd!() new_ucmd!()
.arg("--set") .arg("--set")
.arg("2020-03-12 13:30:00+08:00") .arg("2020-03-12 13:30:00+08:00")
@ -234,7 +234,7 @@ fn test_date_set_invalid() {
#[test] #[test]
#[cfg(all(unix, not(any(target_os = "android", target_os = "macos"))))] #[cfg(all(unix, not(any(target_os = "android", target_os = "macos"))))]
fn test_date_set_permissions_error() { fn test_date_set_permissions_error() {
if !(get_effective_uid() == 0 || uucore::os::is_wsl_1()) { if !(geteuid() == 0 || uucore::os::is_wsl_1()) {
let result = new_ucmd!() let result = new_ucmd!()
.arg("--set") .arg("--set")
.arg("2020-03-11 21:45:00+08:00") .arg("2020-03-11 21:45:00+08:00")
@ -261,7 +261,7 @@ fn test_date_set_mac_unavailable() {
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(target_os = "macos")))]
/// TODO: expected to fail currently; change to succeeds() when required. /// TODO: expected to fail currently; change to succeeds() when required.
fn test_date_set_valid_2() { fn test_date_set_valid_2() {
if get_effective_uid() == 0 { if geteuid() == 0 {
let result = new_ucmd!() let result = new_ucmd!()
.arg("--set") .arg("--set")
.arg("Sat 20 Mar 2021 14:53:01 AWST") // spell-checker:disable-line .arg("Sat 20 Mar 2021 14:53:01 AWST") // spell-checker:disable-line
@ -325,7 +325,7 @@ fn test_date_for_file() {
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(target_os = "macos")))]
/// TODO: expected to fail currently; change to succeeds() when required. /// TODO: expected to fail currently; change to succeeds() when required.
fn test_date_set_valid_3() { fn test_date_set_valid_3() {
if get_effective_uid() == 0 { if geteuid() == 0 {
let result = new_ucmd!() let result = new_ucmd!()
.arg("--set") .arg("--set")
.arg("Sat 20 Mar 2021 14:53:01") // Local timezone .arg("Sat 20 Mar 2021 14:53:01") // Local timezone
@ -339,7 +339,7 @@ fn test_date_set_valid_3() {
#[cfg(all(unix, not(target_os = "macos")))] #[cfg(all(unix, not(target_os = "macos")))]
/// TODO: expected to fail currently; change to succeeds() when required. /// TODO: expected to fail currently; change to succeeds() when required.
fn test_date_set_valid_4() { fn test_date_set_valid_4() {
if get_effective_uid() == 0 { if geteuid() == 0 {
let result = new_ucmd!() let result = new_ucmd!()
.arg("--set") .arg("--set")
.arg("2020-03-11 21:45:00") // Local timezone .arg("2020-03-11 21:45:00") // Local timezone

View file

@ -2,12 +2,12 @@
use crate::common::util::{is_ci, TestScenario}; use crate::common::util::{is_ci, TestScenario};
use filetime::FileTime; use filetime::FileTime;
use rust_users::{get_effective_gid, get_effective_uid};
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
#[cfg(not(any(windows, target_os = "freebsd")))] #[cfg(not(any(windows, target_os = "freebsd")))]
use std::process::Command; use std::process::Command;
#[cfg(any(target_os = "linux", target_os = "android"))] #[cfg(any(target_os = "linux", target_os = "android"))]
use std::thread::sleep; use std::thread::sleep;
use uucore::process::{getegid, geteuid};
#[test] #[test]
fn test_invalid_arg() { fn test_invalid_arg() {
@ -322,7 +322,7 @@ fn test_install_target_new_file_with_group() {
let (at, mut ucmd) = at_and_ucmd!(); let (at, mut ucmd) = at_and_ucmd!();
let file = "file"; let file = "file";
let dir = "target_dir"; let dir = "target_dir";
let gid = get_effective_gid(); let gid = getegid();
at.touch(file); at.touch(file);
at.mkdir(dir); at.mkdir(dir);
@ -349,7 +349,7 @@ fn test_install_target_new_file_with_owner() {
let (at, mut ucmd) = at_and_ucmd!(); let (at, mut ucmd) = at_and_ucmd!();
let file = "file"; let file = "file";
let dir = "target_dir"; let dir = "target_dir";
let uid = get_effective_uid(); let uid = geteuid();
at.touch(file); at.touch(file);
at.mkdir(dir); at.mkdir(dir);