Switched config file path to PathBuf.

Closes George3d6#44. 

Will likely need another cargo fmt. Rustfmt bug preventing me from running again.

Author: Deedasmi

agent/agent_plugins/alive/src/lib.rs

@@ -22,17 +22,17 @@ struct Config {
 pub struct Plugin {
 	last_call_ts: i64,
 	periodicity:  i64,
-	enabled:      bool,
+	enabled:      bool
 }
 
 pub fn new(mut cfg_path: PathBuf) -> Result<Plugin, String> {
 	cfg_path.push("alive.yml");
-	let cfg = read_cfg::<Config>(cfg_path)?;
+	let cfg = read_cfg::<Config>(&cfg_path)?;
 	if cfg.enabled {
 		Ok(Plugin {
-			enabled: true,
+			enabled:      true,
 			last_call_ts: 0,
-			periodicity: cfg.periodicity,
+			periodicity:  cfg.periodicity
 		})
 	} else {
 		Err("Alive plugin disabled".into())

agent/agent_plugins/command_runner/src/lib.rs

@@ -10,8 +10,8 @@ extern crate serde_derive;
 use inquisitor_lib::{current_ts, read_cfg, AgentPlugin};
 
 use std::collections::HashMap;
-use std::process::Command;
 use std::path::PathBuf;
+use std::process::Command;
 
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
@@ -26,21 +26,20 @@ pub struct Plugin {
 	last_call_map:   HashMap<String, i64>,
 	periodicity_map: HashMap<String, i64>,
 	commands:        Vec<Vec<String>>,
-	enabled:         bool,
-	cfg_file:        PathBuf
+	enabled:         bool
 }
 
 pub fn new(mut cfg_path: PathBuf) -> Result<Plugin, String> {
-	let cfg = read_cfg::<Config>(cfg_file)?;
+	cfg_path.push("command_runner.yml");
+	let cfg = read_cfg::<Config>(&cfg_path)?;
 	if !cfg.enabled {
 		return Err("Command runner disabled".into());
 	}
 	let mut new_plugin = Plugin {
-		enabled: cfg.enabled,
-		last_call_map: HashMap::new(),
+		enabled:         cfg.enabled,
+		last_call_map:   HashMap::new(),
 		periodicity_map: HashMap::new(),
-		commands: cfg.commands,
-		cfg_file
+		commands:        cfg.commands
 	};
 	for i in 0..new_plugin.commands.len() {
 		let command_name = new_plugin.commands[i].join(" ");

agent/agent_plugins/file_checker/src/lib.rs

@@ -7,11 +7,12 @@ extern crate serde_derive;
 extern crate fs_extra;
 extern crate serde_json;
 
-use inquisitor_lib::{current_ts, read_cfg, AgentPlugin};
 use fs_extra::dir::get_size;
+use inquisitor_lib::{current_ts, read_cfg, AgentPlugin};
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufRead, BufReader};
+use std::path::PathBuf;
 
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
@@ -29,27 +30,24 @@ struct FileInfo {
 	look_for:  String
 }
 
-
 pub struct Plugin {
 	last_call_ts:  i64,
 	periodicity:   i64,
 	file_info_map: HashMap<String, FileInfo>,
-	enabled:       bool,
-	cfg_file:      String
+	enabled:       bool
 }
 
-pub fn new(cfg_dir: String) -> Result<Plugin, String> {
-	let cfg_file = format!("{}/file_checker.yml", cfg_dir);
-	let cfg = read_cfg::<Config>(cfg_file.clone())?;
+pub fn new(mut cfg_path: PathBuf) -> Result<Plugin, String> {
+	cfg_path.push("file_checker.yml");
+	let cfg = read_cfg::<Config>(&cfg_path)?;
 	if !cfg.enabled {
 		return Err("File checker disabled".into());
 	}
 	let mut plugin = Plugin {
 		enabled:       true,
 		last_call_ts:  0,
 		periodicity:   cfg.periodicity,
-		file_info_map: HashMap::new(),
-		cfg_file:      cfg_file.clone()
+		file_info_map: HashMap::new()
 	};
 
 	for i in 0..cfg.files.len() {

agent/agent_plugins/process_counter/src/lib.rs

@@ -9,9 +9,9 @@ extern crate serde_derive;
 
 use inquisitor_lib::{current_ts, read_cfg, AgentPlugin};
 use std::collections::HashMap;
+use std::path::PathBuf;
 use std::process::Command;
 
-
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct Config {
 	enabled:         bool,
@@ -24,43 +24,26 @@ pub struct Plugin {
 	last_call_map:   HashMap<String, i64>,
 	periodicity_map: HashMap<String, i64>,
 	processes:       Vec<String>,
-	enabled:         bool,
-	cfg_file:        String
+	enabled:         bool
 }
 
-impl Plugin {
-	fn config(&mut self) -> Result<(), String> {
-		let cfg = read_cfg::<Config>(self.cfg_file.clone())?;
-		self.enabled = cfg.enabled;
-		if !self.enabled {
-			return Ok(());
-		}
-		self.processes = cfg.processes;
-
-		for i in 0..self.processes.len() {
-			self.periodicity_map
-				.insert(self.processes[i].clone(), cfg.periodicity_arr[i]);
-			self.last_call_map.insert(self.processes[i].clone(), 0);
+pub fn new(mut cfg_path: PathBuf) -> Result<Plugin, String> {
+	cfg_path.push("process_counter.yml");
+	let cfg = read_cfg::<Config>(&cfg_path)?;
+	if cfg.enabled {
+		let mut plugin = Plugin {
+			enabled:         true,
+			last_call_map:   HashMap::new(),
+			periodicity_map: HashMap::new(),
+			processes:       cfg.processes
+		};
+		for i in 0..plugin.processes.len() {
+			plugin
+				.periodicity_map
+				.insert(plugin.processes[i].clone(), cfg.periodicity_arr[i]);
+			plugin.last_call_map.insert(plugin.processes[i].clone(), 0);
 		}
-		Ok(())
-	}
-}
-
-pub fn new(cfg_dir: String) -> Result<Plugin, String> {
-	let cfg_file = format!("{}/process_counter.yml", cfg_dir);
-
-	let mut new_plugin = Plugin {
-		enabled: false,
-		last_call_map: HashMap::new(),
-		periodicity_map: HashMap::new(),
-		processes: Vec::new(),
-		cfg_file
-	};
-
-	new_plugin.config()?;
-
-	if new_plugin.enabled {
-		Ok(new_plugin)
+		Ok(plugin)
 	} else {
 		Err("Process counter disabled".into())
 	}

agent/agent_plugins/system_monitor/src/lib.rs

@@ -6,6 +6,7 @@ extern crate sysinfo;
 
 use inquisitor_lib::{current_ts, read_cfg, AgentPlugin};
 use std::collections::HashMap;
+use std::path::PathBuf;
 use sysinfo::{DiskExt, NetworkExt, ProcessorExt, System, SystemExt};
 
 
@@ -30,35 +31,20 @@ pub struct Plugin {
 	sys:          System,
 	last_call_ts: i64,
 	periodicity:  i64,
-	enabled:      bool,
-	cfg_file:     String
+	enabled:      bool
 }
 
-impl Plugin {
-	fn config(&mut self) -> Result<(), String> {
-		let cfg = read_cfg::<Config>(self.cfg_file.clone())?;
-		self.enabled = cfg.enabled;
-		if self.enabled {
-			self.periodicity = cfg.periodicity;
-		}
-		Ok(())
-	}
-}
-
-pub fn new(cfg_dir: String) -> Result<Plugin, String> {
-	let cfg_file = format!("{}/system_monitor.yml", cfg_dir);
-	let mut new_plugin = Plugin {
-		enabled: false,
-		sys: System::new(),
-		last_call_ts: 0,
-		periodicity: 0,
-		cfg_file
-	};
-
-	new_plugin.config()?;
-
-	if new_plugin.enabled {
-		Ok(new_plugin)
+pub fn new(mut cfg_path: PathBuf) -> Result<Plugin, String> {
+	cfg_path.push("system_monitor.yml");
+	let cfg = read_cfg::<Config>(&cfg_path)?;
+	if cfg.enabled {
+		let plugin = Plugin {
+			enabled:      true,
+			sys:          System::new(),
+			last_call_ts: 0,
+			periodicity:  cfg.periodicity
+		};
+		Ok(plugin)
 	} else {
 		Err("System monitor disabled".into())
 	}

agent/plugins/Cargo.toml

@@ -10,10 +10,10 @@ path = "src/lib.rs"
 
 [dependencies]
 alive = {path = "../agent_plugins/alive"}
-#file_checker = {path = "../agent_plugins/file_checker"}
-#process_counter = {path = "../agent_plugins/process_counter"}
-#system_monitor = {path = "../agent_plugins/system_monitor"}
-#command_runner = {path = "../agent_plugins/command_runner"}
+file_checker = {path = "../agent_plugins/file_checker"}
+process_counter = {path = "../agent_plugins/process_counter"}
+system_monitor = {path = "../agent_plugins/system_monitor"}
+command_runner = {path = "../agent_plugins/command_runner"}
 
 inquisitor_lib = {path = "../../inquisitor_lib"}
 log = "0.4.1"

agent/src/main.rs

@@ -10,14 +10,14 @@ extern crate serde_json;
 extern crate serde_derive;
 extern crate tokio;
 
+use clap::{App, Arg};
 use inquisitor_lib::{current_ts, read_cfg, AgentPlugin, Status};
+use std::env::current_exe;
 use std::net::SocketAddr;
+use std::path::PathBuf;
 use std::{thread, time};
 use tokio::net::TcpStream;
 use tokio::prelude::Future;
-use clap::{App, Arg};
-use std::env::current_exe;
-use std::path::PathBuf;
 
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
@@ -28,8 +28,8 @@ struct ReceptorAddr {
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct Config {
-	machine_identifier:	Option<String>,
-	receptor:			ReceptorAddr
+	machine_identifier: Option<String>,
+	receptor:           ReceptorAddr
 }
 
 
@@ -62,18 +62,15 @@ fn main() {
 	let mut agent_config = config_dir.clone();
 	agent_config.push("agent_config.yml");
 
-	let config = read_cfg::<Config>(format!("{}/{}", config_dir, "agent_config.yml")).unwrap();
+	let config = read_cfg::<Config>(&agent_config).unwrap();
 
 	let mut plugins = plugins::init(config_dir);
 
-	let hostname = config.machine_identifier
+	let hostname = config
+		.machine_identifier
 		.unwrap_or_else(|| hostname::get_hostname().unwrap());
 
-	let addr = format!(
-		"{}:{}",
-		config.receptor.host,
-		config.receptor.port
-	);
+	let addr = format!("{}:{}", config.receptor.host, config.receptor.port);
 
 	let mut sender = StatusSender::new(hostname, addr.parse().expect("Couldn't convert IP address"));
 

inquisitor_lib/Cargo.toml

@@ -8,7 +8,6 @@ serde = "1.0.37"
 serde_derive = "1.0.37"
 serde_yaml = "0.7.3"
 fs_extra = "1.1.0"
-yaml-rust = "0.4.0"
 url= "1.7.0"
 log = "0.4.1"
 env_logger = "0.5.6"

inquisitor_lib/src/lib.rs

@@ -2,15 +2,13 @@
 extern crate serde_derive;
 extern crate serde;
 extern crate serde_yaml;
-extern crate yaml_rust;
 #[macro_use]
 extern crate log;
 extern crate env_logger;
 extern crate hyper;
 extern crate rusqlite;
 extern crate url;
 
-use self::yaml_rust::{Yaml, YamlLoader};
 extern crate fs_extra;
 use self::fs_extra::file::read_to_string;
 use self::hyper::server::Request;
@@ -37,7 +35,7 @@ pub fn current_ts() -> i64 {
 		.as_secs() as i64
 }
 
-pub fn read_cfg<ConfigT>(cfg_file_path: String) -> Result<ConfigT, String>
+pub fn read_cfg<ConfigT>(cfg_file_path: &PathBuf) -> Result<ConfigT, String>
 where
 	ConfigT: DeserializeOwned
 {

receptor/plugins/src/plugin_initialization.rs

@@ -2,7 +2,7 @@ macro_rules! plugins {
     ( $( $x:ident ),* ) => {
         $(extern crate $x;)*
 
-        pub fn init(config_dir: String) -> Vec<Box<ReceptorPlugin>> {
+        pub fn init(config_dir: std::path::PathBuf) -> Vec<Box<ReceptorPlugin>> {
             let mut v: Vec<Box<ReceptorPlugin>> = vec!();
             $(
                 match $x::new(config_dir.clone()) {

receptor/receptor_plugins/comparator/src/lib.rs

@@ -10,6 +10,7 @@ extern crate env_logger;
 use inquisitor_lib::{current_ts, read_cfg, ReceptorPlugin};
 use rusqlite::Connection;
 use std::collections::HashMap;
+use std::path::PathBuf;
 
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
@@ -27,12 +28,12 @@ pub struct Plugin {
 	enabled:      bool,
 	checks:       Vec<Vec<String>>,
 	keys:         Vec<Vec<String>>,
-	cfg_file:     String
+	cfg_path:     PathBuf
 }
 
 impl Plugin {
 	fn config(&mut self) -> Result<(), String> {
-		let cfg = read_cfg::<Config>(self.cfg_file.clone())?;
+		let cfg = read_cfg::<Config>(&self.cfg_path)?;
 		self.enabled = cfg.enabled;
 		if !self.enabled {
 			return Ok(());
@@ -48,14 +49,15 @@ impl Plugin {
 	}
 }
 
-pub fn new(cfg_dir: String) -> Result<Plugin, String> {
+pub fn new(mut cfg_path: PathBuf) -> Result<Plugin, String> {
+	cfg_path.push("comparator.yml");
 	let mut new_plugin = Plugin {
-		enabled:      true,
+		enabled:      false,
 		last_call_ts: current_ts(),
 		periodicity:  0,
 		keys:         vec![],
 		checks:       vec![],
-		cfg_file:     format!("{}/comparator.yml", cfg_dir)
+		cfg_path
 	};
 
 	new_plugin.config()?;