X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=src%2Fmain.rs;h=b86ce5762185ed4e6c7683037f2b692f9620cf7d;hb=b1f2c5b803a7e85a3b0c8d999cf9a13d28c6c6c2;hp=09965c1b22226fb2884ba16732cfeff00b48a5d0;hpb=c0942504c4cf480ccea96bfcf9ed6c731f49b852;p=rup.git

diff --git a/src/main.rs b/src/main.rs
index 09965c1..b86ce57 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,6 +7,7 @@ use actix_files as fs;
 use actix_web::{web, middleware, App, HttpServer, HttpResponse, Responder, Result, web::Query};
 use askama::Template;
 
+use std::io::prelude::*;
 use ron::de::from_reader;
 use serde::Deserialize;
 use std::{fs::File, env::args};
@@ -61,21 +62,49 @@ fn get_exe_name() -> String {
 
 fn print_usage() {
     println!("Usage:");
-    println!(" {} [--help] [--encrypt <message>]", get_exe_name());
+    println!(" {} [--help] [--encrypt <plain-text>|--decrypt <cipher-text>]", get_exe_name());
+}
+
+fn read_key() -> String {
+    let mut key = String::new();
+    File::open(consts::FILE_KEY)
+        .expect(&format!("Failed to open key file: {}", consts::FILE_KEY))
+        .read_to_string(&mut key)
+        .expect(&format!("Failed to read key file: {}", consts::FILE_KEY));
+
+    String::from(
+        url::percent_encoding::percent_decode(key.as_bytes())
+            .decode_utf8()
+            .expect(&format!("Failed to decode key file: {}", consts::FILE_KEY))
+    )
 }
 
 fn main() -> std::io::Result<()> {
     let args: Vec<String> = args().collect();
 
+    let key = read_key();
+
     if args.iter().any(|arg| arg == "--help") {
         print_usage();
         return Ok(());
     } else if let Some((position_arg_encrypt, _)) = args.iter().find_position(|arg| arg == &"--encrypt") {
         match args.iter().nth(position_arg_encrypt + 1) {
             Some(mess_to_encrypt) => {
-                let encrypted_mess = mess_to_encrypt;
-                //let encrypted_mess = crypto::encrypt(key: &str, plain_text: &str);
-                println!("Encrypted message: {}", encrypted_mess);
+
+                let encrypted_mess = crypto::encrypt(&key, mess_to_encrypt);
+                let encrypted_mess_encoded = url::percent_encoding::utf8_percent_encode(&encrypted_mess, url::percent_encoding::DEFAULT_ENCODE_SET).to_string();
+                println!("Encrypted message percent-encoded: {}", encrypted_mess_encoded);
+            }
+            None => print_usage()
+        }
+
+        return Ok(());
+    } else if let Some((position_arg_decrypt, _)) = args.iter().find_position(|arg| arg == &"--decrypt") {
+        match args.iter().nth(position_arg_decrypt + 1) {
+            Some(cipher_text) => {
+                let cipher_text_decoded = url::percent_encoding::percent_decode(cipher_text.as_bytes()).decode_utf8().expect("Unable to decode encoded cipher text");
+                let plain_text = crypto::decrypt(&key, &cipher_text_decoded).unwrap();
+                println!("Decrypted message: {}", plain_text);
             }
             None => print_usage()
         }
@@ -93,8 +122,6 @@ fn main() -> std::io::Result<()> {
         }
     };
 
-    let key = File::open(consts::FILE_KEY).expect(&format!("Failed to open key file: {}", consts::FILE_KEY));
-
     println!("Configuration: {:?}", config);
 
     let mut listenfd = ListenFd::from_env();