More accurate check for installed package

Author: petehayes102

src/error.rs

@@ -8,6 +8,7 @@
 
 #[cfg(feature = "remote-run")]
 use czmq;
+use regex;
 use rustc_serialize::json;
 use std::{convert, error, fmt, io, num, str, string};
 #[cfg(feature = "remote-run")]
@@ -18,6 +19,9 @@ pub enum Error {
     /// An error string returned from the host's Intecture Agent
     Agent(String),
     #[cfg(feature = "remote-run")]
+    /// An error string returned from the host's Intecture Auth
+    Auth(String),
+    #[cfg(feature = "remote-run")]
     /// CZMQ error
     Czmq(czmq::Error),
     /// JSON decoder error
@@ -39,6 +43,8 @@ pub enum Error {
     ParseFloat(num::ParseFloatError),
     /// Cast str as int
     ParseInt(num::ParseIntError),
+    /// Regex error
+    Regex(regex::Error),
     /// Cast str
     StrFromUtf8(str::Utf8Error),
     /// Cast String
@@ -53,6 +59,8 @@ impl fmt::Display for Error {
         match *self {
             Error::Agent(ref e) => write!(f, "Agent error: {}", e),
             #[cfg(feature = "remote-run")]
+            Error::Auth(ref e) => write!(f, "Auth error: {}", e),
+            #[cfg(feature = "remote-run")]
             Error::Czmq(ref e) => write!(f, "CZMQ error: {}", e),
             Error::JsonDecoder(ref e) => write!(f, "JSON decoder error: {}", e),
             #[cfg(feature = "remote-run")]
@@ -65,6 +73,7 @@ impl fmt::Display for Error {
             Error::Io(ref e) => write!(f, "IO error: {}", e),
             Error::ParseFloat(ref e) => write!(f, "Parse error: {}", e),
             Error::ParseInt(ref e) => write!(f, "Parse error: {}", e),
+            Error::Regex(ref e) => write!(f, "Regex error: {}", e),
             Error::StrFromUtf8(ref e) => write!(f, "Convert from UTF8 slice to str error: {}", e),
             Error::StringFromUtf8(ref e) => write!(f, "Convert from UTF8 slice to String error: {}", e),
             #[cfg(feature = "remote-run")]
@@ -78,6 +87,8 @@ impl error::Error for Error {
         match *self {
             Error::Agent(ref e) => e,
             #[cfg(feature = "remote-run")]
+            Error::Auth(ref e) => e,
+            #[cfg(feature = "remote-run")]
             Error::Czmq(ref e) => e.description(),
             Error::JsonDecoder(ref e) => e.description(),
             #[cfg(feature = "remote-run")]
@@ -90,6 +101,7 @@ impl error::Error for Error {
             Error::Io(ref e) => e.description(),
             Error::ParseFloat(ref e) => e.description(),
             Error::ParseInt(ref e) => e.description(),
+            Error::Regex(ref e) => e.description(),
             Error::StrFromUtf8(ref e) => e.description(),
             Error::StringFromUtf8(ref e) => e.description(),
             #[cfg(feature = "remote-run")]
@@ -124,6 +136,12 @@ impl convert::From<io::Error> for Error {
     }
 }
 
+impl convert::From<regex::Error> for Error {
+    fn from(err: regex::Error) -> Error {
+        Error::Regex(err)
+    }
+}
+
 impl convert::From<str::Utf8Error> for Error {
 	fn from(err: str::Utf8Error) -> Error {
 		Error::StrFromUtf8(err)

src/host/remote.rs

@@ -88,7 +88,7 @@ impl Host {
                 let pk = try!(reply.popstr().unwrap().or(Err(Error::HostResponse)));
                 Ok(ZCert::from_txt(&pk, "0000000000000000000000000000000000000000"))
             },
-            "Err" => Err(Error::Agent(try!(reply.popstr().unwrap().or(Err(Error::HostResponse))))),
+            "Err" => Err(Error::Auth(try!(reply.popstr().unwrap().or(Err(Error::HostResponse))))),
             _ => unreachable!(),
         }
     }

src/package/providers/dnf.rs

@@ -8,8 +8,9 @@
 
 //! Dnf package provider
 
-use {Command, CommandResult, Host};
-use Result;
+use {Command, CommandResult, Host, Telemetry};
+use {Error, Result};
+use regex::Regex;
 use super::*;
 
 pub struct Dnf;
@@ -27,10 +28,16 @@ impl Provider for Dnf {
     }
 
     fn is_installed(&self, host: &mut Host, name: &str) -> Result<bool> {
-        let cmd = Command::new(&format!("dnf list installed | grep {}", name));
+        let cmd = Command::new("dnf list installed");
         let result = try!(cmd.exec(host));
+        if result.exit_code != 0 {
+            return Err(Error::Agent(result.stderr));
+        }
 
-        Ok(result.exit_code == 0)
+        let telemetry = try!(Telemetry::init(host));
+
+        let re = try!(Regex::new(&format!("(?m)^{}\\.({}|noarch)\\s+", name, telemetry.os.arch)));
+        Ok(re.is_match(&result.stdout))
     }
 
     fn install(&self, host: &mut Host, name: &str) -> Result<CommandResult> {

src/package/providers/homebrew.rs

@@ -9,7 +9,8 @@
 //! Homebrew package provider
 
 use {Command, CommandResult, Host};
-use Result;
+use {Error, Result};
+use regex::Regex;
 use super::*;
 
 pub struct Homebrew;
@@ -27,10 +28,14 @@ impl Provider for Homebrew {
     }
 
     fn is_installed(&self, host: &mut Host, name: &str) -> Result<bool> {
-        let cmd = Command::new(&format!("brew list | grep {}", name));
+        let cmd = Command::new("brew list");
         let result = try!(cmd.exec(host));
+        if result.exit_code != 0 {
+            return Err(Error::Agent(result.stderr));
+        }
 
-        Ok(result.exit_code == 0)
+        let re = try!(Regex::new(&format!("(?m)(^|\\s+){}\\s+", name)));
+        Ok(re.is_match(&result.stdout))
     }
 
     fn install(&self, host: &mut Host, name: &str) -> Result<CommandResult> {

src/package/providers/pkg.rs

@@ -27,7 +27,7 @@ impl Provider for Pkg {
     }
 
     fn is_installed(&self, host: &mut Host, name: &str) -> Result<bool> {
-        let cmd = Command::new(&format!("pkg info | grep {}", name));
+        let cmd = Command::new(&format!("pkg query \"%n\" {}", name));
         let result = try!(cmd.exec(host));
 
         Ok(result.exit_code == 0)

src/package/providers/yum.rs

@@ -8,8 +8,9 @@
 
 //! Yum package provider
 
-use {Command, CommandResult, Host};
-use Result;
+use {Command, CommandResult, Host, Telemetry};
+use {Error, Result};
+use regex::Regex;
 use super::*;
 
 pub struct Yum;
@@ -27,10 +28,16 @@ impl Provider for Yum {
     }
 
     fn is_installed(&self, host: &mut Host, name: &str) -> Result<bool> {
-        let cmd = Command::new(&format!("yum list installed | grep {}", name));
+        let cmd = Command::new("yum list installed");
         let result = try!(cmd.exec(host));
+        if result.exit_code != 0 {
+            return Err(Error::Agent(result.stderr));
+        }
 
-        Ok(result.exit_code == 0)
+        let telemetry = try!(Telemetry::init(host));
+
+        let re = try!(Regex::new(&format!("(?m)^{}\\.({}|noarch)\\s+", name, telemetry.os.arch)));
+        Ok(re.is_match(&result.stdout))
     }
 
     fn install(&self, host: &mut Host, name: &str) -> Result<CommandResult> {