From 3ef014cb5f04f1798f7e03bdd26c503a7dda0223 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 23 Aug 2020 00:50:05 +0100
Subject: [PATCH] use nix Uid

---
 src/cmdlistener.rs | 26 ++++++++++++++------------
 src/imports.rs     |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs
index 4cbaa0c1..df9bbb77 100644
--- a/src/cmdlistener.rs
+++ b/src/cmdlistener.rs
@@ -380,7 +380,7 @@ impl UpdateHandler {
 // ---------- core listener implementation ----------
 
 struct CommandStream<'d> {
-  euid : Result<u32, ConnectionEuidDiscoverEerror>,
+  euid : Result<Uid, ConnectionEuidDiscoverEerror>,
   desc : &'d str,
   scope : Option<ManagementScope>,
   chan : MgmtChannel,
@@ -471,7 +471,7 @@ impl CommandListener {
 
         let cs = CommandStream {
           scope: None, desc: &desc,
-          chan, euid,
+          chan, euid: euid.map(Uid::from_raw),
         };
         cs.mainloop()?;
         
@@ -492,18 +492,18 @@ pub struct ConnectionEuidDiscoverEerror(String);
 
 impl CommandStream<'_> {
   #[throws(AuthorisationError)]
-  fn authorised_uid(&self, wanted: Option<uid_t>, xinfo: Option<&str>)
-                    -> Authorised<(Passwd,uid_t),> {
+  fn authorised_uid(&self, wanted: Option<Uid>, xinfo: Option<&str>)
+                    -> Authorised<(Passwd,Uid),> {
     let client_euid = *self.euid.as_ref().map_err(|e| e.clone())?;
-    let server_euid = unsafe { libc::getuid() };
-    if client_euid == 0 ||
-       client_euid == server_euid ||
+    let server_uid = Uid::current();
+    if client_euid.is_root() ||
+       client_euid == server_uid ||
        Some(client_euid) == wanted
     {
       return Authorised::authorise();
     }
     throw!(anyhow!("{}: euid mismatch: client={:?} server={:?} wanted={:?}{}",
-                   &self.desc, client_euid, server_euid, wanted,
+                   &self.desc, client_euid, server_uid, wanted,
                    xinfo.unwrap_or("")));
   }
 
@@ -530,7 +530,7 @@ fn do_authorise_scope(cs: &CommandStream, wanted: &ManagementScope)
 
     ManagementScope::Server => {
       let y : AS<
-        Authorised<(Passwd,uid_t)>,
+        Authorised<(Passwd,Uid)>,
       > = {
         let ok = cs.authorised_uid(None,None)?;
         (ok,
@@ -541,9 +541,9 @@ fn do_authorise_scope(cs: &CommandStream, wanted: &ManagementScope)
 
     ManagementScope::Unix { user: wanted } => {
       let y : AS<
-        Authorised<(Passwd,uid_t)>,
+        Authorised<(Passwd,Uid)>,
       > = {
-        struct AuthorisedIf { authorised_for : Option<uid_t> };
+        struct AuthorisedIf { authorised_for : Option<Uid> };
 
         let pwent = Passwd::from_name(&wanted)
           .map_err(
@@ -571,7 +571,9 @@ fn do_authorise_scope(cs: &CommandStream, wanted: &ManagementScope)
             .filter_map(|le| match le {
               Ok(l) if l.trim() == wanted => Some(
                 Ok((
-                  AuthorisedIf{ authorised_for: Some(pwent.uid) },
+                  AuthorisedIf{ authorised_for: Some(
+                    Uid::from_raw(pwent.uid)
+                  ) },
                   None
                 ))
               ),
diff --git a/src/imports.rs b/src/imports.rs
index 141c7d59..c1959f71 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -76,7 +76,7 @@ pub use crate::api::{Lens,TransparentLens};
 pub use crate::utils::OrdExt;
 pub use crate::spec::*;
 
-pub use libc::uid_t;
+pub use nix::unistd::Uid;
 
 pub type E = anyhow::Error;
 pub type AE = anyhow::Error;
-- 
2.30.2