zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: less extreme logging for deliveries

Browse source
This commit is contained in:
əlemi 2024-03-27 04:38:14 +01:00
parent 742c769014
commit bd4d123223
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dispatcher.rs
View file

@ -98,8 +98,6 @@ async fn deliver(key: &PKey<Private>, to: &str, from: &str, payload: serde_json:
let date = chrono::Utc::now().format("%a, %d %b %Y %H:%M:%S GMT").to_string(); // lmao @ "GMT" let date = chrono::Utc::now().format("%a, %d %b %Y %H:%M:%S GMT").to_string(); // lmao @ "GMT"
let path = to.replace("https://", "").replace("http://", "").replace(&host, ""); let path = to.replace("https://", "").replace("http://", "").replace(&host, "");
tracing::info!("payload:\n{payload}\n{digest}");
// let headers : BTreeMap<String, String> = [ // let headers : BTreeMap<String, String> = [
// ("Host".to_string(), host.clone()), // ("Host".to_string(), host.clone()),
// ("Date".to_string(), date.clone()), // ("Date".to_string(), date.clone()),
@ -125,16 +123,13 @@ async fn deliver(key: &PKey<Private>, to: &str, from: &str, payload: serde_json:
let signature_header = { let signature_header = {
let to_sign = format!("(request-target): post {path}\nhost: {host}\ndate: {date}\ndigest: {digest}"); let to_sign = format!("(request-target): post {path}\nhost: {host}\ndate: {date}\ndigest: {digest}");
tracing::info!("signing:\n{to_sign}");
let mut signer = Signer::new(MessageDigest::sha256(), key)?; let mut signer = Signer::new(MessageDigest::sha256(), key)?;
signer.update(to_sign.as_bytes())?; signer.update(to_sign.as_bytes())?;
let signature = base64::prelude::BASE64_STANDARD.encode(signer.sign_to_vec()?); let signature = base64::prelude::BASE64_STANDARD.encode(signer.sign_to_vec()?);
format!("keyId=\"{from}#main-key\",algorithm=\"rsa-sha256\",headers=\"(request-target) host date digest\",signature=\"{signature}\"") format!("keyId=\"{from}#main-key\",algorithm=\"rsa-sha256\",headers=\"(request-target) host date digest\",signature=\"{signature}\"")
}; };
tracing::info!("signature header:\n{signature_header}"); reqwest::Client::new()
let res = reqwest::Client::new()
.post(to) .post(to)
.header("Host", host) .header("Host", host)
.header("Date", date) .header("Date", date)
@ -144,15 +139,9 @@ async fn deliver(key: &PKey<Private>, to: &str, from: &str, payload: serde_json:
.header(USER_AGENT, format!("upub+{VERSION} ({domain})")) // TODO put instance admin email .header(USER_AGENT, format!("upub+{VERSION} ({domain})")) // TODO put instance admin email
.body(payload) .body(payload)
.send() .send()
.await?; .await?
.error_for_status()?;
let status = res.status(); Ok(())
let txt = res.text().await?;
tracing::info!("delivery answer: {txt}");
if status.is_client_error() || status.is_server_error() {
Err(UpubError::Status(axum::http::StatusCode::from_u16(status.as_u16()).unwrap()))
} else {
Ok(())
}
} }