Merge pull request 'partial re-implementation of body ext' (#30) from bodyext into main

Reviewed-on: #30

Cargo.lock

@@ -843,9 +843,8 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "eml-codec"
-version = "0.1.1"
+version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://git.deuxfleurs.fr/Deuxfleurs/eml-codec.git?branch=main#a7bd3c475a58e42b86c163ec075ce01ddae7e60a"
-checksum = "ac20cff537caf72385ffa5d9353ae63cb6c283a53665569408f040b8db36c90d"
 dependencies = [
  "base64 0.21.2",
  "chrono",

Cargo.toml

@@ -14,7 +14,7 @@ backtrace = "0.3"
 base64 = "0.13"
 clap = { version = "3.1.18", features = ["derive", "env"] }
 duplexify = "1.1.0"
-eml-codec = "0.1.1"
+eml-codec = { git = "https://git.deuxfleurs.fr/Deuxfleurs/eml-codec.git", branch = "main" }
 hex = "0.4"
 futures = "0.3"
 im = "15"

flake.nix

@@ -61,6 +61,7 @@
       ];
       shellHook = ''
         echo "AEROGRAME DEVELOPMENT SHELL ${fenix.packages.x86_64-linux.minimal.rustc}"
+        export RUST_SRC_PATH="${fenix.packages.x86_64-linux.latest.rust-src}/lib/rustlib/src/rust/library"
       '';
     };
 

src/bayou.rs

@@ -384,7 +384,7 @@ impl<S: BayouState> Bayou<S> {
         let cryptoblob = seal_serialize(&state_cp, &self.key)?;
         debug!("(cp) checkpoint body length: {}", cryptoblob.len());
 
-        let por = PutObjectRequest{
+        let por = PutObjectRequest {
             bucket: self.bucket.clone(),
             key: format!("{}/checkpoint/{}", self.path, ts_cp.to_string()),
             body: Some(cryptoblob.into()),
@@ -437,7 +437,7 @@ impl<S: BayouState> Bayou<S> {
     async fn list_checkpoints(&self) -> Result<Vec<(Timestamp, String)>> {
         let prefix = format!("{}/checkpoint/", self.path);
 
-        let lor = ListObjectsV2Request{
+        let lor = ListObjectsV2Request {
             bucket: self.bucket.clone(),
             max_keys: Some(1000),
             prefix: Some(prefix.clone()),

src/login/mod.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, bail, Context, Result};
 use async_trait::async_trait;
 use k2v_client::{
-    BatchInsertOp, BatchReadOp, CausalValue, CausalityToken, Filter, K2vClient, K2vValue
+    BatchInsertOp, BatchReadOp, CausalValue, CausalityToken, Filter, K2vClient, K2vValue,
 };
 use rand::prelude::*;
 use rusoto_core::HttpClient;
@@ -141,13 +141,13 @@ impl StorageCredentials {
             self.aws_secret_access_key.clone(),
         );
 
-		let connector = hyper_rustls::HttpsConnectorBuilder::new()
+        let connector = hyper_rustls::HttpsConnectorBuilder::new()
-			.with_native_roots()
+            .with_native_roots()
-			.https_or_http()
+            .https_or_http()
-			.enable_http1()
+            .enable_http1()
-			.enable_http2()
+            .enable_http2()
-			.build();
+            .build();
-		let client = HttpClient::from_connector(connector);
+        let client = HttpClient::from_connector(connector);
 
         Ok(S3Client::new_with(
             client,

src/mail/incoming.rs

@@ -450,10 +450,10 @@ impl EncryptedMessage {
         let por = PutObjectRequest {
             bucket: creds.storage.bucket.clone(),
             key: format!("incoming/{}", gen_ident()),
-            metadata:  Some(
+            metadata: Some(
-            [(MESSAGE_KEY.to_string(), key_header)]
+                [(MESSAGE_KEY.to_string(), key_header)]
-                .into_iter()
+                    .into_iter()
-                .collect::<HashMap<_, _>>(),
+                    .collect::<HashMap<_, _>>(),
             ),
             body: Some(self.encrypted_body.clone().into()),
             ..Default::default()

src/mail/mailbox.rs

@@ -369,7 +369,7 @@ impl MailboxInternal {
                 // Save mail meta
                 let meta = MailMeta {
                     internaldate: now_msec(),
-                    headers: mail.parsed.raw_headers.to_vec(), 
+                    headers: mail.parsed.raw_headers.to_vec(),
                     message_key: message_key.clone(),
                     rfc822_size: mail.raw.len(),
                 };
@@ -400,7 +400,7 @@ impl MailboxInternal {
         futures::try_join!(
             async {
                 // Delete mail body from S3
-                let dor = DeleteObjectRequest{
+                let dor = DeleteObjectRequest {
                     bucket: self.bucket.clone(),
                     key: format!("{}/{}", self.mail_path, ident),
                     ..Default::default()
@@ -461,7 +461,7 @@ impl MailboxInternal {
         futures::try_join!(
             async {
                 // Copy mail body from S3
-                let cor = CopyObjectRequest{
+                let cor = CopyObjectRequest {
                     bucket: self.bucket.clone(),
                     key: format!("{}/{}", self.mail_path, new_id),
                     copy_source: format!("{}/{}/{}", from.bucket, from.mail_path, source_id),

src/mail/user.rs

@@ -334,17 +334,22 @@ impl MailboxList {
     }
 
     fn has_mailbox(&self, name: &str) -> bool {
-        matches!(self.0.get(name), Some(MailboxListEntry {
+        matches!(
-            id_lww: (_, Some(_)),
+            self.0.get(name),
-            ..
+            Some(MailboxListEntry {
-        }))
+                id_lww: (_, Some(_)),
+                ..
+            })
+        )
     }
 
     fn get_mailbox(&self, name: &str) -> Option<(ImapUidvalidity, Option<UniqueIdent>)> {
-        self.0.get(name).map(|MailboxListEntry {
+        self.0.get(name).map(
-            id_lww: (_, mailbox_id),
+            |MailboxListEntry {
-            uidvalidity,
+                 id_lww: (_, mailbox_id),
-        }| (*uidvalidity, *mailbox_id))
+                 uidvalidity,
+             }| (*uidvalidity, *mailbox_id),
+        )
     }
 
     /// Ensures mailbox `name` maps to id `id`.