From 57e3fc4ebe3c85b1c9573a1fdc150f84406b1bed Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 18 May 2021 00:37:41 -0400 Subject: [PATCH] session checker, etc. etc. --- src/endpoints/users/logout.rs | 1 + src/endpoints/users/mod.rs | 1 + src/endpoints/users/session_info.rs | 0 src/main.rs | 20 +++++++-- src/server_state.rs | 3 ++ src/util/cookies.rs | 19 +++++++++ src/util/mod.rs | 3 +- src/util/session_checker.rs | 66 +++++++++++++++++++++++++++++ 8 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 src/endpoints/users/session_info.rs create mode 100644 src/util/session_checker.rs diff --git a/src/endpoints/users/logout.rs b/src/endpoints/users/logout.rs index 3cd805e19b..30eaf12ff2 100644 --- a/src/endpoints/users/logout.rs +++ b/src/endpoints/users/logout.rs @@ -108,6 +108,7 @@ async fn delete_session(session_token: &str, mysql_pool: &MySqlPool) -> AnyhowRe UPDATE user_sessions SET deleted_at = CURRENT_TIMESTAMP() WHERE token = ? +AND deleted_at IS NULL "#, session_token.to_string(), ) diff --git a/src/endpoints/users/mod.rs b/src/endpoints/users/mod.rs index 019ccd2199..09256cb3e6 100644 --- a/src/endpoints/users/mod.rs +++ b/src/endpoints/users/mod.rs @@ -1,3 +1,4 @@ pub mod create_account; pub mod login; pub mod logout; +pub mod session_info; diff --git a/src/endpoints/users/session_info.rs b/src/endpoints/users/session_info.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main.rs b/src/main.rs index cc94c40acf..9145213b27 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,9 @@ +#![allow(dead_code)] +#![allow(unused_mut)] +#![allow(unused_imports)] +#![warn(unused_must_use)] +//#![allow(warnings)] + #[macro_use] extern crate lazy_static; #[macro_use] extern crate serde_derive; @@ -20,6 +26,7 @@ use crate::endpoints::users::create_account::create_account_handler; use crate::endpoints::users::login::login_handler; use crate::util::cookies::CookieManager; use crate::endpoints::users::logout::logout_handler; +use crate::util::session_checker::SessionChecker; const DEFAULT_BIND_ADDRESS : &'static str = "0.0.0.0:12345"; const DEFAULT_RUST_LOG: &'static str = "debug,actix_web=info"; @@ -35,15 +42,21 @@ async fn main() -> AnyhowResult<()> { .and_then(|h| h.into_string().ok()) .unwrap_or("storyteller-web-unknown".to_string()); - let db_connection_string = "mysql://root:root@localhost/storyteller"; + let db_connection_string = + easyenv::get_env_string_or_default( + "MYSQL_URL", + "mysql://root:root@localhost/storyteller"); let pool = MySqlPoolOptions::new() .max_connections(5) - .connect(db_connection_string) + .connect(&db_connection_string) .await?; let hmac_secret = easyenv::get_env_string_or_default("COOKIE_SECRET", "notsecret"); - let cookie_manager = CookieManager::new(".vo.codes", &hmac_secret); + let cookie_domain = easyenv::get_env_string_or_default("COOKIE_DOMAIN", ".vo.codes"); + + let cookie_manager = CookieManager::new(&cookie_domain, &hmac_secret); + let session_checker = SessionChecker::new(&cookie_manager); let server_state = ServerState { env_config: EnvConfig { @@ -53,6 +66,7 @@ async fn main() -> AnyhowResult<()> { hostname: server_hostname, mysql_pool: pool, cookie_manager, + session_checker, }; serve(server_state) diff --git a/src/server_state.rs b/src/server_state.rs index 88c4d60891..6069821760 100644 --- a/src/server_state.rs +++ b/src/server_state.rs @@ -1,5 +1,6 @@ use sqlx::MySqlPool; use crate::util::cookies::CookieManager; +use crate::util::session_checker::SessionChecker; /// State that is injected into every endpoint. #[derive(Clone)] @@ -12,6 +13,8 @@ pub struct ServerState { pub mysql_pool: MySqlPool, pub cookie_manager: CookieManager, + + pub session_checker: SessionChecker, } #[derive(Clone)] diff --git a/src/util/cookies.rs b/src/util/cookies.rs index 905d5d2761..adc0c14bc7 100644 --- a/src/util/cookies.rs +++ b/src/util/cookies.rs @@ -1,10 +1,12 @@ use actix_web::cookie::Cookie; +use actix_web::{HttpRequest, HttpMessage}; use anyhow::anyhow; use crate::AnyhowResult; use hmac::Hmac; use hmac::NewMac; use jwt::SignWithKey; use jwt::VerifyWithKey; +use log::{info, warn}; use sha2::Sha256; use std::collections::BTreeMap; use std::ops::Sub; @@ -66,5 +68,22 @@ impl CookieManager { Ok(session_token) } + + pub fn decode_session_token_from_request(&self, request: &HttpRequest) + -> AnyhowResult> + { + let cookie = match request.cookie(SESSION_COOKIE_NAME) { + None => return Ok(None), + Some(cookie) => cookie, + }; + + match self.decode_session_token(&cookie) { + Err(e) => { + warn!("Session cookie decode error: {:?}", e); + Err(anyhow!("Could not decode session cookie: {:?}", e)) + }, + Ok(payload) => Ok(Some(payload)), + } + } } diff --git a/src/util/mod.rs b/src/util/mod.rs index d169123365..9f8449793c 100644 --- a/src/util/mod.rs +++ b/src/util/mod.rs @@ -1,3 +1,4 @@ pub mod cookies; pub mod ip_address; -pub mod tokens; \ No newline at end of file +pub mod tokens; +pub mod session_checker; \ No newline at end of file diff --git a/src/util/session_checker.rs b/src/util/session_checker.rs new file mode 100644 index 0000000000..1ff6c6f1ff --- /dev/null +++ b/src/util/session_checker.rs @@ -0,0 +1,66 @@ +use crate::util::cookies::CookieManager; +use sqlx::MySqlPool; +use crate::AnyhowResult; +use actix_web::HttpRequest; + +#[derive(Clone)] +pub struct SessionChecker { + cookie_manager: CookieManager, +} + +pub struct SessionRecord { + session_token: String, + user_token: String, +} + +pub struct SessionUserRecord { + pub token: String, + pub username: String, + pub display_name: String, + pub email_address: String, + pub banned: bool, +} + +impl SessionChecker { + + pub fn new(cookie_manager: &CookieManager) -> Self { + Self { + cookie_manager: cookie_manager.clone(), + } + } + + pub async fn maybe_get_session(&self, request: &HttpRequest, pool: &MySqlPool) + -> AnyhowResult> + { + let session_token = match self.cookie_manager.decode_session_token_from_request(request)? { + None => return Ok(None), + Some(session_token) => session_token, + }; + + // NB: Lookup failure is Err(RowNotFound). + let session_record = sqlx::query_as!( + SessionRecord, + r#" +SELECT + token as session_token, + user_token +FROM user_sessions +WHERE token = ? +AND deleted_at IS NULL + "#, + session_token.to_string(), + ) + .fetch_one(pool) + .await?; // TODO: This will return error if it doesn't exist + + Ok(Some(session_record)) + } + + /*pub async fn maybe_get_user(request: &HttpRequest, pool: &MySqlPool) + -> AnyhowResult + { + Ok(SessionUserRecord { + + }) + }*/ +} \ No newline at end of file