grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add timeout for sending activities (#2112)

Browse source 
* Add timeout for sending activities

* Also set request timeouts in utils/src/request.rs
This commit is contained in:
Nutomic 2022-03-03 18:40:10 +00:00 committed by GitHub
parent 46e937d6e6
commit fa29ffade1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/apub_lib/src/signatures.rs
View file

@ -15,7 +15,7 @@ use reqwest::Response;
use reqwest_middleware::ClientWithMiddleware; use reqwest_middleware::ClientWithMiddleware;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use std::str::FromStr; use std::{str::FromStr, time::Duration};
use tracing::debug; use tracing::debug;
use url::Url; use url::Url;
@ -46,6 +46,8 @@ pub async fn sign_and_send(
let request = client let request = client
.post(&inbox_url.to_string()) .post(&inbox_url.to_string())
// signature is only valid for 10 seconds, so no reason to wait any longer
.timeout(Duration::from_secs(10))
.headers(headers) .headers(headers)
.signature_with_digest( .signature_with_digest(
HTTP_SIG_CONFIG.clone(), HTTP_SIG_CONFIG.clone(),

20
crates/utils/src/request.rs
View file

@ -4,7 +4,7 @@ use encoding::{all::encodings, DecoderTrap};
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC}; use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
use reqwest_middleware::ClientWithMiddleware; use reqwest_middleware::ClientWithMiddleware;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::future::Future; use std::{future::Future, time::Duration};
use thiserror::Error; use thiserror::Error;
use tracing::{error, info}; use tracing::{error, info};
use url::Url; use url::Url;
@ -69,7 +69,11 @@ pub async fn fetch_site_metadata(
url: &Url, url: &Url,
) -> Result<SiteMetadata, LemmyError> { ) -> Result<SiteMetadata, LemmyError> {
info!("Fetching site metadata for url: {}", url); info!("Fetching site metadata for url: {}", url);
let response = client.get(url.as_str()).send().await?; let response = client
.get(url.as_str())
.timeout(Duration::from_secs(30))
.send()
.await?;
// Can't use .text() here, because it only checks the content header, not the actual bytes // Can't use .text() here, because it only checks the content header, not the actual bytes
// https://github.com/LemmyNet/lemmy/issues/1964 // https://github.com/LemmyNet/lemmy/issues/1964
@ -177,7 +181,11 @@ pub(crate) async fn fetch_pictrs(
utf8_percent_encode(image_url.as_str(), NON_ALPHANUMERIC) // TODO this might not be needed utf8_percent_encode(image_url.as_str(), NON_ALPHANUMERIC) // TODO this might not be needed
); );
let response = client.get(&fetch_url).send().await?; let response = client
.get(&fetch_url)
.timeout(Duration::from_secs(30))
.send()
.await?;
let response: PictrsResponse = response let response: PictrsResponse = response
.json() .json()
@ -249,7 +257,11 @@ pub async fn fetch_site_data(
#[tracing::instrument(skip_all)] #[tracing::instrument(skip_all)]
async fn is_image_content_type(client: &ClientWithMiddleware, url: &Url) -> Result<(), LemmyError> { async fn is_image_content_type(client: &ClientWithMiddleware, url: &Url) -> Result<(), LemmyError> {
let response = client.get(url.as_str()).send().await?; let response = client
.get(url.as_str())
.timeout(Duration::from_secs(30))
.send()
.await?;
if response if response
.headers() .headers()
.get("Content-Type") .get("Content-Type")