Run HTTP request in broadcast() on tokio runtime
This commit is contained in:
parent
e0258003b9
commit
a7b899817a
@ -1,12 +1,13 @@
|
|||||||
use activitypub::{Activity, Link, Object};
|
use activitypub::{Activity, Link, Object};
|
||||||
use array_tool::vec::Uniq;
|
use array_tool::vec::Uniq;
|
||||||
use reqwest::{blocking::ClientBuilder, header::HeaderValue, Url};
|
use reqwest::{header::HeaderValue, ClientBuilder, Url};
|
||||||
use rocket::{
|
use rocket::{
|
||||||
http::Status,
|
http::Status,
|
||||||
request::{FromRequest, Request},
|
request::{FromRequest, Request},
|
||||||
response::{Responder, Response},
|
response::{Responder, Response},
|
||||||
Outcome,
|
Outcome,
|
||||||
};
|
};
|
||||||
|
use tokio::runtime;
|
||||||
use tracing::{debug, warn};
|
use tracing::{debug, warn};
|
||||||
|
|
||||||
use self::sign::Signable;
|
use self::sign::Signable;
|
||||||
@ -139,46 +140,53 @@ where
|
|||||||
.connect_timeout(std::time::Duration::from_secs(5))
|
.connect_timeout(std::time::Duration::from_secs(5))
|
||||||
.build()
|
.build()
|
||||||
.expect("Can't build client");
|
.expect("Can't build client");
|
||||||
for inbox in boxes {
|
let rt = runtime::Builder::new_current_thread()
|
||||||
let body = signed.to_string();
|
.enable_all()
|
||||||
let mut headers = request::headers();
|
.build()
|
||||||
let url = Url::parse(&inbox);
|
.expect("Error while initializing tokio runtime for federation");
|
||||||
if url.is_err() {
|
rt.block_on(async {
|
||||||
warn!("Inbox is invalid URL: {:?}", &inbox);
|
for inbox in boxes {
|
||||||
continue;
|
let body = signed.to_string();
|
||||||
|
let mut headers = request::headers();
|
||||||
|
let url = Url::parse(&inbox);
|
||||||
|
if url.is_err() {
|
||||||
|
warn!("Inbox is invalid URL: {:?}", &inbox);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let url = url.unwrap();
|
||||||
|
if !url.has_host() {
|
||||||
|
warn!("Inbox doesn't have host: {:?}", &inbox);
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let host_header_value = HeaderValue::from_str(url.host_str().expect("Unreachable"));
|
||||||
|
if host_header_value.is_err() {
|
||||||
|
warn!("Header value is invalid: {:?}", url.host_str());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
headers.insert("Host", host_header_value.unwrap());
|
||||||
|
headers.insert("Digest", request::Digest::digest(&body));
|
||||||
|
let _ = client
|
||||||
|
.post(&inbox)
|
||||||
|
.headers(headers.clone())
|
||||||
|
.header(
|
||||||
|
"Signature",
|
||||||
|
request::signature(sender, &headers, ("post", url.path(), url.query()))
|
||||||
|
.expect("activity_pub::broadcast: request signature error"),
|
||||||
|
)
|
||||||
|
.body(body)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map(move |r| {
|
||||||
|
if r.status().is_success() {
|
||||||
|
debug!("Successfully sent activity to inbox ({})", &inbox);
|
||||||
|
} else {
|
||||||
|
warn!("Error while sending to inbox ({} {:?})", &inbox, &r)
|
||||||
|
}
|
||||||
|
debug!("Response: \"{:?}\"\n", r);
|
||||||
|
})
|
||||||
|
.map_err(|e| warn!("Error while sending to inbox ({:?})", e));
|
||||||
}
|
}
|
||||||
let url = url.unwrap();
|
});
|
||||||
if !url.has_host() {
|
|
||||||
warn!("Inbox doesn't have host: {:?}", &inbox);
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
let host_header_value = HeaderValue::from_str(url.host_str().expect("Unreachable"));
|
|
||||||
if host_header_value.is_err() {
|
|
||||||
warn!("Header value is invalid: {:?}", url.host_str());
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
headers.insert("Host", host_header_value.unwrap());
|
|
||||||
headers.insert("Digest", request::Digest::digest(&body));
|
|
||||||
let _ = client
|
|
||||||
.post(&inbox)
|
|
||||||
.headers(headers.clone())
|
|
||||||
.header(
|
|
||||||
"Signature",
|
|
||||||
request::signature(sender, &headers, ("post", url.path(), url.query()))
|
|
||||||
.expect("activity_pub::broadcast: request signature error"),
|
|
||||||
)
|
|
||||||
.body(body)
|
|
||||||
.send()
|
|
||||||
.map(move |r| {
|
|
||||||
if r.status().is_success() {
|
|
||||||
debug!("Successfully sent activity to inbox ({})", &inbox);
|
|
||||||
} else {
|
|
||||||
warn!("Error while sending to inbox ({} {:?})", &inbox, &r)
|
|
||||||
}
|
|
||||||
debug!("Response: \"{:?}\"\n", r);
|
|
||||||
})
|
|
||||||
.map_err(|e| warn!("Error while sending to inbox ({:?})", e));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Shrinkwrap, Clone, Serialize, Deserialize)]
|
#[derive(Shrinkwrap, Clone, Serialize, Deserialize)]
|
||||||
|
Loading…
Reference in New Issue
Block a user