Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tentative changes for async-session v4 #232

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

tentative changes for async-session v4 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ aead = "0.5"
aes-gcm = "0.10"
anyhow = "1"
async-compression = "0.3"
async-session = "3"
async-session = { git = "https://github.com/http-rs/async-session", branch = "overhaul-session-and-session-store" }
async-trait = "0.1"
base64 = "0.21"
bytes = "1"
Expand Down
3 changes: 3 additions & 0 deletions crates/session/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
async-session.workspace = true
base64.workspace = true
sha2.workspace = true
hmac.workspace = true
cookie = { workspace = true, features = ["percent-encode", "signed"] }
salvo_core = { workspace = true, default-features = false }
tracing.workspace = true
Expand Down
26 changes: 14 additions & 12 deletions crates/session/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ pub use async_session::{CookieStore, MemoryStore, Session, SessionStore};
use std::fmt::{self, Formatter};
use std::time::Duration;

use async_session::base64;
use async_session::hmac::{Hmac, Mac, NewMac};
use async_session::sha2::Sha256;
use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
use cookie::{Cookie, Key, SameSite};
use hmac::{Hmac, Mac};
use salvo_core::http::uri::Scheme;
use salvo_core::{async_trait, Depot, Error, FlowCtrl, Handler, Request, Response};
use sha2::{digest::generic_array::GenericArray, Sha256};

/// Key for store data in depot.
pub const SESSION_KEY: &str = "::salvo::session";
Expand Down Expand Up @@ -131,7 +131,7 @@ pub struct HandlerBuilder<S> {
key: Key,
fallback_keys: Vec<Key>,
}
impl<S: SessionStore> fmt::Debug for HandlerBuilder<S> {
impl<S: SessionStore + fmt::Debug> fmt::Debug for HandlerBuilder<S> {
#[inline]
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
f.debug_struct("HandlerBuilder")
Expand All @@ -150,7 +150,7 @@ impl<S: SessionStore> fmt::Debug for HandlerBuilder<S> {

impl<S> HandlerBuilder<S>
where
S: SessionStore,
S: SessionStore + Send + Sync + 'static,
{
/// Create new `HandlerBuilder`
#[inline]
Expand Down Expand Up @@ -291,7 +291,7 @@ pub struct SessionHandler<S> {
hmac: Hmac<Sha256>,
fallback_hmacs: Vec<Hmac<Sha256>>,
}
impl<S: SessionStore> fmt::Debug for SessionHandler<S> {
impl<S: SessionStore + fmt::Debug> fmt::Debug for SessionHandler<S> {
#[inline]
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
f.debug_struct("SessionHandler")
Expand All @@ -310,7 +310,7 @@ impl<S: SessionStore> fmt::Debug for SessionHandler<S> {
#[async_trait]
impl<S> Handler for SessionHandler<S>
where
S: SessionStore,
S: SessionStore + Send + Sync + 'static,
{
async fn handle(&self, req: &mut Request, depot: &mut Depot, res: &mut Response, ctrl: &mut FlowCtrl) {
let cookie = req.cookies().get(&self.cookie_name);
Expand Down Expand Up @@ -354,7 +354,7 @@ where

impl<S> SessionHandler<S>
where
S: SessionStore,
S: SessionStore + Send + Sync + 'static,
{
/// Create new `HandlerBuilder`
pub fn builder(store: S, secret: &[u8]) -> HandlerBuilder<S> {
Expand Down Expand Up @@ -382,18 +382,20 @@ where

// Split [MAC | original-value] into its two parts.
let (digest_str, value) = cookie_value.split_at(BASE64_DIGEST_LEN);
let digest = base64::decode(digest_str).map_err(|_| Error::Other("bad base64 digest".into()))?;
let digest = BASE64
.decode(digest_str)
.map_err(|_| Error::Other("bad base64 digest".into()))?;

// Perform the verification.
let mut hmac = self.hmac.clone();
hmac.update(value.as_bytes());
if hmac.verify(&digest).is_ok() {
if hmac.verify(GenericArray::from_slice(&digest)).is_ok() {
return Ok(value.to_string());
}
for hmac in &self.fallback_hmacs {
let mut hmac = hmac.clone();
hmac.update(value.as_bytes());
if hmac.verify(&digest).is_ok() {
if hmac.verify(GenericArray::from_slice(&digest)).is_ok() {
return Ok(value.to_string());
}
}
Expand Down Expand Up @@ -430,7 +432,7 @@ where
mac.update(cookie.value().as_bytes());

// Cookie's new value is [MAC | original-value].
let mut new_value = base64::encode(mac.finalize().into_bytes());
let mut new_value = BASE64.encode(mac.finalize().into_bytes());
new_value.push_str(cookie.value());
cookie.set_value(new_value);
}
Expand Down