From 3792cf82f222ab7ae0826ad5c216ca17759cd6d2 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 6 Apr 2026 20:35:37 -0400 Subject: [PATCH] rename --- .../src/sessions/http_user_session_manager.rs | 16 ++++++++-------- ...ror.rs => http_user_session_payload_error.rs} | 8 ++++---- .../sessions/http_user_session_payload_signer.rs | 8 ++++---- crates/lib/actix_artcraft/src/sessions/mod.rs | 4 ++-- .../advanced_common_web_error.rs | 4 ++-- .../http_server/session/session_checker_error.rs | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) rename crates/lib/actix_artcraft/src/sessions/{session_error.rs => http_user_session_payload_error.rs} (76%) diff --git a/crates/lib/actix_artcraft/src/sessions/http_user_session_manager.rs b/crates/lib/actix_artcraft/src/sessions/http_user_session_manager.rs index 3e02f3d8ef..1ca9a31f2f 100644 --- a/crates/lib/actix_artcraft/src/sessions/http_user_session_manager.rs +++ b/crates/lib/actix_artcraft/src/sessions/http_user_session_manager.rs @@ -10,7 +10,7 @@ use log::warn; use crate::sessions::http_user_session_payload::HttpUserSessionPayload; use crate::sessions::http_user_session_payload_signer::HttpUserSessionPayloadSigner; -use crate::sessions::session_error::SessionError; +use crate::sessions::http_user_session_payload_error::HttpUserSessionPayloadError; use tokens::tokens::user_sessions::UserSessionToken; use tokens::tokens::users::UserToken; @@ -30,7 +30,7 @@ pub struct HttpUserSessionManager { } impl HttpUserSessionManager { - pub fn new(cookie_domain: &str, hmac_secret: &str) -> Result { + pub fn new(cookie_domain: &str, hmac_secret: &str) -> Result { let payload_signer = HttpUserSessionPayloadSigner::new(hmac_secret) .map_err(|e| { warn!("Failed to construct HttpUserSessionPayloadSigner: {}", e); @@ -47,7 +47,7 @@ impl HttpUserSessionManager { &self, session_token: &UserSessionToken, user_token: &UserToken, - ) -> Result { + ) -> Result { self.payload_signer.encode(session_token, user_token) .map_err(|e| { warn!("Failed to encode session payload: {}", e); @@ -59,7 +59,7 @@ impl HttpUserSessionManager { &self, session_token: &UserSessionToken, user_token: &UserToken, - ) -> Result { + ) -> Result { let jwt_string = self.payload_signer.encode(session_token, user_token) .map_err(|e| { warn!("Failed to encode session cookie payload: {}", e); @@ -98,7 +98,7 @@ impl HttpUserSessionManager { pub fn decode_session_payload_from_request( &self, request: &HttpRequest, - ) -> Result, SessionError> + ) -> Result, HttpUserSessionPayloadError> { let signed_session_payload = self.session_payload_from_request(request)?; @@ -121,7 +121,7 @@ impl HttpUserSessionManager { pub fn check_and_return_session_token_decodes( &self, request: &HttpRequest, - ) -> Result, SessionError> { + ) -> Result, HttpUserSessionPayloadError> { let signed_session_payload = self.session_payload_from_request(request)?; let signed_session_payload = match signed_session_payload { @@ -143,7 +143,7 @@ impl HttpUserSessionManager { fn session_payload_from_request( &self, request: &HttpRequest, - ) -> Result, SessionError> { + ) -> Result, HttpUserSessionPayloadError> { let mut signed_session_payload = request.cookie(SESSION_COOKIE_NAME) .map(|cookie| cookie.value().to_string()); @@ -153,7 +153,7 @@ impl HttpUserSessionManager { let header_str = header.to_str() .map_err(|e| { warn!("Failed to read session HTTP header as str: {}", e); - SessionError::HttpSessionHeaderError(e.to_string()) + HttpUserSessionPayloadError::HttpSessionHeaderError(e.to_string()) })?; signed_session_payload = Some(header_str.to_string()); } diff --git a/crates/lib/actix_artcraft/src/sessions/session_error.rs b/crates/lib/actix_artcraft/src/sessions/http_user_session_payload_error.rs similarity index 76% rename from crates/lib/actix_artcraft/src/sessions/session_error.rs rename to crates/lib/actix_artcraft/src/sessions/http_user_session_payload_error.rs index 92cd34d0f4..aa9076927c 100644 --- a/crates/lib/actix_artcraft/src/sessions/session_error.rs +++ b/crates/lib/actix_artcraft/src/sessions/http_user_session_payload_error.rs @@ -4,7 +4,7 @@ use std::fmt::{Display, Formatter}; use jwt_signer::jwt_signer_error::JwtSignerError; #[derive(Debug)] -pub enum SessionError { +pub enum HttpUserSessionPayloadError { /// Error reading HTTP header HttpSessionHeaderError(String), @@ -12,7 +12,7 @@ pub enum SessionError { JwtSigner(JwtSignerError), } -impl Display for SessionError { +impl Display for HttpUserSessionPayloadError { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self { Self::HttpSessionHeaderError(msg) => write!(f, "HTTP session header error: {}", msg), @@ -21,9 +21,9 @@ impl Display for SessionError { } } -impl Error for SessionError {} +impl Error for HttpUserSessionPayloadError {} -impl From for SessionError { +impl From for HttpUserSessionPayloadError { fn from(err: JwtSignerError) -> Self { Self::JwtSigner(err) } diff --git a/crates/lib/actix_artcraft/src/sessions/http_user_session_payload_signer.rs b/crates/lib/actix_artcraft/src/sessions/http_user_session_payload_signer.rs index e98a771d6e..90796d0ae2 100644 --- a/crates/lib/actix_artcraft/src/sessions/http_user_session_payload_signer.rs +++ b/crates/lib/actix_artcraft/src/sessions/http_user_session_payload_signer.rs @@ -1,7 +1,7 @@ use std::collections::BTreeMap; use crate::sessions::http_user_session_payload::HttpUserSessionPayload; -use crate::sessions::session_error::SessionError; +use crate::sessions::http_user_session_payload_error::HttpUserSessionPayloadError; use jwt_signer::jwt_signer::JwtSigner; use tokens::tokens::user_sessions::UserSessionToken; use tokens::tokens::users::UserToken; @@ -21,7 +21,7 @@ pub struct HttpUserSessionPayloadSigner { } impl HttpUserSessionPayloadSigner { - pub fn new(hmac_secret: &str) -> Result { + pub fn new(hmac_secret: &str) -> Result { Ok(Self { jwt_signer: JwtSigner::new(hmac_secret)?, }) @@ -31,7 +31,7 @@ impl HttpUserSessionPayloadSigner { &self, session_token: &UserSessionToken, user_token: &UserToken, - ) -> Result { + ) -> Result { let mut claims: BTreeMap<&str, &str> = BTreeMap::new(); let payload_version = PAYLOAD_VERSION.to_string(); @@ -46,7 +46,7 @@ impl HttpUserSessionPayloadSigner { pub fn decode( &self, session_payload_contents: &str, - ) -> Result { + ) -> Result { let claims = self.jwt_signer.jwt_to_claims(session_payload_contents)?; let session_token = claims["session_token"].clone(); diff --git a/crates/lib/actix_artcraft/src/sessions/mod.rs b/crates/lib/actix_artcraft/src/sessions/mod.rs index 12a329779d..bf6c2c7917 100644 --- a/crates/lib/actix_artcraft/src/sessions/mod.rs +++ b/crates/lib/actix_artcraft/src/sessions/mod.rs @@ -1,4 +1,4 @@ pub mod http_user_session_manager; pub mod http_user_session_payload; -pub mod http_user_session_payload_signer; -pub mod session_error; \ No newline at end of file +pub mod http_user_session_payload_error; +pub mod http_user_session_payload_signer; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/advanced_common_web_error.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/advanced_common_web_error.rs index 20940733f9..58da4bc0a3 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/advanced_common_web_error.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/advanced_common_web_error.rs @@ -194,8 +194,8 @@ impl From for AdvancedCommonWebError { } } -impl From for AdvancedCommonWebError { - fn from(_value: actix_artcraft::sessions::session_error::SessionError) -> Self { +impl From for AdvancedCommonWebError { + fn from(_value: actix_artcraft::sessions::http_user_session_payload_error::HttpUserSessionPayloadError) -> Self { // Any session error (bad header, bad JWT, construction failure) becomes 401. Self::NotAuthorized } diff --git a/crates/service/web/storyteller_web/src/http_server/session/session_checker_error.rs b/crates/service/web/storyteller_web/src/http_server/session/session_checker_error.rs index 7f9653a2e1..67da8b9c7d 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/session_checker_error.rs +++ b/crates/service/web/storyteller_web/src/http_server/session/session_checker_error.rs @@ -1,7 +1,7 @@ use std::error::Error; use std::fmt::{Display, Formatter}; -use actix_artcraft::sessions::session_error::SessionError; +use actix_artcraft::sessions::http_user_session_payload_error::HttpUserSessionPayloadError; #[derive(Debug)] pub enum SessionCheckerError { @@ -9,7 +9,7 @@ pub enum SessionCheckerError { /// Rate of failures can point to the cause: /// - One-off errors: probably session forgeries /// - Lots of errors: maybe the wrong hmac secret - Session(SessionError), + Session(HttpUserSessionPayloadError), /// Error looking up the session from the database. Sqlx(sqlx::Error), @@ -30,8 +30,8 @@ impl Display for SessionCheckerError { impl Error for SessionCheckerError {} -impl From for SessionCheckerError { - fn from(err: SessionError) -> Self { +impl From for SessionCheckerError { + fn from(err: HttpUserSessionPayloadError) -> Self { Self::Session(err) } }