From ac93ee7cdb9a31cbd4448c3146fcff1ce40ce216 Mon Sep 17 00:00:00 2001
From: bugong <1761869346@qq.com>
Date: Sat, 23 Jun 2018 12:17:37 +0800
Subject: [PATCH 1/2] custom cookie

---
 Cargo.toml     |  1 +
 src/lib.rs     |  1 +
 src/session.rs | 62 +++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c12075685..a25f2a96e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,6 +36,7 @@ futures = "0.1"
 tokio-io = "0.1"
 tokio-core = "0.1"
 redis-async = "0.0"
+time = "0.1"
 
 # actix web session
 actix-web = { version="0.6", optional=true }
diff --git a/src/lib.rs b/src/lib.rs
index 71a2c86a9..52cb761f5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,6 +18,7 @@ extern crate log;
 extern crate redis_async;
 #[macro_use]
 extern crate failure;
+extern crate time;
 
 mod redis;
 pub use redis::{Command, RedisActor};
diff --git a/src/session.rs b/src/session.rs
index 011f1ad58..285a7280a 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -6,13 +6,14 @@ use actix::prelude::*;
 use actix_web::middleware::session::{SessionBackend, SessionImpl};
 use actix_web::middleware::Response as MiddlewareResponse;
 use actix_web::{error, Error, HttpRequest, HttpResponse, Result};
-use cookie::{Cookie, CookieJar, Key};
+use cookie::{Cookie, CookieJar, Key, SameSite};
 use futures::future::{err as FutErr, ok as FutOk, Either};
 use futures::Future;
 use http::header::{self, HeaderValue};
 use rand::{self, Rng};
 use redis_async::resp::RespValue;
 use serde_json;
+use time::Duration;
 
 use redis::{Command, RedisActor};
 
@@ -79,6 +80,11 @@ impl RedisSessionBackend {
             ttl: "7200".to_owned(),
             addr: RedisActor::start(addr),
             name: "actix-session".to_owned(),
+            path: "/".to_owned(),
+            domain: None,
+            secure: false,
+            max_age: None,
+            same_site: None,
         }))
     }
 
@@ -93,6 +99,38 @@ impl RedisSessionBackend {
         Rc::get_mut(&mut self.0).unwrap().name = name.to_owned();
         self
     }
+
+    /// Set custom cookie path
+    pub fn cookie_path(mut self, path: &str) -> Self {
+        Rc::get_mut(&mut self.0).unwrap().path = path.to_owned();
+        self
+    }
+
+    /// Set custom cookie domain
+    pub fn cookie_domain(mut self, domain: &str) -> Self {
+        Rc::get_mut(&mut self.0).unwrap().domain = Some(domain.to_owned());
+        self
+    }
+
+    /// Set custom cookie secure
+    /// If the `secure` field is set, a cookie will only be transmitted when the
+    /// connection is secure - i.e. `https`
+    pub fn cookie_secure(mut self, secure: bool) -> Self {
+        Rc::get_mut(&mut self.0).unwrap().secure = secure;
+        self
+    }
+
+    /// Set custom cookie max-age
+    pub fn cookie_max_age(mut self, max_age: Duration) -> Self {
+        Rc::get_mut(&mut self.0).unwrap().max_age = Some(max_age);
+        self
+    }
+
+    /// Set custom cookie SameSite
+    pub fn cookie_same_site(mut self, same_site: SameSite) -> Self {
+        Rc::get_mut(&mut self.0).unwrap().same_site = Some(same_site);
+        self
+    }
 }
 
 impl<S> SessionBackend<S> for RedisSessionBackend {
@@ -125,8 +163,13 @@ impl<S> SessionBackend<S> for RedisSessionBackend {
 struct Inner {
     key: Key,
     ttl: String,
-    name: String,
     addr: Addr<Unsync, RedisActor>,
+    name: String,
+    path: String,
+    domain: Option<String>,
+    secure: bool,
+    max_age: Option<Duration>,
+    same_site: Option<SameSite>,
 }
 
 impl Inner {
@@ -197,9 +240,22 @@ impl Inner {
             let value = String::from_iter(rng.gen_ascii_chars().take(32));
 
             let mut cookie = Cookie::new(self.name.clone(), value.clone());
-            cookie.set_path("/");
+            cookie.set_path(self.path.clone());
+            cookie.set_secure(self.secure);
             cookie.set_http_only(true);
 
+            if let Some(ref domain) = self.domain {
+                cookie.set_domain(domain.clone());
+            }
+
+            if let Some(max_age) = self.max_age {
+                cookie.set_max_age(max_age);
+            }
+
+            if let Some(same_site) = self.same_site {
+                cookie.set_same_site(same_site);
+            }
+
             // set cookie
             let mut jar = CookieJar::new();
             jar.signed(&self.key).add(cookie);

From 0e2a4a97fdf8678d267b5bd38cb175ba882bcdd9 Mon Sep 17 00:00:00 2001
From: bugong <1761869346@qq.com>
Date: Sat, 23 Jun 2018 16:31:00 +0800
Subject: [PATCH 2/2] set max-age default value

---
 src/session.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/session.rs b/src/session.rs
index 285a7280a..77e41d69f 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -83,7 +83,7 @@ impl RedisSessionBackend {
             path: "/".to_owned(),
             domain: None,
             secure: false,
-            max_age: None,
+            max_age: Some(Duration::days(7)),
             same_site: None,
         }))
     }