Merge pull request #37 from rushmorem/nixos-target

Add NixOS target

Author: petehayes102

Cargo.toml

@@ -32,6 +32,7 @@ zdaemon = "0.0.2"
 zfilexfer = "0.0.2"
 hostname = "0.1"
 czmq = { version = "0.1", optional = true }
+pnet = "0.16"
 
 [lib]
 name = "inapi"

src/host/data/macros.rs

@@ -51,13 +51,13 @@ want_macro!("Object", wantobj, is_object, as_object);
 //             ($v:expr) => (if $v.$isf() {
 //                 Ok($v.$asf().unwrap())
 //             } else {
-//                 Err($crate::error::Error::Generic(format!("Value is not $t")))
+//                 Err($crate::Error::Generic(format!("Value is not $t")))
 //             });
 //
 //             ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
 //                 $n!(v)
 //             } else {
-//                 Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+//                 Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
 //             });
 //         }
 //     }
@@ -79,13 +79,13 @@ macro_rules! neednull {
     ($v:expr) => (if $v.is_null() {
         Ok($v.as_null().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not null")))
+        Err($crate::Error::Generic(format!("Value is not null")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         neednull!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }
 
@@ -96,13 +96,13 @@ macro_rules! needbool {
     ($v:expr) => (if $v.is_boolean() {
         Ok($v.as_bool().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not boolean")))
+        Err($crate::Error::Generic(format!("Value is not boolean")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         needbool!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }
 
@@ -113,13 +113,13 @@ macro_rules! needi64 {
     ($v:expr) => (if $v.is_i64() {
         Ok($v.as_i64().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not i64")))
+        Err($crate::Error::Generic(format!("Value is not i64")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         needi64!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }
 
@@ -130,13 +130,13 @@ macro_rules! needu64 {
     ($v:expr) => (if $v.is_u64() {
         Ok($v.as_u64().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not u64")))
+        Err($crate::Error::Generic(format!("Value is not u64")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         needu64!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }
 
@@ -147,13 +147,13 @@ macro_rules! needf64 {
     ($v:expr) => (if $v.is_f64() {
         Ok($v.as_f64().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not f64")))
+        Err($crate::Error::Generic(format!("Value is not f64")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         needf64!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }
 
@@ -164,13 +164,13 @@ macro_rules! needstr {
     ($v:expr) => (if $v.is_string() {
         Ok($v.as_str().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not string")))
+        Err($crate::Error::Generic(format!("Value is not string")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         needstr!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }
 
@@ -181,13 +181,13 @@ macro_rules! needarray {
     ($v:expr) => (if $v.is_array() {
         Ok($v.as_array().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not array")))
+        Err($crate::Error::Generic(format!("Value is not array")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         needarray!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }
 
@@ -198,12 +198,12 @@ macro_rules! needobj {
     ($v:expr) => (if $v.is_object() {
         Ok($v.as_object().unwrap())
     } else {
-        Err($crate::error::Error::Generic(format!("Value is not object")))
+        Err($crate::Error::Generic(format!("Value is not object")))
     });
 
     ($v:expr => $p:expr) => (if let Some(v) = $v.pointer($p) {
         needobj!(v)
     } else {
-        Err($crate::error::Error::Generic(format!("Could not find {} in data", $p)))
+        Err($crate::Error::Generic(format!("Could not find {} in data", $p)))
     });
 }

src/host/telemetry.rs

@@ -12,6 +12,7 @@ use host::Host;
 use serde_json::Map;
 use serde_json::Value;
 use target::Target;
+#[cfg(feature = "local-run")]
 
 #[cfg(feature = "local-run")]
 #[derive(Debug, RustcEncodable)]
@@ -80,25 +81,15 @@ impl Telemetry {
         let mut net = Vec::new();
         for netif in self.net {
             let mut map: Map<String, Value> = Map::new();
-            map.insert("interface".into(), json!(netif.interface));
-            map.insert("mac".into(), json!(netif.mac));
-            if let Some(inet) = netif.inet {
-                let mut map1: Map<String, Value> = Map::new();
-                map1.insert("address".into(), json!(inet.address));
-                map1.insert("netmask".into(), json!(inet.netmask));
-                map.insert("inet".into(), json!(map1));
-            }
-            if let Some(inet6) = netif.inet6 {
-                let mut map1: Map<String, Value> = Map::new();
-                map1.insert("address".into(), json!(inet6.address));
-                map1.insert("prefixlen".into(), json!(inet6.prefixlen));
-                map1.insert("scopeid".into(), json!(inet6.scopeid));
-                map.insert("inet6".into(), json!(map1));
+            map.insert("name".into(), json!(netif.name));
+            map.insert("index".into(), json!(netif.index));
+            if let Some(mac) = netif.mac {
+                map.insert("mac".into(), json!(mac));
             }
-            if let Some(status) = netif.status {
-                let status = if status == NetifStatus::Active { "Active".to_string() } else { "Inactive".to_string() };
-                map.insert("status".into(), json!(status));
+            if let Some(ips) = netif.ips {
+                map.insert("ips".into(), json!(ips));
             }
+            map.insert("flags".into(), json!(netif.flags));
             net.push(map);
         }
 
@@ -159,33 +150,11 @@ pub struct FsMount {
 #[cfg(feature = "local-run")]
 #[derive(Debug, RustcEncodable)]
 pub struct Netif {
-    pub interface: String,
+    pub name: String,
+    pub index: u32,
     pub mac: Option<String>,
-    pub inet: Option<NetifIPv4>,
-    pub inet6: Option<NetifIPv6>,
-    pub status: Option<NetifStatus>,
-}
-
-#[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable, PartialEq)]
-pub enum NetifStatus {
-    Active,
-    Inactive,
-}
-
-#[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable)]
-pub struct NetifIPv4 {
-    pub address: String,
-    pub netmask: String,
-}
-
-#[cfg(feature = "local-run")]
-#[derive(Debug, RustcEncodable)]
-pub struct NetifIPv6 {
-    pub address: String,
-    pub prefixlen: u8,
-    pub scopeid: Option<String>,
+    pub ips: Option<Vec<String>>,
+    pub flags: u32,
 }
 
 #[cfg(feature = "local-run")]

src/lib.rs

@@ -26,6 +26,7 @@
 
 #[cfg(feature = "remote-run")]
 extern crate czmq;
+#[cfg(not(feature = "local-run"))]
 #[macro_use]
 extern crate lazy_static;
 extern crate libc;
@@ -41,6 +42,7 @@ extern crate tempfile;
 extern crate zdaemon;
 extern crate zfilexfer;
 extern crate hostname;
+extern crate pnet;
 
 #[macro_use]
 mod ffi_helpers;
@@ -68,7 +70,7 @@ pub use host::{Host, ffi as host_ffi};
 pub use host::data::open as data_open;
 pub use mustache::{MapBuilder, VecBuilder};
 pub use package::{Package, ffi as package_ffi};
-pub use package::providers::Providers;
+pub use package::providers::{Providers, ProviderFactory};
 #[cfg(feature = "remote-run")]
 pub use payload::{Payload, ffi as payload_ffi};
 #[cfg(feature = "remote-run")]

src/package/providers/mod.rs

@@ -13,6 +13,7 @@ pub mod macports;
 pub mod pkg;
 pub mod ports;
 pub mod yum;
+pub mod nix;
 
 use command::CommandResult;
 use error::{Error, Result};
@@ -32,6 +33,7 @@ pub enum Providers {
     Pkg,
     Ports,
     Yum,
+    Nix,
 }
 
 impl ToString for Providers {
@@ -44,6 +46,7 @@ impl ToString for Providers {
             &Providers::Pkg => "Pkg".to_string(),
             &Providers::Ports => "Ports".to_string(),
             &Providers::Yum => "Yum".to_string(),
+            &Providers::Nix => "Nix".to_string(),
         }
     }
 }
@@ -58,6 +61,7 @@ impl convert::From<String> for Providers {
             "Pkg" => Providers::Pkg,
             "Ports" => Providers::Ports,
             "Yum" => Providers::Yum,
+            "Nix" => Providers::Nix,
             _ => panic!("Invalid provider"),
         }
     }
@@ -91,6 +95,7 @@ impl ProviderFactory {
             Providers::Pkg => Box::new(pkg::Pkg),
             Providers::Ports => Box::new(ports::Ports),
             Providers::Yum => Box::new(yum::Yum),
+            Providers::Nix => Box::new(nix::Nix),
         }
     }
 }

src/package/providers/nix.rs

@@ -0,0 +1,50 @@
+// Copyright 2015-2017 Intecture Developers. See the COPYRIGHT file at the
+// top-level directory of this distribution and at
+// https://intecture.io/COPYRIGHT.
+//
+// Licensed under the Mozilla Public License 2.0 <LICENSE or
+// https://www.tldrlegal.com/l/mpl-2.0>. This file may not be copied,
+// modified, or distributed except according to those terms.
+
+//! Nix package provider
+
+use command::{Command, CommandResult};
+use error::Result;
+use host::Host;
+use super::*;
+
+pub struct Nix;
+
+impl Provider for Nix {
+    fn get_providers(&self) -> Providers {
+        Providers::Nix
+    }
+
+    fn is_active(&self, host: &mut Host) -> Result<bool> {
+        let cmd = Command::new("which nix-env");
+        let result = try!(cmd.exec(host));
+
+        Ok(result.exit_code == 0)
+    }
+
+    fn is_installed(&self, host: &mut Host, name: &str) -> Result<bool> {
+        let cmd = Command::new(&format!("nix-env --install --dry-run {}", name));
+        let result = try!(cmd.exec(host));
+
+        if result.exit_code != 0 {
+            return Err(Error::Agent(result.stderr));
+        }
+
+        Ok(!result.stderr.contains("these paths will be fetched"))
+    }
+
+    fn install(&self, host: &mut Host, name: &str) -> Result<CommandResult> {
+        let cmd = Command::new(&format!("nix-env --install {}", name));
+        cmd.exec(host)
+    }
+
+    fn uninstall(&self, host: &mut Host, name: &str) -> Result<CommandResult> {
+        let cmd = Command::new(&format!("nix-env --uninstall {}", name));
+        cmd.exec(host)
+    }
+}

src/target/centos.rs

@@ -181,7 +181,7 @@ impl TelemetryTarget for CentosTarget {
             try!(default::fs()),
             &hostname,
             try!(linux::memory()),
-            try!(linux::net()),
+            default::net(),
             Os::new(
                 env::consts::ARCH,
                 "redhat",

src/target/debian.rs

@@ -182,7 +182,7 @@ impl TelemetryTarget for DebianTarget {
             try!(default::fs()),
             &hostname,
             try!(linux::memory()),
-            try!(linux::net()),
+            default::net(),
             Os::new(env::consts::ARCH, "debian", "debian", &version_str, version_maj, version_min, 0), // No known patch version
         );