diff --git a/src/server.rs b/src/server.rs index f69d200..076003a 100644 --- a/src/server.rs +++ b/src/server.rs @@ -24,7 +24,7 @@ use std::{ str::{from_utf8, Split}, string::ToString, }; -use time::Duration; +use time::OffsetDateTime; use crate::dbg_msg; @@ -169,10 +169,11 @@ impl ResponseExt for Response { } fn remove_cookie(&mut self, name: String) { - let mut cookie = Cookie::from(name); - cookie.set_path("/"); - cookie.set_max_age(Duration::seconds(1)); - if let Ok(val) = header::HeaderValue::from_str(&cookie.to_string()) { + let removal_cookie = Cookie::build(name) + .path("/") + .http_only(true) + .expires(OffsetDateTime::now_utc()); + if let Ok(val) = header::HeaderValue::from_str(&removal_cookie.to_string()) { self.headers_mut().append("Set-Cookie", val); } } diff --git a/src/subreddit.rs b/src/subreddit.rs index a98455d..41aae8b 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -6,6 +6,7 @@ use crate::utils::{ use crate::{client::json, server::ResponseExt, RequestExt}; use cookie::Cookie; use hyper::{Body, Request, Response}; +use rinja::filters::format; use rinja::Template; use once_cell::sync::Lazy; @@ -209,6 +210,39 @@ pub fn can_access_quarantine(req: &Request, sub: &str) -> bool { setting(req, &format!("allow_quaran_{}", sub.to_lowercase())).parse().unwrap_or_default() } +// Join items in chunks of 3500 bytes in length for cookies +fn join_until_size_limit(vec: &[T]) -> Vec { + let mut result = Vec::new(); + let mut list = String::new(); + let mut current_size = 0; + + for item in vec { + // Size in bytes + let item_size = item.to_string().len(); + // Use 3500 bytes to leave us some headroom because the name and options of the cookie count towards the 4096 byte cap + if current_size + item_size > 3500 { + // Push current list to result vector + result.push(list); + + // Do a reset of the variables required to continue + list = String::new(); + current_size = 0; + } + // Add separator if not the first item + if !list.is_empty() { + list.push_str("+"); + } + // Add current item to list + list.push_str(&item.to_string()); + current_size += item_size; + } + // Make sure to push whatever the remaining subreddits are there into the result vector + result.push(list); + + // Return resulting vector + result +} + // Sub, filter, unfilter, or unsub by setting subscription cookie using response "Set-Cookie" header pub async fn subscriptions_filters(req: Request) -> Result, String> { let sub = req.param("sub").unwrap_or_default(); @@ -303,26 +337,54 @@ pub async fn subscriptions_filters(req: Request) -> Result, // Delete cookie if empty, else set if sub_list.is_empty() { - response.remove_cookie("subscriptions".to_string()); + // Start with first subcriptions cookie + let mut subcriptions_number = 1; + + // While whatever subcriptionsNUMBER cookie we're looking at has a value + while req.cookie(&format!("subcriptions{}", subcriptions_number)).is_some() { + // Remove that subcriptions cookie + response.remove_cookie(format!("subcriptions{}", subcriptions_number)); + + // Increment subcriptions cookie number + subcriptions_number += 1; + } } else { - response.insert_cookie( - Cookie::build(("subscriptions", sub_list.join("+"))) - .path("/") - .http_only(true) - .expires(OffsetDateTime::now_utc() + Duration::weeks(52)) - .into(), - ); + let mut subcriptions_number = 1; + for list in join_until_size_limit(&sub_list) { + response.insert_cookie( + Cookie::build((format!("subscriptions{}", subcriptions_number), list)) + .path("/") + .http_only(true) + .expires(OffsetDateTime::now_utc() + Duration::weeks(52)) + .into(), + ); + subcriptions_number += 1; + } } if filters.is_empty() { - response.remove_cookie("filters".to_string()); + // Start with first filters cookie + let mut filters_number = 1; + + // While whatever filtersNUMBER cookie we're looking at has a value + while req.cookie(&format!("filters{}", filters_number)).is_some() { + // Remove that filters cookie + response.remove_cookie(format!("filters{}", filters_number)); + + // Increment filters cookie number + filters_number += 1; + } } else { - response.insert_cookie( - Cookie::build(("filters", filters.join("+"))) - .path("/") - .http_only(true) - .expires(OffsetDateTime::now_utc() + Duration::weeks(52)) - .into(), - ); + let mut filters_number = 1; + for list in join_until_size_limit(&filters) { + response.insert_cookie( + Cookie::build((format!("filters{}", filters_number), list)) + .path("/") + .http_only(true) + .expires(OffsetDateTime::now_utc() + Duration::weeks(52)) + .into(), + ); + filters_number += 1; + } } Ok(response) diff --git a/src/utils.rs b/src/utils.rs index 6f97775..baf7a32 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -9,6 +9,7 @@ use hyper::{Body, Request, Response}; use log::error; use once_cell::sync::Lazy; use regex::Regex; +use rinja::filters::format; use rinja::Template; use rust_embed::RustEmbed; use serde_json::Value; @@ -798,18 +799,58 @@ pub fn param(path: &str, value: &str) -> Option { // Retrieve the value of a setting by name pub fn setting(req: &Request, name: &str) -> String { // Parse a cookie value from request - req - .cookie(name) - .unwrap_or_else(|| { - // If there is no cookie for this setting, try receiving a default from the config - if let Some(default) = get_setting(&format!("REDLIB_DEFAULT_{}", name.to_uppercase())) { - Cookie::new(name, default) - } else { - Cookie::from(name) - } - }) - .value() - .to_string() + + // If this was called with "subscriptions" and the "subscriptions1" cookie has a value + if name == "subscriptions" && req.cookie("subscriptions1").is_some() { + // Create subscriptions string + let mut subscriptions = String::new(); + + // Start with first subscription cookie + let mut subscriptions_number = 1; + + // While whatever subscriptionsNUMBER cookie we're looking at has a value + while req.cookie(&format!("subscriptions{}", subscriptions_number)).is_some() { + // Push whatever subscriptionsNUMBER cookie we're looking at into the subscriptions string + subscriptions.push_str(&req.cookie(&format!("subscriptions{}", subscriptions_number)).unwrap().value().to_string()); + // Increment subscription cookie number + subscriptions_number += 1; + } + + // Return the subscriptions cookies as one large string + subscriptions + } else if name == "filters" && req.cookie("filters1").is_some() { // If this was called with "filters" and the "filters1" cookie has a value + // Create filters string + let mut filters = String::new(); + + // Start with first filters cookie + let mut filters_number = 1; + + // While whatever filtersNUMBER cookie we're looking at has a value + while req.cookie(&format!("filters{}", filters_number)).is_some() { + // Push whatever filtersNUMBER cookie we're looking at into the filters string + filters.push_str(&req.cookie(&format!("filters{}", filters_number)).unwrap().value().to_string()); + // Increment filters cookie number + filters_number += 1; + } + + // Return the filters cookies as one large string + filters + } else { // The above two still come to this if there was no existing value + req + .cookie(name) + .unwrap_or_else(|| { + // If there is no cookie for this setting, try receiving a default from the config + if let Some(default) = get_setting(&format!("REDLIB_DEFAULT_{}", name.to_uppercase())) { + Cookie::new(name, default) + } else { + Cookie::from(name) + } + }) + .value() + .to_string() + } + + } // Retrieve the value of a setting by name or the default value