Fix retry infinite loops. Fixes #1964

crates/apub/src/fetcher/webfinger.rs

@@ -7,7 +7,7 @@ use lemmy_apub_lib::{
 };
 use lemmy_db_schema::newtypes::DbUrl;
 use lemmy_utils::{
-  request::{retry, RecvError},
+  request::{retry, RecvError, RETRY_LIMIT},
   LemmyError,
 };
 use lemmy_websocket::LemmyContext;
@@ -81,6 +81,11 @@ where
   );
   debug!("Fetching webfinger url: {}", &fetch_url);
 
+  *request_counter += 1;
+  if *request_counter > RETRY_LIMIT {
+    return Err(LemmyError::from(anyhow!("Request retry limit reached")));
+  }
+
   let response = retry(|| context.client().get(&fetch_url).send()).await?;
 
   let res: WebfingerResponse = response

crates/apub_lib/src/object_id.rs

@@ -3,7 +3,7 @@ use activitystreams::chrono::{Duration as ChronoDuration, NaiveDateTime, Utc};
 use anyhow::anyhow;
 use diesel::NotFound;
 use lemmy_utils::{
-  request::{build_user_agent, retry},
+  request::{build_user_agent, retry, RETRY_LIMIT},
   settings::structs::Settings,
   LemmyError,
 };
@@ -18,10 +18,6 @@ use std::{
 use tracing::info;
 use url::Url;
 
-/// Maximum number of HTTP requests allowed to handle a single incoming activity (or a single object
-/// fetch through the search). This should be configurable.
-static REQUEST_LIMIT: i32 = 25;
-
 static CLIENT: Lazy<Client> = Lazy::new(|| {
   Client::builder()
     .user_agent(build_user_agent(&Settings::get()))
@@ -119,8 +115,8 @@ where
     info!("Fetching remote object {}", self.to_string());
 
     *request_counter += 1;
-    if *request_counter > REQUEST_LIMIT {
-      return Err(LemmyError::from(anyhow!("Request limit reached")));
+    if *request_counter > RETRY_LIMIT {
+      return Err(LemmyError::from(anyhow!("Request retry limit reached")));
     }
 
     let res = retry(|| {

crates/utils/src/request.rs

@@ -17,6 +17,10 @@ struct SendError(pub String);
 #[error("Error receiving response, {0}")]
 pub struct RecvError(pub String);
 
+/// Maximum number of HTTP requests allowed to handle a single incoming activity (or a single object
+/// fetch through the search). This should be configurable.
+pub static RETRY_LIMIT: i32 = 25;
+
 pub async fn retry<F, Fut, T>(f: F) -> Result<T, reqwest::Error>
 where
   F: Fn() -> Fut,
@@ -58,7 +62,7 @@ pub struct SiteMetadata {
 
 /// Fetches the post link html tags (like title, description, image, etc)
 pub async fn fetch_site_metadata(client: &Client, url: &Url) -> Result<SiteMetadata, LemmyError> {
-  let response = retry(|| client.get(url.as_str()).send()).await?;
+  let response = client.get(url.as_str()).send().await?;
 
   let html = response
     .text()
@@ -132,7 +136,7 @@ pub(crate) async fn fetch_pictrs(
       utf8_percent_encode(image_url.as_str(), NON_ALPHANUMERIC) // TODO this might not be needed
     );
 
-    let response = retry(|| client.get(&fetch_url).send()).await?;
+    let response = client.get(&fetch_url).send().await?;
 
     let response: PictrsResponse = response
       .json()
@@ -201,8 +205,8 @@ pub async fn fetch_site_data(
   }
 }
 
-async fn is_image_content_type(client: &Client, test: &Url) -> Result<(), LemmyError> {
-  let response = retry(|| client.get(test.to_owned()).send()).await?;
+async fn is_image_content_type(client: &Client, url: &Url) -> Result<(), LemmyError> {
+  let response = client.get(url.as_str()).send().await?;
   if response
     .headers()
     .get("Content-Type")