Add http cache for webfingers (#3317)
* Add http cache for webfingers * Remove the outgoing cache middleware & adjust the cache headers directive * Use 1h & 3day cache header * Update routes and adjust the cache headers location * revert apub caching --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: Felix Ableitner <me@nutomic.com>
This commit is contained in:
parent
2adf7d5008
commit
1f21bdb2f9
5 changed files with 53 additions and 10 deletions
|
@ -20,7 +20,12 @@ use lemmy_db_views_actor::{
|
||||||
person_mention_view::PersonMentionQuery,
|
person_mention_view::PersonMentionQuery,
|
||||||
structs::{CommentReplyView, PersonMentionView},
|
structs::{CommentReplyView, PersonMentionView},
|
||||||
};
|
};
|
||||||
use lemmy_utils::{claims::Claims, error::LemmyError, utils::markdown::markdown_to_html};
|
use lemmy_utils::{
|
||||||
|
cache_header::cache_1hour,
|
||||||
|
claims::Claims,
|
||||||
|
error::LemmyError,
|
||||||
|
utils::markdown::markdown_to_html,
|
||||||
|
};
|
||||||
use once_cell::sync::Lazy;
|
use once_cell::sync::Lazy;
|
||||||
use rss::{
|
use rss::{
|
||||||
extension::dublincore::DublinCoreExtensionBuilder,
|
extension::dublincore::DublinCoreExtensionBuilder,
|
||||||
|
@ -65,10 +70,15 @@ enum RequestType {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||||
cfg
|
cfg.service(
|
||||||
.route("/feeds/{type}/{name}.xml", web::get().to(get_feed))
|
web::scope("/feeds")
|
||||||
.route("/feeds/all.xml", web::get().to(get_all_feed))
|
.route("/{type}/{name}.xml", web::get().to(get_feed))
|
||||||
.route("/feeds/local.xml", web::get().to(get_local_feed));
|
.route("/all.xml", web::get().to(get_all_feed).wrap(cache_1hour()))
|
||||||
|
.route(
|
||||||
|
"/local.xml",
|
||||||
|
web::get().to(get_local_feed).wrap(cache_1hour()),
|
||||||
|
),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static RSS_NAMESPACE: Lazy<BTreeMap<String, String>> = Lazy::new(|| {
|
static RSS_NAMESPACE: Lazy<BTreeMap<String, String>> = Lazy::new(|| {
|
||||||
|
|
|
@ -3,14 +3,24 @@ use anyhow::anyhow;
|
||||||
use lemmy_api_common::context::LemmyContext;
|
use lemmy_api_common::context::LemmyContext;
|
||||||
use lemmy_db_schema::RegistrationMode;
|
use lemmy_db_schema::RegistrationMode;
|
||||||
use lemmy_db_views::structs::SiteView;
|
use lemmy_db_views::structs::SiteView;
|
||||||
use lemmy_utils::{error::LemmyError, version};
|
use lemmy_utils::{
|
||||||
|
cache_header::{cache_1hour, cache_3days},
|
||||||
|
error::LemmyError,
|
||||||
|
version,
|
||||||
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||||
cfg
|
cfg
|
||||||
.route("/nodeinfo/2.0.json", web::get().to(node_info))
|
.route(
|
||||||
.route("/.well-known/nodeinfo", web::get().to(node_info_well_known));
|
"/nodeinfo/2.0.json",
|
||||||
|
web::get().to(node_info).wrap(cache_1hour()),
|
||||||
|
)
|
||||||
|
.route(
|
||||||
|
"/.well-known/nodeinfo",
|
||||||
|
web::get().to(node_info_well_known).wrap(cache_3days()),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn node_info_well_known(
|
async fn node_info_well_known(
|
||||||
|
|
|
@ -8,7 +8,7 @@ use lemmy_db_schema::{
|
||||||
source::{community::Community, person::Person},
|
source::{community::Community, person::Person},
|
||||||
traits::ApubActor,
|
traits::ApubActor,
|
||||||
};
|
};
|
||||||
use lemmy_utils::error::LemmyError;
|
use lemmy_utils::{cache_header::cache_3days, error::LemmyError};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
@ -21,7 +21,7 @@ struct Params {
|
||||||
pub fn config(cfg: &mut web::ServiceConfig) {
|
pub fn config(cfg: &mut web::ServiceConfig) {
|
||||||
cfg.route(
|
cfg.route(
|
||||||
".well-known/webfinger",
|
".well-known/webfinger",
|
||||||
web::get().to(get_webfinger_response),
|
web::get().to(get_webfinger_response).wrap(cache_3days()),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
22
crates/utils/src/cache_header.rs
Normal file
22
crates/utils/src/cache_header.rs
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
use actix_web::middleware::DefaultHeaders;
|
||||||
|
|
||||||
|
/// Adds a cache header to requests
|
||||||
|
///
|
||||||
|
/// Common cache amounts are:
|
||||||
|
/// * 1 hour = 60s * 60m = `3600` seconds
|
||||||
|
/// * 3 days = 60s * 60m * 24h * 3d = `259200` seconds
|
||||||
|
///
|
||||||
|
/// Mastodon & other activitypub server defaults to 3d
|
||||||
|
pub fn cache_header(seconds: usize) -> DefaultHeaders {
|
||||||
|
DefaultHeaders::new().add(("Cache-Control", format!("public, max-age={seconds}")))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set a 1 hour cache time
|
||||||
|
pub fn cache_1hour() -> DefaultHeaders {
|
||||||
|
cache_header(3600)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Set a 3 day cache time
|
||||||
|
pub fn cache_3days() -> DefaultHeaders {
|
||||||
|
cache_header(259200)
|
||||||
|
}
|
|
@ -4,6 +4,7 @@ extern crate strum_macros;
|
||||||
extern crate smart_default;
|
extern crate smart_default;
|
||||||
|
|
||||||
pub mod apub;
|
pub mod apub;
|
||||||
|
pub mod cache_header;
|
||||||
pub mod email;
|
pub mod email;
|
||||||
pub mod rate_limit;
|
pub mod rate_limit;
|
||||||
pub mod settings;
|
pub mod settings;
|
||||||
|
|
Loading…
Reference in a new issue