refactor(session): extract SessionConfig and add auto-migration
- session/config.rs: add SessionConfig struct that pre-validates all session configuration values, with build_middleware() for infallible middleware construction - session/middleware.rs: expose parse_same_site as pub(crate) - session/storage/redis.rs: derive Clone for RedisSessionStore - main.rs: validate session config before HttpServer loop, use SessionConfig::build_middleware() inside closure; add sqlx::migrate!() call after database connection
This commit is contained in:
+26
-15
@@ -6,6 +6,7 @@ use super::format::{deserialize_session_state, serialize_session_state};
|
||||
use super::interface::{SessionState, SessionStore};
|
||||
use super::utils::generate_session_key;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct RedisSessionStore {
|
||||
redis: AppRedis,
|
||||
}
|
||||
@@ -18,10 +19,12 @@ impl RedisSessionStore {
|
||||
|
||||
impl SessionStore for RedisSessionStore {
|
||||
async fn load(&self, session_key: &SessionKey) -> Result<Option<SessionState>, AppError> {
|
||||
let mut conn = self.redis.get_connection()?;
|
||||
let value: Option<String> = redis::cmd("GET")
|
||||
let mut conn = self.redis.get_connection();
|
||||
let value: Option<String> = redis::Cmd::new()
|
||||
.arg("GET")
|
||||
.arg(session_key.as_ref())
|
||||
.query(&mut *conn.inner_mut())?;
|
||||
.query_async(&mut conn)
|
||||
.await?;
|
||||
|
||||
match value {
|
||||
None => Ok(None),
|
||||
@@ -36,12 +39,14 @@ impl SessionStore for RedisSessionStore {
|
||||
) -> Result<SessionKey, AppError> {
|
||||
let body = serialize_session_state(&session_state)?;
|
||||
let session_key = generate_session_key();
|
||||
let mut conn = self.redis.get_connection()?;
|
||||
redis::cmd("SETEX")
|
||||
let mut conn = self.redis.get_connection();
|
||||
redis::Cmd::new()
|
||||
.arg("SETEX")
|
||||
.arg(session_key.as_ref())
|
||||
.arg(ttl_secs)
|
||||
.arg(&body)
|
||||
.query::<()>(&mut *conn.inner_mut())?;
|
||||
.query_async::<()>(&mut conn)
|
||||
.await?;
|
||||
Ok(session_key)
|
||||
}
|
||||
|
||||
@@ -52,29 +57,35 @@ impl SessionStore for RedisSessionStore {
|
||||
ttl_secs: u64,
|
||||
) -> Result<SessionKey, AppError> {
|
||||
let body = serialize_session_state(&session_state)?;
|
||||
let mut conn = self.redis.get_connection()?;
|
||||
redis::cmd("SETEX")
|
||||
let mut conn = self.redis.get_connection();
|
||||
redis::Cmd::new()
|
||||
.arg("SETEX")
|
||||
.arg(session_key.as_ref())
|
||||
.arg(ttl_secs)
|
||||
.arg(&body)
|
||||
.query::<()>(&mut *conn.inner_mut())?;
|
||||
.query_async::<()>(&mut conn)
|
||||
.await?;
|
||||
Ok(session_key)
|
||||
}
|
||||
|
||||
async fn update_ttl(&self, session_key: &SessionKey, ttl_secs: u64) -> Result<(), AppError> {
|
||||
let mut conn = self.redis.get_connection()?;
|
||||
redis::cmd("EXPIRE")
|
||||
let mut conn = self.redis.get_connection();
|
||||
redis::Cmd::new()
|
||||
.arg("EXPIRE")
|
||||
.arg(session_key.as_ref())
|
||||
.arg(ttl_secs)
|
||||
.query::<()>(&mut *conn.inner_mut())?;
|
||||
.query_async::<()>(&mut conn)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn delete(&self, session_key: &SessionKey) -> Result<(), AppError> {
|
||||
let mut conn = self.redis.get_connection()?;
|
||||
redis::cmd("DEL")
|
||||
let mut conn = self.redis.get_connection();
|
||||
redis::Cmd::new()
|
||||
.arg("DEL")
|
||||
.arg(session_key.as_ref())
|
||||
.query::<()>(&mut *conn.inner_mut())?;
|
||||
.query_async::<()>(&mut conn)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user