Merge branch 'main' into custom/aerogramme

duesee · Jan 10, 2024 · 4c7891d · 4c7891d
2 parents e37e370 + e99c7e1
commit 4c7891d
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 76 deletions.
diff --git a/imap-codec/Cargo.toml b/imap-codec/Cargo.toml
@@ -3,7 +3,7 @@ name = "imap-codec"
 description = "Rock-solid and complete codec for IMAP"
 keywords = ["email", "imap", "codec", "parser"]
 categories = ["email", "parser-implementations", "encoding", "network-programming"]
-version = "1.0.0"
+version = "2.0.0"
 authors = ["Damian Poddebniak <[email protected]>"]
 repository = "https://github.com/duesee/imap-codec"
 license = "MIT OR Apache-2.0"
@@ -53,7 +53,8 @@ abnf-core = "0.6.0"
 base64 = "0.21"
 bounded-static = { version = "0.5.0", optional = true }
 chrono = { version = "0.4", default-features = false, features = ["alloc"] }
-imap-types = { version = "1.0.0", default-features = false, features = ["unvalidated"] }
+# TODO: This should be `version = 2.0.0` but I can't make it work with `cargo-semver-checks`
+imap-types = { path = "../imap-types", default-features = false, features = ["unvalidated"] }
 nom = "7"
 serde = { version = "1", features = ["derive"], optional = true }
 thiserror = "1.0.29"

diff --git a/imap-codec/src/codec/encode.rs b/imap-codec/src/codec/encode.rs
@@ -656,16 +656,10 @@ impl EncodeIntoContext for AuthenticateData {
             Self::Continue(data) => {
                 let encoded = base64.encode(data.declassify());
                 ctx.write_all(encoded.as_bytes())?;
-                ctx.write_all(b"\r\n")?;
-            }
-            Self::Cancel => {
-                ctx.write_all(b"*\r\n")?;
+                ctx.write_all(b"\r\n")
             }
+            Self::Cancel => ctx.write_all(b"*\r\n"),
         }
-
-        ctx.push_authenticate_data();
-
-        Ok(())
     }
 }
 

diff --git a/imap-codec/src/core.rs b/imap-codec/src/core.rs
@@ -427,11 +427,10 @@ mod tests {
     }
 
     #[test]
-    fn test__base64() {
+    fn test_base64() {
         _base64.decode(b"AA==").unwrap();
         // Note: "pad bits MUST be set to zero by conforming encoders" [RFC 4648, sec. 3.5].
         //_base64.decode(b"aa==").unwrap();
         _base64.decode(b"aQ==").unwrap();
-        //_base64.decode(b"aa==").unwrap();
     }
 }
diff --git a/imap-codec/tests/trace.rs b/imap-codec/tests/trace.rs
@@ -1150,6 +1150,7 @@ Content-Type: TEXT/PLAIN; CHARSET=US-ASCII\r
                             StoreType::Add,
                             StoreResponse::Answer,
                             vec![Flag::Deleted],
+                            vec![],
                             false,
                         )
                         .unwrap(),

diff --git a/imap-types/Cargo.toml b/imap-types/Cargo.toml
@@ -3,7 +3,7 @@ name = "imap-types"
 description = "Misuse-resistant data structures for IMAP"
 keywords = ["email", "imap", "types"]
 categories = ["email", "data-structures", "network-programming"]
-version = "1.0.0"
+version = "2.0.0"
 authors = ["Damian Poddebniak <[email protected]>"]
 repository = "https://github.com/duesee/imap-codec"
 license = "MIT OR Apache-2.0"

diff --git a/imap-types/src/command.rs b/imap-types/src/command.rs
@@ -1889,6 +1889,7 @@ mod tests {
                 StoreType::Remove,
                 StoreResponse::Answer,
                 vec![Flag::Seen, Flag::Draft],
+                vec![],
                 false,
             )
             .unwrap(),
@@ -1897,6 +1898,7 @@ mod tests {
                 StoreType::Add,
                 StoreResponse::Answer,
                 vec![Flag::Keyword("TEST".try_into().unwrap())],
+                vec![],
                 true,
             )
             .unwrap(),
@@ -2034,6 +2036,7 @@ mod tests {
                     flags: vec![],
                     response: StoreResponse::Silent,
                     kind: StoreType::Add,
+                    modifiers: vec![],
                     uid: true,
                 },
                 "STORE",

diff --git a/imap-types/src/secret.rs b/imap-types/src/secret.rs
@@ -96,8 +96,8 @@ mod tests {
         println!("-----");
 
         let tests = [
-            AuthenticateData(Secret::new(b"xyz123".to_vec())),
-            AuthenticateData(Secret::from(b"xyz123".to_vec())),
+            AuthenticateData::Continue(Secret::new(b"xyz123".to_vec())),
+            AuthenticateData::Continue(Secret::from(b"xyz123".to_vec())),
         ];
 
         for test in tests {