Replace system::time::Duration with std::time::Duration (#1207)

This pull request replaces `system::time::Duration` with
`std::time::Duration`.

I couldn't find any code that still uses negative duration, so I
replaced it with it's `std` equivalent.
The only place, where I'm not sure if its possible to use an negative
duration, is the `prior_validity` property from the `Authentication`
struct.

Should close  #1170

Author: joriskleiber

src/defaults/mod.rs

@@ -78,27 +78,27 @@ defaults! {
                                 "PYTHONINSPECT", "PYTHONUSERBASE", "RUBYLIB", "RUBYOPT", "*=()*"] #ignored
 }
 
-fn octal_mode(input: &str) -> Option<i64> {
+fn octal_mode(input: &str) -> Option<u64> {
     <libc::mode_t>::from_str_radix(input.strip_prefix('0')?, 8)
         .ok()
         .map(Into::into)
 }
 
 /// A custom parser to parse seconds as fractional "minutes", the format used by
 /// passwd_timeout and timestamp_timeout.
-fn fractional_minutes(input: &str) -> Option<i64> {
+fn fractional_minutes(input: &str) -> Option<u64> {
     if let Some((integral, fractional)) = input.split_once('.') {
         // - 'input' is maximally 18 characters, making fractional.len() at most 17;
         //   1e17 < 2**63, so the definition of 'shift' will not overflow.
         // - for the same reason, if both parses in the definition of 'seconds' succeed,
         //   we will have constructed an integer < 1e17.
         //-  1e17 * 60 = 6e18 < 9e18 < 2**63, so the final line also will not overflow
-        let shift = 10i64.pow(fractional.len().try_into().ok()?);
-        let seconds = integral.parse::<i64>().ok()? * shift + fractional.parse::<i64>().ok()?;
+        let shift = 10u64.pow(fractional.len().try_into().ok()?);
+        let seconds = integral.parse::<u64>().ok()? * shift + fractional.parse::<u64>().ok()?;
 
         Some(seconds * 60 / shift)
     } else {
-        input.parse::<i64>().ok()?.checked_mul(60)
+        input.parse::<u64>().ok()?.checked_mul(60)
     }
 }
 

src/defaults/settings_dsl.rs

@@ -2,7 +2,7 @@ macro_rules! storage_of {
     ($id:ident, true) => { bool };
     ($id:ident, false) => { bool };
     ($id:ident, [ $($value: expr),* ]) => { std::collections::HashSet<String> };
-    ($id:ident, $(=int $check: expr;)+ $_: expr) => { i64 };
+    ($id:ident, $(=int $check: expr;)+ $_: expr) => { u64 };
     ($id:ident, $(=enum $k: ident;)+ $_: ident) => { $crate::defaults::enums::$id };
     ($id:ident, None) => { Option<Box<str>> };
     ($id:ident, $_: expr) => { Box<str> };
@@ -12,7 +12,7 @@ macro_rules! referent_of {
     ($id:ident, true) => { bool };
     ($id:ident, false) => { bool };
     ($id:ident, [ $($value: expr),* ]) => { &std::collections::HashSet<String> };
-    ($id:ident, $(=int $check: expr;)+ $_: expr) => { i64 };
+    ($id:ident, $(=int $check: expr;)+ $_: expr) => { u64 };
     ($id:ident, $(=enum $k: ident;)+ $_: ident) => { $crate::defaults::enums::$id };
     ($id:ident, None) => { Option<&str> };
     ($id:ident, $_: expr) => { &str };
@@ -73,7 +73,7 @@ macro_rules! modifier_of {
     ($id:ident, =int $first:literal ..= $last: literal $(@ $radix: literal)?; $value: expr) => {
         #[allow(clippy::from_str_radix_10)]
         $crate::defaults::SettingKind::Integer(|text| {
-            i64::from_str_radix(text, 10$(*0 + $radix)?)
+            u64::from_str_radix(text, 10$(*0 + $radix)?)
                 .ok()
                 .filter(|val| ($first ..= $last).contains(val))
                 .map(|i| {

src/pam/converse.rs

@@ -1,12 +1,10 @@
 use std::ffi::{c_int, c_void};
 use std::io;
+use std::time::Duration;
 
 use crate::cutils::string_from_ptr;
 use crate::pam::rpassword::Hidden;
-use crate::system::{
-    signal::{self, SignalSet},
-    time::Duration,
-};
+use crate::system::signal::{self, SignalSet};
 
 use super::sys::*;
 

src/pam/mod.rs

@@ -4,13 +4,11 @@ use std::{
     os::raw::c_char,
     os::unix::prelude::OsStrExt,
     ptr::NonNull,
-};
-
-use crate::system::{
-    signal::{self, SignalSet},
     time::Duration,
 };
 
+use crate::system::signal::{self, SignalSet};
+
 use converse::ConverserData;
 use error::pam_err;
 pub use error::{PamError, PamErrorType, PamResult};

src/pam/rpassword.rs

@@ -16,13 +16,12 @@
 use std::ffi::c_void;
 use std::io::{self, Error, ErrorKind, Read};
 use std::os::fd::{AsFd, AsRawFd, BorrowedFd};
-use std::time::Instant;
+use std::time::{Duration, Instant};
 use std::{fs, mem};
 
 use libc::{tcsetattr, termios, ECHO, ECHONL, ICANON, TCSANOW, VEOF, VERASE, VKILL};
 
 use crate::cutils::{cerr, safe_isatty};
-use crate::system::time::Duration;
 
 use super::securemem::PamBuffer;
 
@@ -186,7 +185,7 @@ struct TimeoutRead<'a> {
 impl<'a> TimeoutRead<'a> {
     fn new(fd: BorrowedFd<'a>, timeout: Option<Duration>) -> TimeoutRead<'a> {
         TimeoutRead {
-            timeout_at: timeout.map(|timeout| Instant::now() + timeout.into()),
+            timeout_at: timeout.map(|timeout| Instant::now() + timeout),
             fd,
         }
     }

src/sudo/mod.rs

@@ -6,12 +6,12 @@ use crate::log::dev_info;
 use crate::system::interface::UserId;
 use crate::system::timestamp::RecordScope;
 use crate::system::User;
-use crate::system::{time::Duration, timestamp::SessionRecordFile, Process};
+use crate::system::{timestamp::SessionRecordFile, Process};
 #[cfg(test)]
 pub(crate) use cli::SudoAction;
 #[cfg(not(test))]
 use cli::SudoAction;
-use std::path::PathBuf;
+use std::{path::PathBuf, time::Duration};
 
 mod cli;
 pub(crate) use cli::{SudoEditOptions, SudoListOptions, SudoRunOptions, SudoValidateOptions};
@@ -90,16 +90,15 @@ fn sudo_process() -> Result<(), Error> {
             }
             SudoAction::RemoveTimestamp(_) => {
                 let user = CurrentUser::resolve()?;
-                let mut record_file =
-                    SessionRecordFile::open_for_user(&user, Duration::seconds(0))?;
+                let mut record_file = SessionRecordFile::open_for_user(&user, Duration::default())?;
                 record_file.reset()?;
                 Ok(())
             }
             SudoAction::ResetTimestamp(_) => {
                 if let Some(scope) = RecordScope::for_process(&Process::new()) {
                     let user = CurrentUser::resolve()?;
                     let mut record_file =
-                        SessionRecordFile::open_for_user(&user, Duration::seconds(0))?;
+                        SessionRecordFile::open_for_user(&user, Duration::default())?;
                     record_file.disable(scope)?;
                 }
                 Ok(())

src/sudo/pam.rs

@@ -1,10 +1,11 @@
 use std::ffi::OsString;
+use std::time::Duration;
 
 use crate::common::context::LaunchType;
 use crate::common::error::Error;
 use crate::log::{dev_info, user_warn};
 use crate::pam::{PamContext, PamError, PamErrorType, PamResult};
-use crate::system::{term::current_tty_name, time::Duration};
+use crate::system::term::current_tty_name;
 
 pub(super) struct InitPamArgs<'a> {
     pub(super) launch: LaunchType,

src/sudo/pipeline.rs

@@ -1,5 +1,6 @@
 use std::ffi::OsStr;
 use std::process::exit;
+use std::time::Duration;
 
 use super::cli::{SudoRunOptions, SudoValidateOptions};
 use super::diagnostic;
@@ -10,7 +11,6 @@ use crate::log::{auth_info, auth_warn};
 use crate::pam::PamContext;
 use crate::sudo::env::environment;
 use crate::sudo::pam::{attempt_authenticate, init_pam, pre_exec, InitPamArgs};
-use crate::sudo::Duration;
 use crate::sudoers::{
     AuthenticatingUser, Authentication, Authorization, DirChange, Judgement, Restrictions, Sudoers,
 };

src/sudoers/policy.rs

@@ -6,13 +6,14 @@ use crate::common::{
 };
 use crate::exec::Umask;
 use crate::sudoers::ast::{ExecControl, Tag};
-use crate::system::{time::Duration, Hostname, User};
+use crate::system::{Hostname, User};
 /// Data types and traits that represent what the "terms and conditions" are after a successful
 /// permission check.
 ///
 /// The trait definitions can be part of some global crate in the future, if we support more
 /// than just the sudoers file.
 use std::collections::HashSet;
+use std::time::Duration;
 
 #[must_use]
 #[cfg_attr(test, derive(Debug, PartialEq))]
@@ -38,11 +39,11 @@ impl super::Settings {
         Authentication {
             must_authenticate: tag.needs_passwd(),
             allowed_attempts: self.passwd_tries().try_into().unwrap(),
-            prior_validity: Duration::seconds(self.timestamp_timeout()),
+            prior_validity: Duration::from_secs(self.timestamp_timeout()),
             pwfeedback: self.pwfeedback(),
             password_timeout: match self.passwd_timeout() {
                 0 => None,
-                timeout => Some(Duration::seconds(timeout)),
+                timeout => Some(Duration::from_secs(timeout)),
             },
             credential: if self.rootpw() {
                 AuthenticatingUser::Root
@@ -191,10 +192,10 @@ mod test {
             Authentication {
                 must_authenticate: true,
                 allowed_attempts: 3,
-                prior_validity: Duration::minutes(15),
+                prior_validity: Duration::from_secs(15 * 60),
                 credential: AuthenticatingUser::InvokingUser,
                 pwfeedback: false,
-                password_timeout: Some(Duration::seconds(300)),
+                password_timeout: Some(Duration::from_secs(300)),
             },
         );
 
@@ -208,10 +209,10 @@ mod test {
             Authentication {
                 must_authenticate: false,
                 allowed_attempts: 3,
-                prior_validity: Duration::minutes(15),
+                prior_validity: Duration::from_secs(15 * 60),
                 credential: AuthenticatingUser::InvokingUser,
                 pwfeedback: false,
-                password_timeout: Some(Duration::seconds(300)),
+                password_timeout: Some(Duration::from_secs(300)),
             },
         );
         assert_eq!(restrictions, restrictions2);