From fc4674ecca51be232c3f2884a1270e6f5e004c62 Mon Sep 17 00:00:00 2001 From: alemi Date: Tue, 26 Mar 2024 21:24:10 +0100 Subject: [PATCH] fix: maybe if i do it the old way?? --- src/dispatcher.rs | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/src/dispatcher.rs b/src/dispatcher.rs index 7435166..bb6712b 100644 --- a/src/dispatcher.rs +++ b/src/dispatcher.rs @@ -111,22 +111,30 @@ async fn deliver(key: &PKey, to: &str, from: &str, payload: serde_json: let path = to.replace("https://", "").replace("http://", "").replace(&host, ""); - let signature_header = Config::new() - .dont_use_created_field() - .require_header("host") - .require_header("date") - .require_header("digest") - .begin_sign("POST", &path, headers) - .unwrap() - .sign(format!("{from}#main-key"), |to_sign| { - tracing::info!("signing '{to_sign}'"); - let mut signer = Signer::new(MessageDigest::sha256(), key)?; - signer.update(to_sign.as_bytes())?; - let signature = base64::prelude::BASE64_URL_SAFE.encode(signer.sign_to_vec()?); - Ok(signature) as Result<_, UpubError> - }) - .unwrap() - .signature_header(); + // let signature_header = Config::new() + // .dont_use_created_field() + // .require_header("host") + // .require_header("date") + // .require_header("digest") + // .begin_sign("POST", &path, headers) + // .unwrap() + // .sign(format!("{from}#main-key"), |to_sign| { + // tracing::info!("signing '{to_sign}'"); + // let mut signer = Signer::new(MessageDigest::sha256(), key)?; + // signer.update(to_sign.as_bytes())?; + // let signature = base64::prelude::BASE64_URL_SAFE.encode(signer.sign_to_vec()?); + // Ok(signature) as Result<_, UpubError> + // }) + // .unwrap() + // .signature_header(); + + let signature_header = { + let to_sign = format!("(request-target): post {path}\nhost: {host}\ndate: {date}"); + tracing::info!("signing '{to_sign}'"); + let mut signer = Signer::new(MessageDigest::sha256(), key)?; + signer.update(to_sign.as_bytes())?; + base64::prelude::BASE64_URL_SAFE.encode(signer.sign_to_vec()?) + }; tracing::info!("signature header: {signature_header}");