Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Update imap-codec and use new poison feature #268

Merged
merged 1 commit into from
Sep 8, 2024
Merged

refactor: Update imap-codec and use new poison feature #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ext_metadata = ["imap-codec/ext_metadata"]

[dependencies]
bytes = { version = "1.7.1", optional = true }
imap-codec = { version = "2.0.0-alpha.4", features = ["quirk_crlf_relaxed"] }
imap-codec = { version = "2.0.0-alpha.5", features = ["quirk_crlf_relaxed"] }
thiserror = "1.0.63"
tokio = { version = "1.40.0", optional = true, features = ["io-util", "macros", "net"] }
tokio-rustls = { version = "0.26.0", optional = true, default-features = false }
Expand Down
75 changes: 36 additions & 39 deletions src/receive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ pub struct ReceiveState {
crlf_relaxed: bool,
fragmentizer: Fragmentizer,
message_has_invalid_line_ending: bool,
message_is_poisoned: bool,
}

impl ReceiveState {
Expand All @@ -30,7 +29,6 @@ impl ReceiveState {
crlf_relaxed,
fragmentizer,
message_has_invalid_line_ending: false,
message_is_poisoned: false,
}
}

Expand All @@ -55,7 +53,7 @@ impl ReceiveState {
/// To achieve this the fragments of the current message will be parsed until the end of the
/// message. Then the message will be discarded without being decoded.
pub fn poison_message(&mut self) {
self.message_is_poisoned = true;
self.fragmentizer.poison_message();
}

/// Tries to decode the tag of the current message before it was received completely.
Expand All @@ -82,6 +80,7 @@ impl ReceiveState {
}) => {
// Check for line ending compatibility
if !self.crlf_relaxed && ending == LineEnding::Lf {
self.fragmentizer.poison_message();
self.message_has_invalid_line_ending = true;
}

Expand All @@ -91,51 +90,49 @@ impl ReceiveState {
return Ok(ReceiveEvent::LiteralAnnouncement { mode, length });
}
None => {
// The message is now complete
let result = if self.message_has_invalid_line_ending {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::ExpectedCrlfGotLf {
discarded_bytes,
}))
} else if self.message_is_poisoned {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::MessageIsPoisoned {
discarded_bytes,
}))
} else {
// Decode the complete message
match self.fragmentizer.decode_message(codec) {
Ok(message) => {
Ok(ReceiveEvent::DecodingSuccess(message.into_static()))
}
Err(DecodeMessageError::DecodingFailure(_)) => {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::DecodingFailure {
discarded_bytes,
}))
}
Err(DecodeMessageError::DecodingRemainder { .. }) => {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::DecodingFailure {
// The message is now complete and can be decoded
let result = match self.fragmentizer.decode_message(codec) {
Ok(message) => {
Ok(ReceiveEvent::DecodingSuccess(message.into_static()))
}
Err(DecodeMessageError::DecodingFailure(_)) => {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::DecodingFailure {
discarded_bytes,
}))
}
Err(DecodeMessageError::DecodingRemainder { .. }) => {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::DecodingFailure {
discarded_bytes,
}))
}
Err(DecodeMessageError::MessageTooLong { .. }) => {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::MessageTooLong {
discarded_bytes,
}))
}
Err(DecodeMessageError::MessagePoisoned { .. }) => {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());

if self.message_has_invalid_line_ending {
Err(Interrupt::Error(ReceiveError::ExpectedCrlfGotLf {
discarded_bytes,
}))
}
Err(DecodeMessageError::MessageTooLong { .. }) => {
let discarded_bytes =
Secret::new(self.fragmentizer.message_bytes().into());
Err(Interrupt::Error(ReceiveError::MessageTooLong {
} else {
Err(Interrupt::Error(ReceiveError::MessageIsPoisoned {
discarded_bytes,
}))
}
}
};

self.message_has_invalid_line_ending = false;
self.message_is_poisoned = false;
return result;
}
}
Expand Down
Loading