X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=src%2Fmain.rs;h=15b9c025f67bb86acb9d93be0d2b1e89c0272c07;hb=331dddcaef970033db01dc9d239818417ed2e750;hp=24802605367181b20bd90def3939b2d9f37b28ee;hpb=51aa7c917b3ecfb80d06d5a06cc9f553b8bc91c6;p=rup.git

diff --git a/src/main.rs b/src/main.rs
index 2480260..15b9c02 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,7 @@ extern crate percent_encoding;
 
 use listenfd::ListenFd;
 use actix_files as fs;
-use actix_web::{web, middleware, App, HttpServer, HttpResponse, Responder, Result, web::Query};
+use actix_web::{web, middleware, App, HttpServer, HttpResponse, web::Query};
 use askama::Template;
 
 use std::io::prelude::*;
@@ -29,11 +29,11 @@ pub struct Request {
    m: Option<String>
 }
 
-fn main_page(query: Query<Request>) -> Result<HttpResponse> {
+fn main_page(query: Query<Request>, key: &str) -> HttpResponse {
     let m =
         match &query.m {
             Some(b) =>
-                match crypto::decrypt(KEY, b) {
+                match crypto::decrypt(key, b) {
                     Ok(m) => m,
                     Err(_e) => String::from(consts::DEFAULT_MESSAGE) // TODO: log error.
                 },
@@ -43,7 +43,7 @@ fn main_page(query: Query<Request>) -> Result<HttpResponse> {
     let hello = MainTemplate { sentence: &m };
 
     let s = hello.render().unwrap();
-    Ok(HttpResponse::Ok().content_type("text/html").body(s))
+    HttpResponse::Ok().content_type("text/html").body(s)
 }
 
 #[derive(Debug, Deserialize)]
@@ -53,26 +53,26 @@ struct Config {
 
 fn get_exe_name() -> String {
     let first_arg = std::env::args().nth(0).unwrap();
-    //dbg!(&first_arg);
     let sep: &[_] = &['\\', '/'];
     first_arg[first_arg.rfind(sep).unwrap()+1..].to_string()
 }
+
 fn read_key() -> String {
     let mut key = String::new();
     File::open(consts::FILE_KEY)
-        .expect(&format!("Failed to open key file: {}", consts::FILE_KEY))
+        .unwrap_or_else(|_| panic!("Failed to open key file: {}", consts::FILE_KEY))
         .read_to_string(&mut key)
-        .expect(&format!("Failed to read key file: {}", consts::FILE_KEY));
+        .unwrap_or_else(|_| panic!("Failed to read key file: {}", consts::FILE_KEY));
 
     String::from(
-        percent_encoding::percent_decode(key.as_bytes())
+        percent_encoding::percent_decode(key.replace('\n', "").as_bytes())
             .decode_utf8()
-            .expect(&format!("Failed to decode key file: {}", consts::FILE_KEY))
+            .unwrap_or_else(|_| panic!("Failed to decode key file: {}", consts::FILE_KEY))
     )
 }
 
-fn main() -> std::io::Result<()> {
-
+#[actix_rt::main]
+async fn main() -> std::io::Result<()> {
     let key = read_key();
 
     if process_args(&key) { return Ok(()) }
@@ -80,7 +80,7 @@ fn main() -> std::io::Result<()> {
     println!("Starting RUP as web server...");
 
     let config: Config = {
-        let f = File::open(consts::FILE_CONF).expect(&format!("Failed to open configuration file {}", consts::FILE_CONF));
+        let f = File::open(consts::FILE_CONF).unwrap_or_else(|_| panic!("Failed to open configuration file {}", consts::FILE_CONF));
         match from_reader(f) {
             Ok(c) => c,
             Err(e) => panic!("Failed to load config: {}", e)
@@ -92,11 +92,13 @@ fn main() -> std::io::Result<()> {
     let mut listenfd = ListenFd::from_env();
     let mut server =
         HttpServer::new(
-            || {
+            move || {
+                let key = key.clone(); // Is this neccessary??
+
                 App::new()
                     .wrap(middleware::Compress::default())
                     .wrap(middleware::Logger::default())
-                    .service(web::resource("/").to(main_page))
+                    .service(web::resource("/").to(move |query| main_page(query, &key)))
                     .service(fs::Files::new("/static", "static").show_files_listing())
             }
         );
@@ -108,10 +110,10 @@ fn main() -> std::io::Result<()> {
             server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
         };
 
-    server.run()
+    server.run().await
 }
 
-fn process_args(key: &String) -> bool {
+fn process_args(key: &str) -> bool {
     fn print_usage() {
         println!("Usage:");
         println!(" {} [--help] [--encrypt <plain-text>|--decrypt <cipher-text>]", get_exe_name());
@@ -123,7 +125,7 @@ fn process_args(key: &String) -> bool {
         print_usage();
         return true
     } else if let Some((position_arg_encrypt, _)) = args.iter().find_position(|arg| arg == &"--encrypt") {
-        match args.iter().nth(position_arg_encrypt + 1) {
+        match args.get(position_arg_encrypt + 1) {
             Some(mess_to_encrypt) => {
                 match crypto::encrypt(&key, mess_to_encrypt) {
                     Ok(encrypted_mess) => {
@@ -138,7 +140,7 @@ fn process_args(key: &String) -> bool {
 
         return true
     } else if let Some((position_arg_decrypt, _)) = args.iter().find_position(|arg| arg == &"--decrypt") {
-        match args.iter().nth(position_arg_decrypt + 1) {
+        match args.get(position_arg_decrypt + 1) {
             Some(cipher_text) => {
                 let cipher_text_decoded = percent_encoding::percent_decode(cipher_text.as_bytes()).decode_utf8().expect("Unable to decode encoded cipher text");
                 match crypto::decrypt(&key, &cipher_text_decoded) {
@@ -154,5 +156,5 @@ fn process_args(key: &String) -> bool {
         return true
     }
 
-    return false
+    false
 }