actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-01-22 23:05:56 +01:00
Code Issues Releases Wiki Activity

Replace deprecated from_master with derive_from (#82)

Browse Source
This commit is contained in:
Yuki Okushi 2020-07-14 19:15:30 +09:00 committed by GitHub
parent 39fe80df40
commit 2a20ce4568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actix-identity/src/lib.rs
View File

@ -341,8 +341,8 @@ impl CookieIdentityInner {
fn new(key: &[u8]) -> CookieIdentityInner { fn new(key: &[u8]) -> CookieIdentityInner {
let key_v2: Vec<u8> = key.iter().chain([1, 0, 0, 0].iter()).cloned().collect(); let key_v2: Vec<u8> = key.iter().chain([1, 0, 0, 0].iter()).cloned().collect();
CookieIdentityInner { CookieIdentityInner {
key: Key::from_master(key), key: Key::derive_from(key),
key_v2: Key::from_master(&key_v2), key_v2: Key::derive_from(&key_v2),
name: "actix-identity".to_owned(), name: "actix-identity".to_owned(),
path: "/".to_owned(), path: "/".to_owned(),
domain: None, domain: None,
@ -765,7 +765,7 @@ mod tests {
fn legacy_login_cookie(identity: &'static str) -> Cookie<'static> { fn legacy_login_cookie(identity: &'static str) -> Cookie<'static> {
let mut jar = CookieJar::new(); let mut jar = CookieJar::new();
jar.private(&Key::from_master(&COOKIE_KEY_MASTER)) jar.private(&Key::derive_from(&COOKIE_KEY_MASTER))
.add(Cookie::new(COOKIE_NAME, identity)); .add(Cookie::new(COOKIE_NAME, identity));
jar.get(COOKIE_NAME).unwrap().clone() jar.get(COOKIE_NAME).unwrap().clone()
} }
@ -781,7 +781,7 @@ mod tests {
.chain([1, 0, 0, 0].iter()) .chain([1, 0, 0, 0].iter())
.copied() .copied()
.collect(); .collect();
jar.private(&Key::from_master(&key)).add(Cookie::new( jar.private(&Key::derive_from(&key)).add(Cookie::new(
COOKIE_NAME, COOKIE_NAME,
serde_json::to_string(&CookieValue { serde_json::to_string(&CookieValue {
identity: identity.to_string(), identity: identity.to_string(),
@ -805,7 +805,7 @@ mod tests {
cookies.add(Cookie::parse(cookie.to_str().unwrap().to_string()).unwrap()); cookies.add(Cookie::parse(cookie.to_str().unwrap().to_string()).unwrap());
} }
let cookie = cookies let cookie = cookies
.private(&Key::from_master(&COOKIE_KEY_MASTER)) .private(&Key::derive_from(&COOKIE_KEY_MASTER))
.get(COOKIE_NAME) .get(COOKIE_NAME)
.unwrap(); .unwrap();
assert_eq!(cookie.value(), identity); assert_eq!(cookie.value(), identity);
@ -840,7 +840,7 @@ mod tests {
.copied() .copied()
.collect(); .collect();
let cookie = cookies let cookie = cookies
.private(&Key::from_master(&key)) .private(&Key::derive_from(&key))
.get(COOKIE_NAME) .get(COOKIE_NAME)
.unwrap(); .unwrap();
let cv: CookieValue = serde_json::from_str(cookie.value()).unwrap(); let cv: CookieValue = serde_json::from_str(cookie.value()).unwrap();

2
actix-redis/src/session.rs
View File

@ -32,7 +32,7 @@ impl RedisSession {
/// * `addr` - address of the redis server /// * `addr` - address of the redis server
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::derive_from(key),
cache_keygen: Box::new(|key: &str| format!("session:{}", &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),

2
actix-session/src/cookie.rs
View File

@ -67,7 +67,7 @@ impl CookieSessionInner {
fn new(key: &[u8], security: CookieSecurity) -> CookieSessionInner { fn new(key: &[u8], security: CookieSecurity) -> CookieSessionInner {
CookieSessionInner { CookieSessionInner {
security, security,
key: Key::from_master(key), key: Key::derive_from(key),
name: "actix-session".to_owned(), name: "actix-session".to_owned(),
path: "/".to_owned(), path: "/".to_owned(),
domain: None, domain: None,