Multiple changes and fixes

- add chmod +x and systemctl restart to deploy script
- change the wording of some messages
- overhaul the eventhandler

Cargo.lock

@@ -1376,7 +1376,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "sms-gateway"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "actix-rt",
  "actix-web",

Cargo.toml

@@ -2,7 +2,7 @@
 name = "sms-gateway"
 description = "A http frontend for SMS Server Tools 3"
 authors = ["David Huss <david.huss@hfbk-hamburg.de>"]
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

build_and_deploy.sh

@@ -34,6 +34,8 @@ function build_and_deploy {
 	echo --------------------------------------------------
 	echo "Deploying Binary $1 to Host $TARGET_HOST:$TARGET_PATH$1";
 	rsync ${SOURCE_PATH}$1 $TARGET_HOST:$TARGET_PATH$1
+	# chmod +x the binary
+	ssh -p ${TARGET_PORT} -t ${TARGET_HOST} "chmod +x $TARGET_PATH$1"
 	echo
 }
 
@@ -45,6 +47,6 @@ do
 done
 
 # Finally restart the service
-# ssh -p ${TARGET_PORT} -t ${TARGET_HOST} ${TARGET_PATH}$1
+ssh -p ${TARGET_PORT} -t ${TARGET_HOST} "systemctl restart sms-gateway"
 
 echo "done"
\ No newline at end of file

examples/sms-gateway.service

 [Unit]
 Description=sms-gateway web-frontend
 DefaultDependencies=no
-After=network.target
+After=network.target smstools.target
 
 [Service]
 Type=simple

src/bin/eventhandler.rs

 use std::process::exit;
 use std::env::args;
 use std::collections::HashMap;
+use std::path::PathBuf;
 
 use reqwest;
 pub use log::{info, warn, debug, error};
@@ -16,15 +17,24 @@ const BINARY_NAME: &str = env!("CARGO_BIN_NAME");
 
 
 
+fn help() {
+    info!("Error: Insufficient number of arguments! Expected two or three arguments.");
+    exit(1);
+}
+
+
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     info!("Started {} {}", PACKAGE_NAME, BINARY_NAME);
-    if args().len() != 3 {
-        error!("Error: Insufficient number of arguments! Expected two arguments.");
-        exit(1);
-    }
-    let kind = args().nth(1).unwrap().to_ascii_lowercase();
-    let content = args().nth(2).unwrap();
+
+    let args: Vec<String> = args().collect();
+
+    match args.len() {
+        2 | 3 => {
+            let kind = args[0].to_ascii_lowercase();
+            let path = PathBuf::from(&args[1]);
+
+            let content = std::fs::read_to_string(&path)?;
 
             match &kind[..] {
                 "received" => {
@@ -63,4 +73,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             }
 
             Ok(())
+        },
+        _ => {
+            error!("Error: Insufficient number of arguments! Expected two or three arguments.");
+            help();
+            Ok(())
+        }
+    }
 }
\ No newline at end of file

src/errors.rs

@@ -19,9 +19,9 @@ pub enum SmsError {
   UnknownEventKind(String),
   #[error("Failed to deserialize SMS from string: '{0}'")]
   DeserializationError(String),
-  #[error("The provided number '{0}' was not in the whitelist")]
+  #[error("The provided number '{0}' was not on the whitelist")]
   NotInWhiteList(String),
-  #[error("The provided number '{0}' was on the blacklist")]
+  #[error("The provided number '{0}' as it matched at least one entry of the blacklist")]
   InBlackList(String),
 }
 

src/sms.rs

@@ -116,7 +116,7 @@ impl Sms {
 
             // If this is the case, return an Error
             if in_blacklist {
-                warn!("Refused to send SMS to \"{}\" as it was blacklisted", self.number);
+                warn!("Refused to send SMS to \"{}\" as it matched at least one entry of the blacklist", self.number);
                 return Err(SmsError::InBlackList(self.number.clone()));
             }
         }