session checker, etc. etc.

This commit is contained in:
Brandon Thomas committed 2021-05-18 00:37:41 -04:00
1 parent b7659d5b5d
commit 57e3fc4ebe
8 files changed
+109 -4

No files matched your search

+1
View File
@@ -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(),
)
+1
View File
@@ -1,3 +1,4 @@
pub mod create_account;
pub mod login;
pub mod logout;
pub mod session_info;
View File
Whitespace-only changes.
+17 -3
View File
@@ -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)
+3
View File
@@ -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)]
+19
View File
@@ -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<Option<String>>
{
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)),
}
}
}
+2 -1
View File
@@ -1,3 +1,4 @@
pub mod cookies;
pub mod ip_address;
pub mod tokens;
pub mod tokens;
pub mod session_checker;
+66
View File
@@ -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<Option<SessionRecord>>
{
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<SessionUserRecord>
{
Ok(SessionUserRecord {
})
}*/
}