Compare commits
No commits in common. 'master' and 'session-crate' have entirely different histories.
master
...
session-cr
File diff suppressed because it is too large
Load Diff
@ -1,59 +1,172 @@ |
||||
use serde_json::Value; |
||||
use json_dotpath::DotPaths; |
||||
use parking_lot::RwLock; |
||||
use rand::Rng; |
||||
use rocket::fairing::{self, Fairing, Info}; |
||||
use rocket::request::FromRequest; |
||||
|
||||
use rocket::{ |
||||
http::{Cookie, Status}, |
||||
Outcome, Request, Response, Rocket, State, |
||||
}; |
||||
use serde::de::DeserializeOwned; |
||||
use serde::Serialize; |
||||
use json_dotpath::DotPaths; |
||||
use serde_json::{Map, Value}; |
||||
|
||||
pub type Session<'a> = rocket_session::Session<'a, serde_json::Map<String, Value>>; |
||||
use std::collections::HashMap; |
||||
use std::time::{Instant, Duration}; |
||||
use std::ops::Add; |
||||
|
||||
pub trait SessionAccess { |
||||
fn get<T: DeserializeOwned>(&self, path: &str) -> Option<T>; |
||||
const SESSION_ID: &'static str = "SESSID"; |
||||
|
||||
fn get_or<T: DeserializeOwned>(&self, path: &str, def: T) -> T; |
||||
type SessionsMap = HashMap<String, SessionInstance>; |
||||
|
||||
fn get_or_else<T: DeserializeOwned, F: FnOnce() -> T>(&self, path: &str, def: F) -> T; |
||||
|
||||
fn get_or_default<T: DeserializeOwned + Default>(&self, path: &str) -> T; |
||||
#[derive(Debug)] |
||||
struct SessionInstance { |
||||
data: serde_json::Map<String, Value>, |
||||
expires: Instant, |
||||
} |
||||
|
||||
fn take<T: DeserializeOwned>(&self, path: &str) -> Option<T>; |
||||
#[derive(Default, Debug)] |
||||
pub struct SessionStore { |
||||
inner: RwLock<SessionsMap>, |
||||
lifespan: Duration, |
||||
} |
||||
|
||||
fn replace<O: DeserializeOwned, N: Serialize>(&self, path: &str, new: N) -> Option<O>; |
||||
#[derive(PartialEq, Hash, Clone, Debug)] |
||||
pub struct SessionID(String); |
||||
|
||||
impl<'a, 'r> FromRequest<'a, 'r> for &'a SessionID { |
||||
type Error = (); |
||||
|
||||
fn from_request(request: &'a Request<'r>) -> Outcome<Self, (Status, Self::Error), ()> { |
||||
Outcome::Success(request.local_cache(|| { |
||||
println!("get id"); |
||||
if let Some(cookie) = request.cookies().get(SESSION_ID) { |
||||
println!("from cookie"); |
||||
SessionID(cookie.value().to_string()) // FIXME avoid cloning
|
||||
} else { |
||||
println!("new id"); |
||||
SessionID( |
||||
rand::thread_rng() |
||||
.sample_iter(&rand::distributions::Alphanumeric) |
||||
.take(16) |
||||
.collect(), |
||||
) |
||||
} |
||||
})) |
||||
} |
||||
} |
||||
|
||||
fn set<T: Serialize>(&self, path: &str, value: T); |
||||
#[derive(Debug)] |
||||
pub struct Session<'a> { |
||||
store: State<'a, SessionStore>, |
||||
id: &'a SessionID, |
||||
} |
||||
|
||||
fn remove(&self, path: &str) -> bool; |
||||
impl<'a, 'r> FromRequest<'a, 'r> for Session<'a> { |
||||
type Error = (); |
||||
|
||||
fn from_request(request: &'a Request<'r>) -> Outcome<Self, (Status, Self::Error), ()> { |
||||
Outcome::Success(Session { |
||||
id: request.local_cache(|| { |
||||
if let Some(cookie) = request.cookies().get(SESSION_ID) { |
||||
SessionID(cookie.value().to_string()) |
||||
} else { |
||||
SessionID( |
||||
rand::thread_rng() |
||||
.sample_iter(&rand::distributions::Alphanumeric) |
||||
.take(16) |
||||
.collect(), |
||||
) |
||||
} |
||||
}), |
||||
store: request.guard().unwrap(), |
||||
}) |
||||
} |
||||
} |
||||
|
||||
impl<'a> SessionAccess for Session<'a> { |
||||
fn get<T: DeserializeOwned>(&self, path: &str) -> Option<T> { |
||||
self.tap(|data| data.dot_get(path).unwrap_or_default()) |
||||
impl<'a> Session<'a> { |
||||
pub fn fairing() -> impl Fairing { |
||||
SessionFairing |
||||
} |
||||
|
||||
fn tap<T>(&self, func : impl FnOnce(&mut serde_json::Map<String, Value>) -> T) -> T { |
||||
let mut wg = self.store.inner.write(); |
||||
if let Some(instance) = wg.get_mut(&self.id.0) { |
||||
instance.expires = Instant::now().add(self.store.lifespan); |
||||
func(&mut instance.data) |
||||
} else { |
||||
let mut data = Map::new(); |
||||
let rv = func(&mut data); |
||||
wg.insert(self.id.0.clone(), SessionInstance { |
||||
data: data, |
||||
expires: Instant::now().add(self.store.lifespan), |
||||
}); |
||||
rv |
||||
} |
||||
} |
||||
|
||||
pub fn renew(&self) { |
||||
self.tap(|_| ()) |
||||
} |
||||
|
||||
fn get_or<T: DeserializeOwned>(&self, path: &str, def: T) -> T { |
||||
pub fn reset(&self) { |
||||
self.tap(|data| data.clear()) |
||||
} |
||||
|
||||
pub fn get<T: DeserializeOwned>(&self, path: &str) -> Option<T> { |
||||
self.tap(|data| data.dot_get(path)) |
||||
} |
||||
|
||||
pub fn get_or<T: DeserializeOwned>(&self, path: &str, def: T) -> T { |
||||
self.get(path).unwrap_or(def) |
||||
} |
||||
|
||||
fn get_or_else<T: DeserializeOwned, F: FnOnce() -> T>(&self, path: &str, def: F) -> T { |
||||
pub fn get_or_else<T: DeserializeOwned, F: FnOnce() -> T>(&self, path: &str, def: F) -> T { |
||||
self.get(path).unwrap_or_else(def) |
||||
} |
||||
|
||||
fn get_or_default<T: DeserializeOwned + Default>(&self, path: &str) -> T { |
||||
pub fn get_or_default<T: DeserializeOwned + Default>(&self, path: &str) -> T { |
||||
self.get(path).unwrap_or_default() |
||||
} |
||||
|
||||
fn take<T: DeserializeOwned>(&self, path: &str) -> Option<T> { |
||||
self.tap(|data| data.dot_take(path).unwrap_or_default()) |
||||
pub fn take<T: DeserializeOwned>(&self, path: &str) -> Option<T> { |
||||
self.tap(|data| data.dot_take(path)) |
||||
} |
||||
|
||||
fn replace<O: DeserializeOwned, N: Serialize>(&self, path: &str, new: N) -> Option<O> { |
||||
self.tap(|data| data.dot_replace(path, new).unwrap_or_default()) |
||||
pub fn replace<O: DeserializeOwned, N: Serialize>(&self, path: &str, new: N) -> Option<O> { |
||||
self.tap(|data| data.dot_replace(path, new)) |
||||
} |
||||
|
||||
fn set<T: Serialize>(&self, path: &str, value: T) { |
||||
self.tap(|data| data.dot_set(path, value)).unwrap(); |
||||
pub fn set<T: Serialize>(&self, path: &str, value: T) { |
||||
self.tap(|data| data.dot_set(path, value)); |
||||
} |
||||
|
||||
fn remove(&self, path: &str) -> bool { |
||||
self.tap(|data| { data.dot_remove(path).is_ok() }) |
||||
pub fn remove(&self, path: &str) -> bool { |
||||
self.tap(|data| data.dot_remove(path)) |
||||
} |
||||
} |
||||
|
||||
/// Fairing struct
|
||||
struct SessionFairing; |
||||
|
||||
impl Fairing for SessionFairing { |
||||
fn info(&self) -> Info { |
||||
Info { |
||||
name: "Session Fairing", |
||||
kind: fairing::Kind::Attach | fairing::Kind::Response, |
||||
} |
||||
} |
||||
|
||||
fn on_attach(&self, rocket: Rocket) -> Result<Rocket, Rocket> { |
||||
Ok(rocket.manage(SessionStore::default())) |
||||
} |
||||
|
||||
fn on_response<'r>(&self, request: &'r Request, response: &mut Response) { |
||||
let session = request.local_cache(|| SessionID("".to_string())); |
||||
|
||||
if !session.0.is_empty() { |
||||
response.adjoin_header(Cookie::build(SESSION_ID, session.0.clone()).finish()); |
||||
} |
||||
} |
||||
} |
||||
|
||||
Loading…
Reference in new issue