From 16f2d5557b3c036c1ee76ee64a84f5e8bc249df8 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 12 Mar 2023 04:49:59 -0400 Subject: [PATCH] clear session cache when user is edited --- .../src/endpoints/edit_profile_handler.rs | 19 +++++++++++++++++++ .../users/src/utils/session_checker.rs | 9 ++++++++- .../users/src/utils/session_cookie_manager.rs | 2 +- .../service/web/storyteller_web/src/main.rs | 1 + 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs b/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs index a7312aeba5..e1a6d164b5 100644 --- a/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs +++ b/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs @@ -24,6 +24,8 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err use log::warn; use sqlx::MySqlPool; use std::fmt; +use redis_caching::redis_ttl_cache::RedisTtlCache; +use redis_common::redis_cache_keys::RedisCacheKeys; use user_input_common::check_for_slurs::contains_slurs; use user_input_common::markdown_to_html::markdown_to_html; @@ -91,6 +93,7 @@ pub async fn edit_profile_handler( path: Path, request: web::Json, mysql_pool: web::Data, + redis_ttl_cache: web::Data, session_checker: web::Data, ) -> Result { @@ -292,6 +295,22 @@ pub async fn edit_profile_handler( } }; + // TODO: Clear Redis cache of sessions + // Unfortunately we don't yet have an index of user_token => session_tokens[] outside the DB. + // For now, a hacky solution is just to delete the cache under the current user. + // This makes sense for non-mods and should solve 95% of cases. + if let Some(session_token) = session_checker.forgiving_get_session_token(&http_request) { + if let Ok(mut redis_ttl_cache) = redis_ttl_cache.get_connection() { + let keys = vec![ + RedisCacheKeys::session_record_user(&session_token), + RedisCacheKeys::session_record_light(&session_token), + ]; + for key in keys.iter() { + let _r = redis_ttl_cache.delete_from_cache(key).ok(); + } + } + } + let response = EditProfileSuccessResponse { success: true, }; diff --git a/crates/service/plugins/users/src/utils/session_checker.rs b/crates/service/plugins/users/src/utils/session_checker.rs index 60297a875d..e177f38b70 100644 --- a/crates/service/plugins/users/src/utils/session_checker.rs +++ b/crates/service/plugins/users/src/utils/session_checker.rs @@ -4,12 +4,12 @@ #![forbid(unused_variables)] use actix_web::HttpRequest; -use container_common::anyhow_result::AnyhowResult; use crate::utils::session_cookie_manager::SessionCookieManager; use crate::utils::user_session_extended::{UserSessionExtended, UserSessionPreferences, UserSessionPremiumPlanInfo, UserSessionRoleAndPermissions, UserSessionSubscriptionPlan, UserSessionUserDetails}; use database_queries::queries::users::user_sessions::get_user_session_by_token::{get_user_session_by_token, get_user_session_by_token_pooled_connection, SessionUserRecord}; use database_queries::queries::users::user_sessions::get_user_session_by_token_light::{get_user_session_by_token_light, SessionRecord}; use database_queries::queries::users::user_subscriptions::list_active_user_subscriptions::list_active_user_subscriptions; +use errors::AnyhowResult; use log::warn; use redis_caching::redis_ttl_cache::{RedisTtlCache, RedisTtlCacheConnection}; use redis_common::redis_cache_keys::RedisCacheKeys; @@ -38,6 +38,13 @@ impl SessionChecker { } } + pub fn get_session_token(&self, request: &HttpRequest) -> AnyhowResult> { + self.cookie_manager.decode_session_token_from_request(request) + } + + pub fn forgiving_get_session_token(&self, request: &HttpRequest) -> Option { + self.get_session_token(request).ok().flatten() + } // ==================== SessionRecord ==================== diff --git a/crates/service/plugins/users/src/utils/session_cookie_manager.rs b/crates/service/plugins/users/src/utils/session_cookie_manager.rs index 748be8faa6..e3e7b9abf3 100644 --- a/crates/service/plugins/users/src/utils/session_cookie_manager.rs +++ b/crates/service/plugins/users/src/utils/session_cookie_manager.rs @@ -6,7 +6,7 @@ use actix_web::HttpRequest; use actix_web::cookie::Cookie; use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; use hmac::Hmac; use hmac::NewMac; use jwt::SignWithKey; diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index 229502d47b..295734b39b 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -517,6 +517,7 @@ pub async fn serve(server_state: ServerState) -> AnyhowResult<()> .app_data(web::Data::new(server_state_arc.firehose_publisher.clone())) .app_data(web::Data::new(server_state_arc.mysql_pool.clone())) .app_data(web::Data::new(server_state_arc.redis_pool.clone())) + .app_data(web::Data::new(server_state_arc.redis_ttl_cache.clone())) .app_data(web::Data::new(server_state_arc.session_checker.clone())) .app_data(web::Data::new(server_state_arc.cookie_manager.clone())) .app_data(web::Data::new(server_state_arc.stripe.clone().config.clone()))