aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix #892 Build client for every inbox in broadcast()' (#895) from broadcast-timeout into main

Browse Source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/895
This commit is contained in:
KitaitiMakoto 2021-02-09 13:56:16 +00:00
commit 10be055381
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plume-common/src/activity_pub/mod.rs
View File

@ -132,14 +132,6 @@ where
let mut rt = tokio::runtime::current_thread::Runtime::new() let mut rt = tokio::runtime::current_thread::Runtime::new()
.expect("Error while initializing tokio runtime for federation"); .expect("Error while initializing tokio runtime for federation");
let client = if let Some(proxy) = proxy {
ClientBuilder::new().proxy(proxy)
} else {
ClientBuilder::new()
}
.connect_timeout(std::time::Duration::from_secs(5))
.build()
.expect("Can't build client");
for inbox in boxes { for inbox in boxes {
let body = signed.to_string(); let body = signed.to_string();
let mut headers = request::headers(); let mut headers = request::headers();
@ -161,22 +153,33 @@ where
headers.insert("Host", host_header_value.unwrap()); headers.insert("Host", host_header_value.unwrap());
headers.insert("Digest", request::Digest::digest(&body)); headers.insert("Digest", request::Digest::digest(&body));
rt.spawn( rt.spawn(
client if let Some(proxy) = proxy.clone() {
.post(&inbox) ClientBuilder::new().proxy(proxy)
.headers(headers.clone()) } else {
.header( ClientBuilder::new()
"Signature", }
request::signature(sender, &headers, ("post", url.path(), url.query())) .connect_timeout(std::time::Duration::from_secs(5))
.expect("activity_pub::broadcast: request signature error"), .build()
) .expect("Can't build client")
.body(body) .post(&inbox)
.send() .headers(headers.clone())
.and_then(|r| r.into_body().concat2()) .header(
.map(move |response| { "Signature",
debug!("Successfully sent activity to inbox ({})", inbox); request::signature(sender, &headers, ("post", url.path(), url.query()))
debug!("Response: \"{:?}\"\n", response) .expect("activity_pub::broadcast: request signature error"),
}) )
.map_err(|e| warn!("Error while sending to inbox ({:?})", e)), .body(body)
.send()
.and_then(move |r| {
if r.status().is_success() {
debug!("Successfully sent activity to inbox ({})", &inbox);
} else {
warn!("Error while sending to inbox ({:?})", &r)
}
r.into_body().concat2()
})
.map(move |response| debug!("Response: \"{:?}\"\n", response))
.map_err(|e| warn!("Error while sending to inbox ({:?})", e)),
); );
} }
rt.run().unwrap(); rt.run().unwrap();