actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-02-02 10:59:03 +01:00
Code Issues Releases Wiki Activity

Merge pull request #32 from Dowwie/master

Browse Source 
introduced configurable cache_key strategy. updated some deps
This commit is contained in:
Darin 2019-09-25 08:14:05 -04:00 committed by GitHub
commit 7f7962663d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.toml
View File

@ -41,16 +41,16 @@ redis-async = "0.4.5"
time = "0.1.42" time = "0.1.42"
# actix web session # actix web session
actix-web = { version = "1.0.3", optional = true } actix-web = { version = "1.0.7", optional = true }
actix-utils = { version = "0.4.5", optional = true } actix-utils = { version = "0.4.5", optional = true }
actix-service = { version = "0.4.1", optional = true } actix-service = { version = "0.4.2", optional = true }
actix-session = { version = "0.2.0", optional = true } actix-session = { version = "0.2.0", optional = true }
rand = { version = "0.7.0", optional = true } rand = { version = "0.7.0", optional = true }
serde = { version = "1.0.94", optional = true , features = ["derive"]} serde = { version = "1.0.101", optional = true, features = ["derive"] }
serde_json = { version = "1.0.40", optional = true } serde_json = { version = "1.0.40", optional = true }
env_logger = "0.6.2" env_logger = "0.6.2"
actix-http-test = "0.2.2" actix-http-test = "0.2.5"
actix-http = "0.2.6" actix-http = "0.2.10"
[dev-dependencies] [dev-dependencies]
env_logger = "0.6" env_logger = "0.6"

20
src/session.rs
View File

@ -32,6 +32,7 @@ impl RedisSession {
pub fn new<S: Into<String>>(addr: S, key: &[u8]) -> RedisSession { pub fn new<S: Into<String>>(addr: S, key: &[u8]) -> RedisSession {
RedisSession(Rc::new(Inner { RedisSession(Rc::new(Inner {
key: Key::from_master(key), key: Key::from_master(key),
cache_keygen: Box::new(|key: &str| format!("session:{}", &key)),
ttl: "7200".to_owned(), ttl: "7200".to_owned(),
addr: RedisActor::start(addr), addr: RedisActor::start(addr),
name: "actix-session".to_owned(), name: "actix-session".to_owned(),
@ -86,6 +87,11 @@ impl RedisSession {
Rc::get_mut(&mut self.0).unwrap().same_site = Some(same_site); Rc::get_mut(&mut self.0).unwrap().same_site = Some(same_site);
self self
} }
pub fn cache_keygen(mut self, keygen: Box<dyn Fn(&str) -> String>) -> Self {
Rc::get_mut(&mut self.0).unwrap().cache_keygen = keygen;
self
}
} }
impl<S, B> Transform<S> for RedisSession impl<S, B> Transform<S> for RedisSession
@ -126,7 +132,7 @@ where
type Request = ServiceRequest; type Request = ServiceRequest;
type Response = ServiceResponse<B>; type Response = ServiceResponse<B>;
type Error = Error; type Error = Error;
type Future = Box<Future<Item = Self::Response, Error = Self::Error>>; type Future = Box<dyn Future<Item = Self::Response, Error = Self::Error>>;
fn poll_ready(&mut self) -> Poll<(), Self::Error> { fn poll_ready(&mut self) -> Poll<(), Self::Error> {
self.service.borrow_mut().poll_ready() self.service.borrow_mut().poll_ready()
@ -198,6 +204,7 @@ where
struct Inner { struct Inner {
key: Key, key: Key,
cache_keygen: Box<dyn Fn(&str) -> String>,
ttl: String, ttl: String,
addr: Addr<RedisActor>, addr: Addr<RedisActor>,
name: String, name: String,
@ -221,9 +228,10 @@ impl Inner {
jar.add_original(cookie.clone()); jar.add_original(cookie.clone());
if let Some(cookie) = jar.signed(&self.key).get(&self.name) { if let Some(cookie) = jar.signed(&self.key).get(&self.name) {
let value = cookie.value().to_owned(); let value = cookie.value().to_owned();
let cachekey = (self.cache_keygen)(&cookie.value());
return Either::A( return Either::A(
self.addr self.addr
.send(Command(resp_array!["GET", cookie.value()])) .send(Command(resp_array!["GET", cachekey]))
.map_err(Error::from) .map_err(Error::from)
.and_then(move |res| match res { .and_then(move |res| match res {
Ok(val) => { Ok(val) => {
@ -303,12 +311,14 @@ impl Inner {
(value, Some(jar)) (value, Some(jar))
}; };
let cachekey = (self.cache_keygen)(&value);
let state: HashMap<_, _> = state.collect(); let state: HashMap<_, _> = state.collect();
match serde_json::to_string(&state) { match serde_json::to_string(&state) {
Err(e) => Either::A(err(e.into())), Err(e) => Either::A(err(e.into())),
Ok(body) => Either::B( Ok(body) => Either::B(
self.addr self.addr
.send(Command(resp_array!["SET", value, body, "EX", &self.ttl])) .send(Command(resp_array!["SET", cachekey, body, "EX", &self.ttl]))
.map_err(Error::from) .map_err(Error::from)
.and_then(move |redis_result| match redis_result { .and_then(move |redis_result| match redis_result {
Ok(_) => { Ok(_) => {
@ -329,8 +339,10 @@ impl Inner {
/// removes cache entry /// removes cache entry
fn clear_cache(&self, key: String) -> impl Future<Item = (), Error = Error> { fn clear_cache(&self, key: String) -> impl Future<Item = (), Error = Error> {
let cachekey = (self.cache_keygen)(&key);
self.addr self.addr
.send(Command(resp_array!["DEL", key])) .send(Command(resp_array!["DEL", cachekey]))
.map_err(Error::from) .map_err(Error::from)
.and_then(|res| { .and_then(|res| {
match res { match res {