Run 'cargo fmt' to format code (#489)

plume-common/src/activity_pub/mod.rs

@@ -18,7 +18,8 @@ pub mod sign;
 pub const CONTEXT_URL: &str = "https://www.w3.org/ns/activitystreams";
 pub const PUBLIC_VISIBILTY: &str = "https://www.w3.org/ns/activitystreams#Public";
 
-pub const AP_CONTENT_TYPE: &str = r#"application/ld+json; profile="https://www.w3.org/ns/activitystreams""#;
+pub const AP_CONTENT_TYPE: &str =
+    r#"application/ld+json; profile="https://www.w3.org/ns/activitystreams""#;
 
 pub fn ap_accept_header() -> Vec<&'static str> {
     vec![
@@ -114,13 +115,18 @@ pub fn broadcast<S: sign::Signer, A: Activity, T: inbox::WithInbox>(
     let boxes = to
         .into_iter()
         .filter(|u| !u.is_local())
-        .map(|u| u.get_shared_inbox_url().unwrap_or_else(|| u.get_inbox_url()))
+        .map(|u| {
+            u.get_shared_inbox_url()
+                .unwrap_or_else(|| u.get_inbox_url())
+        })
         .collect::<Vec<String>>()
         .unique();
 
     let mut act = serde_json::to_value(act).expect("activity_pub::broadcast: serialization error");
     act["@context"] = context();
-    let signed = act.sign(sender).expect("activity_pub::broadcast: signature error");
+    let signed = act
+        .sign(sender)
+        .expect("activity_pub::broadcast: signature error");
 
     for inbox in boxes {
         // TODO: run it in Sidekiq or something like that
@@ -130,7 +136,11 @@ pub fn broadcast<S: sign::Signer, A: Activity, T: inbox::WithInbox>(
         let res = Client::new()
             .post(&inbox)
             .headers(headers.clone())
-            .header("Signature", request::signature(sender, &headers).expect("activity_pub::broadcast: request signature error"))
+            .header(
+                "Signature",
+                request::signature(sender, &headers)
+                    .expect("activity_pub::broadcast: request signature error"),
+            )
             .body(body)
             .send();
         match res {

plume-common/src/activity_pub/request.rs

@@ -1,12 +1,12 @@
 use base64;
 use chrono::{offset::Utc, DateTime};
 use openssl::hash::{Hasher, MessageDigest};
-use reqwest::header::{ACCEPT, CONTENT_TYPE, DATE, HeaderMap, HeaderValue, USER_AGENT};
+use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, CONTENT_TYPE, DATE, USER_AGENT};
 use std::ops::Deref;
 use std::time::SystemTime;
 
-use activity_pub::{AP_CONTENT_TYPE, ap_accept_header};
 use activity_pub::sign::Signer;
+use activity_pub::{ap_accept_header, AP_CONTENT_TYPE};
 
 const PLUME_USER_AGENT: &str = concat!("Plume/", env!("CARGO_PKG_VERSION"));
 
@@ -42,7 +42,7 @@ impl Digest {
     }
 
     pub fn verify_header(&self, other: &Digest) -> bool {
-        self.value()==other.value()
+        self.value() == other.value()
     }
 
     pub fn algorithm(&self) -> &str {
@@ -57,7 +57,8 @@ impl Digest {
         let pos = self
             .0
             .find('=')
-            .expect("Digest::value: invalid header error") + 1;
+            .expect("Digest::value: invalid header error")
+            + 1;
         base64::decode(&self.0[pos..]).expect("Digest::value: invalid encoding error")
     }
 
@@ -75,8 +76,11 @@ impl Digest {
     }
 
     pub fn from_body(body: &str) -> Self {
-        let mut hasher = Hasher::new(MessageDigest::sha256()).expect("Digest::digest: initialization error");
-        hasher.update(body.as_bytes()).expect("Digest::digest: content insertion error");
+        let mut hasher =
+            Hasher::new(MessageDigest::sha256()).expect("Digest::digest: initialization error");
+        hasher
+            .update(body.as_bytes())
+            .expect("Digest::digest: content insertion error");
         let res = base64::encode(&hasher.finish().expect("Digest::digest: finalizing error"));
         Digest(format!("SHA-256={}", res))
     }
@@ -99,7 +103,8 @@ pub fn headers() -> HeaderMap {
                 .into_iter()
                 .collect::<Vec<_>>()
                 .join(", "),
-        ).expect("request::headers: accept error"),
+        )
+        .expect("request::headers: accept error"),
     );
     headers.insert(CONTENT_TYPE, HeaderValue::from_static(AP_CONTENT_TYPE));
     headers

plume-common/src/activity_pub/sign.rs

@@ -1,7 +1,6 @@
 use super::request;
 use base64;
-use chrono::{DateTime, Duration,
-    naive::NaiveDateTime, Utc};
+use chrono::{naive::NaiveDateTime, DateTime, Duration, Utc};
 use hex;
 use openssl::{pkey::PKey, rsa::Rsa, sha::sha256};
 use rocket::http::HeaderMap;
@@ -57,9 +56,10 @@ impl Signable for serde_json::Value {
 
         let options_hash = Self::hash(
             &json!({
-            "@context": "https://w3id.org/identity/v1",
-            "created": creation_date
-        }).to_string(),
+                "@context": "https://w3id.org/identity/v1",
+                "created": creation_date
+            })
+            .to_string(),
         );
         let document_hash = Self::hash(&self.to_string());
         let to_be_signed = options_hash + &document_hash;
@@ -91,7 +91,8 @@ impl Signable for serde_json::Value {
             &json!({
                 "@context": "https://w3id.org/identity/v1",
                 "created": creation_date
-            }).to_string(),
+            })
+            .to_string(),
         );
         let creation_date = creation_date.as_str();
         if creation_date.is_none() {
@@ -169,7 +170,10 @@ pub fn verify_http_headers<S: Signer + ::std::fmt::Debug>(
         .collect::<Vec<_>>()
         .join("\n");
 
-    if !sender.verify(&h, &base64::decode(signature).unwrap_or_default()).unwrap_or(false) {
+    if !sender
+        .verify(&h, &base64::decode(signature).unwrap_or_default())
+        .unwrap_or(false)
+    {
         return SignatureValidity::Invalid;
     }
     if !headers.contains(&"digest") {