Formated and cleaned up code, added some debugging lines, fixed where plugins look for their config

Author: George3d6

agent/agent_plugins/alive/src/lib.rs

@@ -13,8 +13,8 @@ use agent_lib::{current_ts, read_cfg, AgentPlugin};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct Config {
-	enabled:		bool,
-	periodicity: 	i64,
+	enabled:     bool,
+	periodicity: i64
 }
 
 
@@ -26,13 +26,13 @@ pub struct Plugin {
 
 impl Plugin {
 	fn config(&mut self) -> Result<(), String> {
-		let cfg = read_cfg::<Config>("command_runner.yml")?;
+		let cfg = read_cfg::<Config>("alive.yml")?;
 		self.enabled = cfg.enabled;
 		if !self.enabled {
-			return Ok(())
+			return Ok(());
 		}
 		self.periodicity = cfg.periodicity;
-		return Ok(())
+		Ok(())
 	}
 }
 

agent/agent_plugins/command_runner/src/lib.rs

@@ -7,17 +7,17 @@ extern crate serde_json;
 #[macro_use]
 extern crate serde_derive;
 
-use agent_lib::{current_ts, AgentPlugin, read_cfg};
+use agent_lib::{current_ts, read_cfg, AgentPlugin};
 
 use std::collections::HashMap;
 use std::process::Command;
 
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 pub struct Config {
-	enabled: 			bool,
-	periodicity_arr: 	Vec<i64>,
-	commands:			Vec<Vec<String>>
+	enabled:         bool,
+	periodicity_arr: Vec<i64>,
+	commands:        Vec<Vec<String>>
 }
 
 
@@ -34,15 +34,17 @@ impl Plugin {
 		let cfg = read_cfg::<Config>("command_runner.yml")?;
 		plugin.enabled = cfg.enabled;
 		if !plugin.enabled {
-			return Ok(())
+			return Ok(());
 		}
 		plugin.commands = cfg.commands;
 		for i in 0..plugin.commands.len() {
 			let command_name = plugin.commands[i].join(" ");
-			plugin.periodicity_map.insert(command_name.clone(), cfg.periodicity_arr[i]);
+			plugin
+				.periodicity_map
+				.insert(command_name.clone(), cfg.periodicity_arr[i]);
 			plugin.last_call_map.insert(command_name, 0);
 		}
-		return Ok(());
+		Ok(())
 	}
 }
 
@@ -85,9 +87,9 @@ impl AgentPlugin for Plugin {
 			let output = cmd.output().map_err(|e| e.to_string())?;
 
 			let str_output = if output.status.success() {
-				String::from_utf8(output.stdout).map_err(|e| e.to_string())?;
+				String::from_utf8(output.stdout).map_err(|e| e.to_string())?
 			} else {
-				String::from_utf8(output.stderr).map_err(|e| e.to_string())?;
+				String::from_utf8(output.stderr).map_err(|e| e.to_string())?
 			};
 
 			results.insert(command_name, str_output);

agent/agent_plugins/file_checker/src/lib.rs

@@ -4,8 +4,8 @@
 extern crate agent_lib;
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_json;
 extern crate fs_extra;
+extern crate serde_json;
 
 use agent_lib::{current_ts, read_cfg, AgentPlugin};
 use fs_extra::dir::get_size;
@@ -16,10 +16,10 @@ use std::io::{BufRead, BufReader};
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct Config {
-	enabled:		bool,
-	periodicity: 	i64,
-	files:			Vec<String>,
-	keyphrase:			Vec<String>,
+	enabled:     bool,
+	periodicity: i64,
+	files:       Vec<String>,
+	keyphrase:   Vec<String>
 }
 
 
@@ -38,11 +38,11 @@ pub struct Plugin {
 }
 
 impl Plugin {
-	fn config(plugin: &mut Plugin) -> Result<(), String>  {
-		let cfg = read_cfg::<Config>("command_runner.yml")?;
+	fn config(plugin: &mut Plugin) -> Result<(), String> {
+		let cfg = read_cfg::<Config>("file_checker.yml")?;
 		plugin.enabled = cfg.enabled;
 		if !plugin.enabled {
-			return Ok(())
+			return Ok(());
 		}
 		plugin.periodicity = cfg.periodicity;
 

agent/agent_plugins/process_counter/src/lib.rs

@@ -14,9 +14,9 @@ use std::process::Command;
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct Config {
-	enabled:			bool,
-	periodicity_arr: 	Vec<i64>,
-	processes:			Vec<String>,
+	enabled:         bool,
+	periodicity_arr: Vec<i64>,
+	processes:       Vec<String>
 }
 
 
@@ -29,19 +29,16 @@ pub struct Plugin {
 
 impl Plugin {
 	fn config(&mut self) -> Result<(), String> {
-		let cfg = read_cfg::<Config>("command_runner.yml")?;
+		let cfg = read_cfg::<Config>("process_counter.yml")?;
 		self.enabled = cfg.enabled;
 		if !self.enabled {
-			return Ok(())
+			return Ok(());
 		}
-		self.periodicity = cfg.periodicity;
-
 		self.processes = cfg.processes;
 
-
-
 		for i in 0..self.processes.len() {
-			self.periodicity_map.insert(self.processes[i].clone(), cfg.periodicity_arr[i]);
+			self.periodicity_map
+				.insert(self.processes[i].clone(), cfg.periodicity_arr[i]);
 			self.last_call_map.insert(self.processes[i].clone(), 0);
 		}
 		return Ok(())
@@ -56,7 +53,7 @@ pub fn new() -> Result<Plugin, String> {
 		processes:       Vec::new()
 	};
 
-	Plugin::config(&mut new_plugin);
+	Plugin::config(&mut new_plugin)?;
 
 	if new_plugin.enabled {
 		Ok(new_plugin)

agent/agent_plugins/system_monitor/src/lib.rs

@@ -11,8 +11,8 @@ use std::collections::HashMap;
 
 #[derive(Debug, PartialEq, Serialize, Deserialize)]
 struct Config {
-	enabled:		bool,
-	periodicity: 	i64,
+	enabled:     bool,
+	periodicity: i64
 }
 
 
@@ -35,10 +35,10 @@ pub struct Plugin {
 
 impl Plugin {
 	fn config(&mut self) -> Result<(), String> {
-		let cfg = read_cfg::<Config>("command_runner.yml")?;
+		let cfg = read_cfg::<Config>("system_monitor.yml")?;
 		self.enabled = cfg.enabled;
 		if !self.enabled {
-			return Ok(())
+			return Ok(());
 		}
 		self.periodicity = cfg.periodicity;
 		return Ok(())

agent/plugins/src/plugin_initialization.rs

@@ -7,7 +7,7 @@ macro_rules! plugins {
             $(
                 match $x::new() {
                     Ok(x) => {info!("{} successfully loaded", x.name()); v.push(Box::new(x)) }
-                    Err(x) => {error!("{}", x)}
+                    Err(err) => {error!("Plugin: {}, error: {}", stringify!($x), err)}
                 }
             )*
             v

receptor/plugins/src/plugin_initialization.rs

@@ -7,7 +7,7 @@ macro_rules! plugins {
             $(
                 match $x::new() {
                     Ok(x) => {info!("{} successfully loaded", x.name()); v.push(Box::new(x)) }
-                    Err(err) => {error!("{}", err)}
+                    Err(err) => {error!("Plugin: {}, error: {}", stringify!($x), err)}
                 }
             )*
             v

receptor/receptor_lib/src/utils.rs

@@ -3,14 +3,10 @@ extern crate hyper;
 extern crate url;
 extern crate yaml_rust;
 
-use self::fs_extra::file::read_to_string;
 use self::hyper::server::Request;
 use self::url::Url;
-use self::yaml_rust::{Yaml, YamlLoader};
 
 use std::collections::HashMap;
-use std::env::current_exe;
-use std::time::{SystemTime, UNIX_EPOCH};
 
 pub fn get_url_params(req: &Request) -> HashMap<String, String> {
 	let parsed_url = Url::parse(&format!("http://badhyper.io/{}", req.uri().as_ref())).unwrap();

receptor/receptor_plugins/sync_check/src/lib.rs

@@ -25,7 +25,7 @@ pub struct Plugin {
 
 impl Plugin {
 	fn config(&mut self) -> Result<(), String> {
-		let cfg = read_cfg::<Config>("command_runner.yml")?;
+		let cfg = read_cfg::<Config>("sync_check.yml")?;
 		self.enabled = cfg.enabled;
 		if !self.enabled {
 			return Ok(());

receptor/src/database.rs

@@ -48,7 +48,5 @@ pub fn initialize_database() {
 }
 
 pub fn get_connection() -> Connection {
-	let conn = Connection::open("database.sqlite").expect("Can't open database connection");
-
-	conn
+	Connection::open("database.sqlite").expect("Can't open database connection")
 }

receptor/src/main.rs

@@ -5,20 +5,12 @@ extern crate fs_extra;
 extern crate futures;
 extern crate hyper;
 extern crate hyper_staticfile;
-
 #[macro_use]
-
 extern crate log;
-
 extern crate plugins;
 extern crate receptor_lib;
 extern crate rusqlite;
-extern crate serde_derive;
-
-#[macro_use]
-
 extern crate serde_json;
-
 extern crate tokio;
 extern crate tokio_core;
 
@@ -131,7 +123,7 @@ impl Service for DataServer {
 				}
 
 				_ => response.set_status(StatusCode::NotFound)
-			}
+			};
 
 			Box::new(futures::future::ok(response))
 		} else if req.path() == "/plugin_list" {
@@ -177,7 +169,7 @@ fn proces_status(stream: TcpStream, db_conn: Connection) {
 	let (reader, _) = stream.split();
 
 	let conn = tokio::io::read_to_end(reader, Vec::new()).then(move |res| {
-		let payload = Vec::from(res.expect("Can't read input from agent").1);
+		let payload = res.expect("Can't read input from agent").1;
 
 		let statuses: Vec<Status> = serde_json::from_slice(&payload).expect("Can't deserialize status");
 
@@ -315,7 +307,7 @@ fn main() {
 		let handler = handle.clone();
 
 		let handleds = handle.clone();
-
+		debug!("Serving web_UI from: {}", format!("{}{}", root.to_str().unwrap(), "/web_ui/"));
 		let serve = Http::new()
 			.serve_addr_handle(&server_addr, &handle, move || {
 				Ok(DataServer {
@@ -328,6 +320,7 @@ fn main() {
 			})
 			.expect("Can't start HTTP server");
 
+		debug!("Spawning server !");
 		handler.spawn(
 			serve
 				.for_each(move |conn| {

shared_lib/src/lib.rs

@@ -52,6 +52,7 @@ pub fn get_yml_config_string(name: &str) -> Result<String, String> {
     let mut cfg_file_path = current_exe().unwrap();
     cfg_file_path.pop();
     cfg_file_path.push(name);
+    println!("{:?}", cfg_file_path);
     return Ok(read_to_string(&cfg_file_path).map_err(|e| e.to_string())?)
 }