mirrors/ntex-extras
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex-extras.git synced 2025-04-03 21:07:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

update ntex

Browse source
This commit is contained in:
Nikolay Kim 2020-07-30 10:42:38 +06:00
parent de001b0f25
commit 27236552ba
8 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ntex-cors/Cargo.toml
View file

@ -4,19 +4,18 @@ version = "0.1.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Cross-origin resource sharing (CORS) for Actix applications."
readme = "README.md"
keywords = ["web", "framework"]
keywords = ["ntex", "web"]
homepage = "https://ntex.rs"
repository = "https://github.com/ntex-rs/ntex-extras.git"
documentation = "https://docs.rs/ntex-cors/"
license = "MIT"
edition = "2018"
workspace = ".."
[lib]
name = "ntex_cors"
path = "src/lib.rs"
[dependencies]
ntex = "0.1.8"
ntex = "0.1.21"
derive_more = "0.99.5"
futures = "0.3.4"

2
ntex-files/Cargo.toml
View file

@ -18,7 +18,7 @@ name = "ntex_files"
path = "src/lib.rs"
[dependencies]
ntex = "0.1.8"
ntex = "0.1.21"
bitflags = "1"
bytes = "0.5.4"
futures = "0.3.4"

6
ntex-files/src/lib.rs
View file

@ -255,7 +255,7 @@ pub struct Files<Err: ErrorRenderer> {
renderer: Rc<DirectoryRenderer>,
mime_override: Option<Rc<MimeOverride>>,
file_flags: named::Flags,
guards: Option<Rc<Box<dyn Guard>>>,
guards: Option<Rc<dyn Guard>>,
}
impl<Err: ErrorRenderer> Clone for Files<Err> {
@ -372,7 +372,7 @@ impl<Err: ErrorRenderer> Files<Err> {
/// Default behaviour allows GET and HEAD.
#[inline]
pub fn use_guards<G: Guard + 'static>(mut self, guards: G) -> Self {
self.guards = Some(Rc::new(Box::new(guards)));
self.guards = Some(Rc::new(guards));
self
}
@ -475,7 +475,7 @@ pub struct FilesService<Err: ErrorRenderer> {
renderer: Rc<DirectoryRenderer>,
mime_override: Option<Rc<MimeOverride>>,
file_flags: named::Flags,
guards: Option<Rc<Box<dyn Guard>>>,
guards: Option<Rc<dyn Guard>>,
}
impl<Err: ErrorRenderer> FilesService<Err>

6
ntex-identity/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Identity service for ntex web framework."
readme = "README.md"
keywords = ["http", "web", "framework", "async", "futures"]
keywords = ["http", "web", "async"]
homepage = "https://ntex.rs"
repository = "https://github.com/ntex-rs/ntex-extras.git"
documentation = "https://docs.rs/ntex-identity/"
@ -21,10 +21,10 @@ default = ["cookie-policy"]
cookie-policy = ["cookie/secure", "ntex/cookie"]
[dependencies]
ntex = "0.1.8"
ntex = "0.1.21"
futures = "0.3.4"
serde = "1.0"
serde_json = "1.0"
cookie = "0.13.3"
cookie = "0.14.2"
derive_more = "0.99.5"
time = { version = "0.2.5", default-features = false, features = ["std"] }

12
ntex-identity/src/lib.rs
View file

@ -354,8 +354,8 @@ impl<Err: ErrorRenderer> CookieIdentityInner<Err> {
fn new(key: &[u8]) -> CookieIdentityInner<Err> {
let key_v2: Vec<u8> = key.iter().chain([1, 0, 0, 0].iter()).cloned().collect();
CookieIdentityInner {
key: Key::from_master(key),
key_v2: Key::from_master(&key_v2),
key: Key::derive_from(key),
key_v2: Key::derive_from(&key_v2),
name: "ntex-identity".to_owned(),
path: "/".to_owned(),
domain: None,
@ -797,7 +797,7 @@ mod tests {
fn legacy_login_cookie(identity: &'static str) -> Cookie<'static> {
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));
jar.get(COOKIE_NAME).unwrap().clone()
}
@ -813,7 +813,7 @@ mod tests {
.chain([1, 0, 0, 0].iter())
.map(|e| *e)
.collect();
jar.private(&Key::from_master(&key)).add(Cookie::new(
jar.private(&Key::derive_from(&key)).add(Cookie::new(
COOKIE_NAME,
serde_json::to_string(&CookieValue {
identity: identity.to_string(),
@ -837,7 +837,7 @@ mod tests {
cookies.add(Cookie::parse(cookie.to_str().unwrap().to_string()).unwrap());
}
let cookie = cookies
.private(&Key::from_master(&COOKIE_KEY_MASTER))
.private(&Key::derive_from(&COOKIE_KEY_MASTER))
.get(COOKIE_NAME)
.unwrap();
assert_eq!(cookie.value(), identity);
@ -870,7 +870,7 @@ mod tests {
.map(|e| *e)
.collect();
let cookie = cookies
.private(&Key::from_master(&key))
.private(&Key::derive_from(&key))
.get(COOKIE_NAME)
.unwrap();
let cv: CookieValue = serde_json::from_str(cookie.value()).unwrap();

4
ntex-multipart/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Multipart support for ntex web framework."
readme = "README.md"
keywords = ["http", "web", "framework", "async", "futures"]
keywords = ["http", "web", "framework", "async", "ntex"]
homepage = "https://ntex.rs"
repository = "https://github.com/ntex-rs/ntex-extras.git"
documentation = "https://docs.rs/ntex-multipart/"
@ -16,7 +16,7 @@ name = "ntex_multipart"
path = "src/lib.rs"
[dependencies]
ntex = "0.1.8"
ntex = "0.1.21"
bytes = "0.5.4"
derive_more = "0.99.5"
httparse = "1.3"

4
ntex-session/Cargo.toml
View file

@ -22,9 +22,9 @@ default = ["cookie-session"]
cookie-session = ["cookie/secure", "ntex/cookie"]
[dependencies]
ntex = "0.1.11"
ntex = "0.1.21"
bytes = "0.5.4"
cookie = "0.13.3"
cookie = "0.14.2"
derive_more = "0.99.5"
futures = "0.3.4"
serde = "1.0"

2
ntex-session/src/cookie.rs
View file

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