LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-30 08:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set accept header and timeout for outgoing apub requests

Browse source
This commit is contained in:
Felix Ableitner 2020-04-07 17:29:23 +02:00
parent 4fadc4d072
commit 17bf6baa25
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/src/apub/mod.rs
View file

@ -13,12 +13,14 @@ use url::Url;
type GroupExt = Ext<Group, ApActorProperties>; type GroupExt = Ext<Group, ApActorProperties>;
static APUB_JSON_CONTENT_TYPE: &str = "application/activity+json";
fn create_apub_response<T>(json: &T) -> HttpResponse<Body> fn create_apub_response<T>(json: &T) -> HttpResponse<Body>
where where
T: serde::ser::Serialize, T: serde::ser::Serialize,
{ {
HttpResponse::Ok() HttpResponse::Ok()
.content_type("application/activity+json") .content_type(APUB_JSON_CONTENT_TYPE)
.json(json) .json(json)
} }

10
server/src/apub/puller.rs
View file

@ -12,6 +12,7 @@ use failure::Error;
use isahc::prelude::*; use isahc::prelude::*;
use log::warn; use log::warn;
use serde::Deserialize; use serde::Deserialize;
use std::time::Duration;
fn fetch_node_info(domain: &str) -> Result<NodeInfo, Error> { fn fetch_node_info(domain: &str) -> Result<NodeInfo, Error> {
let well_known_uri = format!( let well_known_uri = format!(
@ -56,7 +57,14 @@ where
} }
// TODO: should cache responses here when we are in production // TODO: should cache responses here when we are in production
// TODO: this function should return a future // TODO: this function should return a future
let text = isahc::get(uri)?.text()?; let timeout = Duration::from_secs(60);
let text = Request::get(uri)
.header("Accept", APUB_JSON_CONTENT_TYPE)
.connect_timeout(timeout)
.timeout(timeout)
.body(())?
.send()?
.text()?;
let res: Response = serde_json::from_str(&text)?; let res: Response = serde_json::from_str(&text)?;
Ok(res) Ok(res)
} }