-extern crate actix_web;
+
extern crate listenfd;
extern crate askama;
+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::*;
-use ron::de::from_reader;
-use serde::Deserialize;
-use std::{fs::File, env::args};
+use std::{ fs::File, path::Path, env::args, io::prelude::* };
+use ron::{ de::from_reader, ser::{ to_string_pretty, PrettyConfig } };
+use serde::{ Deserialize, Serialize };
use itertools::Itertools;
m: Option<String>
}
-static DEFAULT_MESSAGE: &str = "Marc, roule un pet'!";
-static KEY: &str = "secret";
-
-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) {
- Some(m) => m,
- None => String::from(DEFAULT_MESSAGE)
+ match crypto::decrypt(key, b) {
+ Ok(m) => m,
+ Err(_e) => String::from(consts::DEFAULT_MESSAGE) // TODO: log error.
},
- None => String::from(DEFAULT_MESSAGE)
+ None => String::from(consts::DEFAULT_MESSAGE)
};
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)]
+#[derive(Debug, Deserialize, Serialize)]
struct Config {
port: u16
}
+const DEFAULT_CONFIG: Config = Config { port: 8082 };
+
fn get_exe_name() -> String {
- let first_arg = std::env::args().nth(0).unwrap();
- //dbg!(&first_arg);
+ let first_arg = std::env::args().next().unwrap();
let sep: &[_] = &['\\', '/'];
first_arg[first_arg.rfind(sep).unwrap()+1..].to_string()
}
-fn print_usage() {
- println!("Usage:");
- println!(" {} [--help] [--encrypt <plain-text>|--decrypt <cipher-text>]", get_exe_name());
+fn load_config() -> Config {
+ // unwrap_or_else(|_| panic!("Failed to open configuration file {}", consts::FILE_CONF));
+ match File::open(consts::FILE_CONF) {
+ Ok(file) => from_reader(file).unwrap_or_else(|_| panic!("Failed to open configuration file {}", consts::FILE_CONF)),
+ Err(_) => {
+ let mut file = File::create(consts::FILE_CONF) .unwrap();
+ file.write_all(to_string_pretty(&DEFAULT_CONFIG, PrettyConfig::new()).unwrap().as_bytes()).unwrap(); // We do not use 'to_writer' because it can't pretty format the output.
+ DEFAULT_CONFIG
+ }
+ }
}
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(
- url::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<()> {
- 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 = 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()
- }
+fn write_key(key : &str) {
+ let percent_encoded = percent_encoding::utf8_percent_encode(key, percent_encoding::NON_ALPHANUMERIC).to_string();
+ let mut file = File::create(consts::FILE_KEY).unwrap();
+ file.write_all(percent_encoded.as_bytes()).unwrap();
+}
- 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()
+#[actix_rt::main]
+async fn main() -> std::io::Result<()> {
+ let key = {
+ // If the key file doesn't exist then create a new one with a random key in it.
+ if !Path::new(consts::FILE_KEY).exists() {
+ let new_key = crypto::generate_key();
+ write_key(&new_key);
+ println!("A key has been generated here: {}", consts::FILE_KEY);
+ new_key
+ } else {
+ read_key()
}
+ };
- return Ok(());
- }
+ if process_args(&key) { return Ok(()) }
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));
- match from_reader(f) {
- Ok(c) => c,
- Err(e) => panic!("Failed to load config: {}", e)
- }
- };
+ let config = load_config();
println!("Configuration: {:?}", config);
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())
}
);
server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
};
- server.run()
+ server.run().await
+}
+
+fn process_args(key: &str) -> bool {
+ fn print_usage() {
+ println!("Usage:");
+ println!(" {} [--help] [--encrypt <plain-text> | --decrypt <cipher-text>]", get_exe_name());
+ }
+
+ let args: Vec<String> = args().collect();
+
+ if args.iter().any(|arg| arg == "--help") {
+ print_usage();
+ return true
+ } 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) => {
+ // 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); },
+ Err(error) =>
+ println!("Unable to encrypt: {:?}", error)
+ }
+ }
+ None => print_usage()
+ }
+
+ return true
+ } else if let Some((position_arg_decrypt, _)) = args.iter().find_position(|arg| arg == &"--decrypt") {
+ 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) {
+ Ok(plain_text) =>
+ println!("Decrypted message: {}", plain_text),
+ Err(error) =>
+ println!("Unable to decrypt: {:?}", error)
+ }
+ }
+ None => print_usage()
+ }
+
+ return true
+ }
+
+ false
}
projects / rup.git / blobdiff