FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Set connect timeout to 30 secs in fetcher module

Browse source
This commit is contained in:
silverpill 2022-07-14 17:40:34 +00:00
parent 9aa9130d05
commit 85899e020f
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/activitypub/deliverer.rs
View file

@ -59,7 +59,6 @@ async fn send_activity(
inbox_url, inbox_url,
); );
} else { } else {
// Default timeout is 30s
let response = request.send().await?; let response = request.send().await?;
let response_status = response.status(); let response_status = response.status();
let response_text = response.text().await?; let response_text = response.text().await?;

19
src/activitypub/fetcher/fetchers.rs
View file

@ -1,6 +1,7 @@
use std::path::Path; use std::path::Path;
use std::time::Duration;
use reqwest::Method; use reqwest::{Client, Method};
use serde_json::Value; use serde_json::Value;
use crate::activitypub::activity::Object; use crate::activitypub::activity::Object;
@ -11,6 +12,8 @@ use crate::http_signatures::create::{create_http_signature, SignatureError};
use crate::utils::files::{save_file, FileError}; use crate::utils::files::{save_file, FileError};
use crate::webfinger::types::JsonResourceDescriptor; use crate::webfinger::types::JsonResourceDescriptor;
const FETCHER_CONNECTION_TIMEOUT: u64 = 30;
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
pub enum FetchError { pub enum FetchError {
#[error(transparent)] #[error(transparent)]
@ -29,13 +32,20 @@ pub enum FetchError {
OtherError(&'static str), OtherError(&'static str),
} }
fn build_client() -> reqwest::Result<Client> {
let connect_timeout = Duration::from_secs(FETCHER_CONNECTION_TIMEOUT);
Client::builder()
.connect_timeout(connect_timeout)
.build()
}
/// Sends GET request to fetch AP object /// Sends GET request to fetch AP object
async fn send_request( async fn send_request(
instance: &Instance, instance: &Instance,
url: &str, url: &str,
query_params: &[(&str, &str)], query_params: &[(&str, &str)],
) -> Result<String, FetchError> { ) -> Result<String, FetchError> {
let client = reqwest::Client::new(); let client = build_client()?;
let mut request_builder = client.get(url); let mut request_builder = client.get(url);
if !query_params.is_empty() { if !query_params.is_empty() {
request_builder = request_builder.query(query_params); request_builder = request_builder.query(query_params);
@ -73,7 +83,8 @@ pub async fn fetch_file(
url: &str, url: &str,
output_dir: &Path, output_dir: &Path,
) -> Result<(String, Option<String>), FetchError> { ) -> Result<(String, Option<String>), FetchError> {
let response = reqwest::get(url).await?; let client = build_client()?;
let response = client.get(url).send().await?;
let file_data = response.bytes().await?; let file_data = response.bytes().await?;
let (file_name, media_type) = save_file(file_data.to_vec(), output_dir)?; let (file_name, media_type) = save_file(file_data.to_vec(), output_dir)?;
Ok((file_name, media_type)) Ok((file_name, media_type))
@ -89,7 +100,7 @@ pub async fn perform_webfinger_query(
"https://{}/.well-known/webfinger", "https://{}/.well-known/webfinger",
actor_address.instance, actor_address.instance,
); );
let client = reqwest::Client::new(); let client = build_client()?;
let mut request_builder = client.get(&webfinger_url); let mut request_builder = client.get(&webfinger_url);
if !instance.is_private { if !instance.is_private {
// Public instance should set User-Agent header // Public instance should set User-Agent header