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

Jump to bottom

Rfc8621 conformance fix #68

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Rfc8621 conformance fix #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce3add1
simplify if-else branches
sftse Dec 12, 2023
adfdc33
hoist common if condition into outer scope
sftse Dec 12, 2023
ca2bce8
adapt tests
sftse Dec 6, 2023
f44cbef
fix: image/*, audio/*, video/* are not attachments when found in both…
sftse Dec 12, 2023
705c82d
delete unneeded variable
sftse Dec 12, 2023
aef66c0
fix clippy warnings
sftse Dec 12, 2023
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
2 changes: 0 additions & 2 deletions resources/eml/legacy/030.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
3
],
"attachments": [
2,
3,
4
],
"parts": [
Expand Down
2 changes: 0 additions & 2 deletions resources/eml/legacy/030.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
3
],
"attachments": [
2,
3,
4
],
"parts": [
Expand Down
5 changes: 1 addition & 4 deletions resources/eml/legacy/032.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
4,
5
],
"attachments": [
4,
5
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
5 changes: 1 addition & 4 deletions resources/eml/legacy/032.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
4,
5
],
"attachments": [
4,
5
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/legacy/035.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
],
"attachments": [
5,
6,
7,
8
6
],
"parts": [
{
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/legacy/035.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
],
"attachments": [
5,
6,
7,
8
6
],
"parts": [
{
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/legacy/037.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
1,
2
],
"attachments": [
2
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/legacy/037.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
1,
2
],
"attachments": [
2
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/legacy/039.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
],
"attachments": [
3,
4,
5,
6
4
],
"parts": [
{
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/legacy/039.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
],
"attachments": [
3,
4,
5,
6
4
],
"parts": [
{
Expand Down
6 changes: 1 addition & 5 deletions resources/eml/legacy/044.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
3,
4
],
"attachments": [
2,
3,
4
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
6 changes: 1 addition & 5 deletions resources/eml/legacy/044.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
3,
4
],
"attachments": [
2,
3,
4
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
6 changes: 1 addition & 5 deletions resources/eml/legacy/048.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
3,
4
],
"attachments": [
2,
3,
4
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
6 changes: 1 addition & 5 deletions resources/eml/legacy/048.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
3,
4
],
"attachments": [
2,
3,
4
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/malformed/017.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"text_body": [
1
],
"attachments": [
1
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/malformed/017.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
"text_body": [
1
],
"attachments": [
1
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/rfc/002.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@
1,
2
],
"attachments": [
2
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
4 changes: 1 addition & 3 deletions resources/eml/rfc/002.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@
1,
2
],
"attachments": [
2
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
6 changes: 1 addition & 5 deletions resources/eml/thirdparty/013.crlf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
5,
6
],
"attachments": [
4,
5,
6
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
6 changes: 1 addition & 5 deletions resources/eml/thirdparty/013.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
5,
6
],
"attachments": [
4,
5,
6
],
"attachments": [],
"parts": [
{
"headers": [
Expand Down
49 changes: 18 additions & 31 deletions src/parsers/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,20 @@ impl MessageParser {
(false, false)
};

if add_to_html {
message.html_body.push(message.parts.len());
}
if add_to_text {
message.text_body.push(message.parts.len());
}

if !is_multipart && !add_to_text && !add_to_html
|| (is_multipart || mime_type == MimeType::Inline)
&& (!add_to_text || !add_to_html)
{
message.attachments.push(message.parts.len());
}

if is_text {
let text = match (
bytes,
Expand All @@ -324,42 +338,15 @@ impl MessageParser {
(Cow::Borrowed(bytes), None) => String::from_utf8_lossy(bytes),
};

let is_html = mime_type == MimeType::TextHtml;

if add_to_html && !is_html {
message.html_body.push(message.parts.len());
} else if add_to_text && is_html {
message.text_body.push(message.parts.len());
}

if add_to_html && is_html {
message.html_body.push(message.parts.len());
} else if add_to_text && !is_html {
message.text_body.push(message.parts.len());
} else {
message.attachments.push(message.parts.len());
}

if is_html {
if mime_type == MimeType::TextHtml {
PartType::Html(text)
} else {
PartType::Text(text)
}
} else if !is_inline {
PartType::Binary(bytes)
} else {
if add_to_html {
message.html_body.push(message.parts.len());
}
if add_to_text {
message.text_body.push(message.parts.len());
}

message.attachments.push(message.parts.len());

if !is_inline {
PartType::Binary(bytes)
} else {
PartType::InlineBinary(bytes)
}
PartType::InlineBinary(bytes)
}
} else {
message.attachments.push(message.parts.len());
Expand Down
6 changes: 3 additions & 3 deletions src/parsers/mime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@ impl<'x> MessageStream<'x> {
self.checkpoint();

match (self.next(), self.peek()) {
(Some(&a), Some(&&b)) if a == b'\r' && b == b'\n' => {
(Some(b'\r'), Some(b'\n')) => {
self.next();
false
}
(Some(&a), Some(&&b)) if a == b'-' && b == b'-' => {
(Some(b'-'), Some(b'-')) => {
self.next();
true
}
(Some(&a), _) if a == b'\n' => false,
(Some(b'\n'), _) => false,
(Some(&a), _) if a.is_ascii_whitespace() => {
self.skip_crlf();
false
Expand Down