restructuring (#56)

* restructuring

* pin svelte kit version & parallel execution

* update svelte kit

* correct test result assets

* add timeout

* correct locale path

* simplify crypto

* fix for #58

* add verbosity flag

* disable flaky test

packages/backend/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "cryptgeon"
+version = "2.0.3"
+authors = ["cupcakearmy <hi@nicco.io>"]
+edition = "2021"
+
+[[bin]]
+name = "cryptgeon"
+path = "src/main.rs"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+actix-web = "4"
+actix-files = "0.6"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1"
+lazy_static = "1"
+ring = "0.16"
+bs62 = "0.1"
+byte-unit = "4"
+dotenv = "0.15"
+mime = "0.3"
+env_logger = "0.9"
+redis = "0.21.5"

packages/backend/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "backend",
+  "private": true,
+  "scripts": {
+    "dev": "cargo watch -x 'run --bin cryptgeon'",
+    "build": "cargo build --release",
+    "test:server": "SIZE_LIMIT=10MiB LISTEN_ADDR=0.0.0.0:1234 cargo run",
+    "test:prepare": "cargo build"
+  }
+}

packages/backend/src/api.rs

@@ -0,0 +1,12 @@
+use actix_web::web;
+
+use crate::note;
+use crate::status;
+
+pub fn init(cfg: &mut web::ServiceConfig) {
+    cfg.service(
+        web::scope("/api")
+            .service(note::init())
+            .service(status::init()),
+    );
+}

packages/backend/src/client.rs

@@ -0,0 +1,17 @@
+use actix_files::{Files, NamedFile};
+use actix_web::{web, Result};
+
+use crate::config;
+
+pub fn init(cfg: &mut web::ServiceConfig) {
+    cfg.service(
+        Files::new("/", config::FRONTEND_PATH.to_string())
+            .index_file("index.html")
+            .use_etag(true),
+    );
+}
+
+pub async fn index() -> Result<NamedFile> {
+    let index = format!("{}{}", config::FRONTEND_PATH.to_string(), "/index.html");
+    Ok(NamedFile::open(index)?)
+}

packages/backend/src/config.rs

@@ -0,0 +1,45 @@
+use byte_unit::Byte;
+
+// Internal
+lazy_static! {
+    pub static ref VERSION: String = option_env!("CARGO_PKG_VERSION")
+        .unwrap_or("Unknown")
+        .to_string();
+    pub static ref FRONTEND_PATH: String =
+        std::env::var("FRONTEND_PATH").unwrap_or("../frontend/build".to_string());
+    pub static ref LISTEN_ADDR: String =
+        std::env::var("LISTEN_ADDR").unwrap_or("0.0.0.0:5000".to_string());
+    pub static ref VERBOSITY: String = std::env::var("VERBOSITY").unwrap_or("warn".to_string());
+}
+
+// CONFIG
+lazy_static! {
+  pub static ref LIMIT: usize =
+    Byte::from_str(std::env::var("SIZE_LIMIT").unwrap_or("1 KiB".to_string()))
+      .unwrap()
+      .get_bytes() as usize;
+  pub static ref MAX_VIEWS: u32 = std::env::var("MAX_VIEWS")
+    .unwrap_or("100".to_string())
+    .parse()
+    .unwrap();
+  pub static ref MAX_EXPIRATION: u32 = std::env::var("MAX_EXPIRATION")
+    .unwrap_or("360".to_string()) // 6 hours in minutes
+    .parse()
+    .unwrap();
+  pub static ref ALLOW_ADVANCED: bool = std::env::var("ALLOW_ADVANCED")
+    .unwrap_or("true".to_string())
+    .parse()
+    .unwrap();
+}
+
+// THEME
+lazy_static! {
+    pub static ref THEME_IMAGE: String = std::env::var("THEME_IMAGE")
+        .unwrap_or("".to_string())
+        .parse()
+        .unwrap();
+    pub static ref THEME_TEXT: String = std::env::var("THEME_TEXT")
+        .unwrap_or("".to_string())
+        .parse()
+        .unwrap();
+}

packages/backend/src/main.rs

@@ -0,0 +1,36 @@
+use actix_web::{
+    middleware::{self, Logger},
+    web, App, HttpServer,
+};
+use dotenv::dotenv;
+
+#[macro_use]
+extern crate lazy_static;
+
+mod api;
+mod client;
+mod config;
+mod note;
+mod size;
+mod status;
+mod store;
+
+#[actix_web::main]
+async fn main() -> std::io::Result<()> {
+    dotenv().ok();
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or(config::VERBOSITY.as_str()));
+
+    return HttpServer::new(|| {
+        App::new()
+            .wrap(Logger::new("\"%r\" %s %b %T"))
+            .wrap(middleware::Compress::default())
+            .wrap(middleware::DefaultHeaders::default())
+            .configure(size::init)
+            .configure(api::init)
+            .configure(client::init)
+            .default_service(web::to(client::index))
+    })
+    .bind(config::LISTEN_ADDR.to_string())?
+    .run()
+    .await;
+}

packages/backend/src/note/mod.rs

@@ -0,0 +1,5 @@
+mod model;
+mod routes;
+
+pub use model::*;
+pub use routes::*;

packages/backend/src/note/model.rs

@@ -0,0 +1,27 @@
+use bs62;
+use ring::rand::SecureRandom;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Clone)]
+pub struct Note {
+    pub meta: String,
+    pub contents: String,
+    pub views: Option<u32>,
+    pub expiration: Option<u32>,
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+pub struct NoteInfo {}
+
+#[derive(Serialize, Deserialize, Clone)]
+pub struct NotePublic {
+    pub meta: String,
+    pub contents: String,
+}
+
+pub fn generate_id() -> String {
+    let mut id: [u8; 32] = [0; 32];
+    let sr = ring::rand::SystemRandom::new();
+    let _ = sr.fill(&mut id);
+    return bs62::encode_data(&id);
+}

packages/backend/src/note/routes.rs

@@ -0,0 +1,143 @@
+use actix_web::{delete, get, post, web, HttpResponse, Responder, Scope};
+use serde::{Deserialize, Serialize};
+use std::time::SystemTime;
+
+use crate::config;
+use crate::note::{generate_id, Note, NoteInfo, NotePublic};
+use crate::store;
+
+pub fn now() -> u32 {
+    SystemTime::now()
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .unwrap()
+        .as_secs() as u32
+}
+
+#[derive(Serialize, Deserialize)]
+struct NotePath {
+    id: String,
+}
+
+#[get("/{id}")]
+async fn one(path: web::Path<NotePath>) -> impl Responder {
+    let p = path.into_inner();
+    let note = store::get(&p.id);
+
+    match note {
+        Ok(Some(_)) => HttpResponse::Ok().json(NoteInfo {}),
+        Ok(None) => HttpResponse::NotFound().finish(),
+        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+struct CreateResponse {
+    id: String,
+}
+
+#[post("/")]
+async fn create(note: web::Json<Note>) -> impl Responder {
+    let mut n = note.into_inner();
+    let id = generate_id();
+    let bad_req = HttpResponse::BadRequest().finish();
+    if n.views == None && n.expiration == None {
+        return bad_req;
+    }
+    if !*config::ALLOW_ADVANCED {
+        n.views = Some(1);
+        n.expiration = None;
+    }
+    match n.views {
+        Some(v) => {
+            if v > *config::MAX_VIEWS {
+                return bad_req;
+            }
+            n.expiration = None; // views overrides expiration
+        }
+        _ => {}
+    }
+    match n.expiration {
+        Some(e) => {
+            if e > *config::MAX_EXPIRATION {
+                return bad_req;
+            }
+            let expiration = now() + (e * 60);
+            n.expiration = Some(expiration);
+        }
+        _ => {}
+    }
+    match store::set(&id.clone(), &n.clone()) {
+        Ok(_) => return HttpResponse::Ok().json(CreateResponse { id: id }),
+        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
+    }
+}
+
+#[delete("/{id}")]
+async fn delete(path: web::Path<NotePath>) -> impl Responder {
+    let p = path.into_inner();
+    let note = store::get(&p.id);
+    match note {
+        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
+        Ok(None) => return HttpResponse::NotFound().finish(),
+        Ok(Some(note)) => {
+            let mut changed = note.clone();
+            if changed.views == None && changed.expiration == None {
+                return HttpResponse::BadRequest().finish();
+            }
+            match changed.views {
+                Some(v) => {
+                    changed.views = Some(v - 1);
+                    let id = p.id.clone();
+                    if v <= 1 {
+                        match store::del(&id) {
+                            Err(e) => {
+                                return HttpResponse::InternalServerError().body(e.to_string())
+                            }
+                            _ => {}
+                        }
+                    } else {
+                        match store::set(&id, &changed.clone()) {
+                            Err(e) => {
+                                return HttpResponse::InternalServerError().body(e.to_string())
+                            }
+                            _ => {}
+                        }
+                    }
+                }
+                _ => {}
+            }
+
+            let n = now();
+            match changed.expiration {
+                Some(e) => {
+                    if e < n {
+                        match store::del(&p.id.clone()) {
+                            Ok(_) => return HttpResponse::BadRequest().finish(),
+                            Err(e) => {
+                                return HttpResponse::InternalServerError().body(e.to_string())
+                            }
+                        }
+                    }
+                }
+                _ => {}
+            }
+            return HttpResponse::Ok().json(NotePublic {
+                contents: changed.contents,
+                meta: changed.meta,
+            });
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+struct Status {
+    version: String,
+    max_size: usize,
+}
+
+pub fn init() -> Scope {
+    web::scope("/notes")
+        .service(one)
+        .service(create)
+        .service(delete)
+}

packages/backend/src/size.rs

@@ -0,0 +1,12 @@
+use crate::config;
+use actix_web::web;
+use mime;
+
+pub fn init(cfg: &mut web::ServiceConfig) {
+    let json = web::JsonConfig::default().limit(*config::LIMIT);
+    let plain = web::PayloadConfig::default()
+        .limit(*config::LIMIT)
+        .mimetype(mime::STAR_STAR);
+    // cfg.app_data(plain);
+    cfg.app_data(json).app_data(plain);
+}

packages/backend/src/status/mod.rs

@@ -0,0 +1,5 @@
+mod model;
+mod routes;
+
+pub use model::*;
+pub use routes::*;

packages/backend/src/status/model.rs

@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Status {
+    // General
+    pub version: String,
+    // Config
+    pub max_size: u32,
+    pub max_views: u32,
+    pub max_expiration: u32,
+    pub allow_advanced: bool,
+    // Theme
+    pub theme_image: String,
+    pub theme_text: String,
+}

packages/backend/src/status/routes.rs

@@ -0,0 +1,21 @@
+use actix_web::{get, web, HttpResponse, Responder, Scope};
+
+use crate::config;
+use crate::status::Status;
+
+#[get("/")]
+async fn get_status() -> impl Responder {
+    return HttpResponse::Ok().json(Status {
+        version: config::VERSION.to_string(),
+        max_size: *config::LIMIT as u32,
+        max_views: *config::MAX_VIEWS,
+        max_expiration: *config::MAX_EXPIRATION,
+        allow_advanced: *config::ALLOW_ADVANCED,
+        theme_image: config::THEME_IMAGE.to_string(),
+        theme_text: config::THEME_TEXT.to_string(),
+    });
+}
+
+pub fn init() -> Scope {
+    web::scope("/status").service(get_status)
+}

packages/backend/src/store.rs

@@ -0,0 +1,55 @@
+use redis;
+use redis::Commands;
+
+use crate::note::now;
+use crate::note::Note;
+
+lazy_static! {
+    static ref REDIS_CLIENT: String = std::env::var("REDIS")
+        .unwrap_or("redis://127.0.0.1/".to_string())
+        .parse()
+        .unwrap();
+}
+
+fn get_connection() -> Result<redis::Connection, &'static str> {
+    let client =
+        redis::Client::open(REDIS_CLIENT.to_string()).map_err(|_| "Unable to connect to redis")?;
+    client
+        .get_connection()
+        .map_err(|_| "Unable to connect to redis")
+}
+
+pub fn set(id: &String, note: &Note) -> Result<(), &'static str> {
+    let serialized = serde_json::to_string(&note.clone()).unwrap();
+    let mut conn = get_connection()?;
+
+    conn.set(id, serialized)
+        .map_err(|_| "Unable to set note in redis")?;
+    match note.expiration {
+        Some(e) => {
+            let seconds = e - now();
+            conn.expire(id, seconds as usize)
+                .map_err(|_| "Unable to set expiration on notion")?
+        }
+        None => {}
+    };
+    Ok(())
+}
+
+pub fn get(id: &String) -> Result<Option<Note>, &'static str> {
+    let mut conn = get_connection()?;
+    let value: Option<String> = conn.get(id).map_err(|_| "Could not load note in redis")?;
+    match value {
+        None => return Ok(None),
+        Some(s) => {
+            let deserialize: Note = serde_json::from_str(&s).unwrap();
+            return Ok(Some(deserialize));
+        }
+    }
+}
+
+pub fn del(id: &String) -> Result<(), &'static str> {
+    let mut conn = get_connection()?;
+    conn.del(id).map_err(|_| "Unable to delete note in redis")?;
+    Ok(())
+}