Add a new format version (2) for encrypted text.

[rup.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 3056267..8d0a5c9 100644 (file)
--- 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, Result, web::Query};
+use actix_web::{web, middleware, App, HttpServer, HttpResponse, web::Query};
 use askama::Template;
 
 use std::io::prelude::*;
@@ -29,7 +29,7 @@ pub struct Request {
    m: Option<String>
 }
 
-fn main_page(query: Query<Request>, key: &str) -> Result<HttpResponse> {
+fn main_page(query: Query<Request>, key: &str) -> HttpResponse {
     let m =
         match &query.m {
             Some(b) =>
@@ -43,7 +43,7 @@ fn main_page(query: Query<Request>, key: &str) -> 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)]
@@ -52,7 +52,7 @@ struct Config {
 }
 
 fn get_exe_name() -> String {
-    let first_arg = std::env::args().nth(0).unwrap();
+    let first_arg = std::env::args().next().unwrap();
     let sep: &[_] = &['\\', '/'];
     first_arg[first_arg.rfind(sep).unwrap()+1..].to_string()
 }
@@ -71,7 +71,8 @@ fn read_key() -> String {
     )
 }
 
-fn main() -> std::io::Result<()> {
+#[actix_rt::main]
+async fn main() -> std::io::Result<()> {
     let key = read_key();
 
     if process_args(&key) { return Ok(()) }
@@ -109,7 +110,7 @@ fn main() -> std::io::Result<()> {
             server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
         };
 
-    server.run()
+    server.run().await
 }
 
 fn process_args(key: &str) -> bool {
@@ -126,7 +127,8 @@ fn process_args(key: &str) -> bool {
     } else if let Some((position_arg_encrypt, _)) = args.iter().find_position(|arg| arg == &"--encrypt") {
         match args.get(position_arg_encrypt + 1) {
             Some(mess_to_encrypt) => {
-                match crypto::encrypt(&key, mess_to_encrypt) {
+                // Encrypt to version 2 (version 1 is obsolete).
+                match crypto::encrypt(&key, mess_to_encrypt, 2) {
                     Ok(encrypted_mess) => {
                         let encrypted_mess_encoded = percent_encoding::utf8_percent_encode(&encrypted_mess, percent_encoding::NON_ALPHANUMERIC).to_string();
                         println!("Encrypted message percent-encoded: {}", encrypted_mess_encoded); },