Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(email): show a Gmail bounce's notice, not the returned original (#8782)

teod8fc471b7e45
diff --git a/crates/email_api_client/src/outbound/gmail/convert/payload.rs b/crates/email_api_client/src/outbound/gmail/convert/payload.rs
index 208fad3038..9d50be3197 100644
--- a/crates/email_api_client/src/outbound/gmail/convert/payload.rs
+++ b/crates/email_api_client/src/outbound/gmail/convert/payload.rs
@@ -72,18 +72,27 @@ pub(super) fn parse_gmail_payload(
}
}
- let mut part_stack = vec![message_payload];
- while let Some(part) = part_stack.pop() {
- parse_part(part, message_id, &mut parsed);
+ // A message/rfc822 part wraps another message, such as the original a
+ // bounce returns. Its text is that message's body, never this one's.
+ let mut part_stack = vec![(message_payload, false)];
+ while let Some((part, in_wrapped_message)) = part_stack.pop() {
+ parse_part(part, in_wrapped_message, message_id, &mut parsed);
if let Some(parts) = &part.parts {
- part_stack.extend(parts.iter().rev());
+ let in_wrapped_message =
+ in_wrapped_message || part.mime_type.eq_ignore_ascii_case("message/rfc822");
+ part_stack.extend(parts.iter().rev().map(|child| (child, in_wrapped_message)));
}
}
Ok(parsed)
}
-fn parse_part(part: &MessagePart, message_id: &str, parsed: &mut ParsedGmailPayload) {
+fn parse_part(
+ part: &MessagePart,
+ in_wrapped_message: bool,
+ message_id: &str,
+ parsed: &mut ParsedGmailPayload,
+) {
let mime_type = part.mime_type.to_lowercase();
let is_multipart = mime_type.starts_with("multipart/alternative")
|| mime_type.starts_with("multipart/related")
@@ -101,7 +110,9 @@ fn parse_part(part: &MessagePart, message_id: &str, parsed: &mut ParsedGmailPayl
return;
};
- if let Some(encoded) = &body.data_base64 {
+ if let Some(encoded) = &body.data_base64
+ && !in_wrapped_message
+ {
let wants_text = mime_type == "text/plain" && parsed.body_text.is_none();
let wants_html = mime_type == "text/html" && parsed.body_html_sanitized.is_none();
if wants_text || wants_html {
diff --git a/crates/email_api_client/src/outbound/gmail/convert/payload/test.rs b/crates/email_api_client/src/outbound/gmail/convert/payload/test.rs
index 33268bfcb5..a71a02fbaa 100644
--- a/crates/email_api_client/src/outbound/gmail/convert/payload/test.rs
+++ b/crates/email_api_client/src/outbound/gmail/convert/payload/test.rs
@@ -136,6 +136,99 @@ fn one_bad_part_does_not_sink_sibling_parts() {
);
}
+#[test]
+fn a_bounce_reads_as_its_report_not_the_returned_original() {
+ let report = MessagePart {
+ part_id: "0".into(),
+ mime_type: "text/plain".into(),
+ filename: String::new(),
+ headers: Vec::new(),
+ body: Some(MessagePartBody {
+ attachment_id: None,
+ size: 36,
+ data_base64: Some(URL_SAFE.encode("Your message could not be delivered.")),
+ }),
+ parts: None,
+ };
+ let status = MessagePart {
+ part_id: "1".into(),
+ mime_type: "message/delivery-status".into(),
+ filename: String::new(),
+ headers: Vec::new(),
+ body: Some(MessagePartBody {
+ attachment_id: Some("status-id".into()),
+ size: 300,
+ data_base64: None,
+ }),
+ parts: None,
+ };
+ let original_html = MessagePart {
+ part_id: "2.0.0".into(),
+ mime_type: "text/html".into(),
+ filename: String::new(),
+ headers: Vec::new(),
+ body: Some(MessagePartBody {
+ attachment_id: None,
+ size: 23,
+ data_base64: Some(URL_SAFE.encode("<p>Original message</p>")),
+ }),
+ parts: None,
+ };
+ let original_file = MessagePart {
+ part_id: "2.0.1".into(),
+ mime_type: "application/pdf".into(),
+ filename: "contract.pdf".into(),
+ headers: vec![Header {
+ name: "Content-Disposition".into(),
+ value: "attachment; filename=\"contract.pdf\"".into(),
+ }],
+ body: Some(MessagePartBody {
+ attachment_id: Some("contract-id".into()),
+ size: 2048,
+ data_base64: None,
+ }),
+ parts: None,
+ };
+ let original = MessagePart {
+ part_id: "2".into(),
+ mime_type: "message/rfc822".into(),
+ filename: String::new(),
+ headers: Vec::new(),
+ body: Some(MessagePartBody {
+ attachment_id: None,
+ size: 0,
+ data_base64: None,
+ }),
+ parts: Some(vec![MessagePart {
+ part_id: "2.0".into(),
+ mime_type: "multipart/mixed".into(),
+ filename: String::new(),
+ headers: Vec::new(),
+ body: None,
+ parts: Some(vec![original_html, original_file]),
+ }]),
+ };
+ let mut root = payload("multipart/report", "");
+ root.body = None;
+ root.parts = Some(vec![report, status, original]);
+
+ let parsed = parse_gmail_payload(&root, "message").unwrap();
+
+ assert_eq!(
+ parsed.body_text.as_deref(),
+ Some("Your message could not be delivered.")
+ );
+ assert_eq!(parsed.body_html_sanitized, None);
+ assert_eq!(
+ parsed
+ .attachments_metadata
+ .iter()
+ .map(|attachment| attachment.filename.as_deref())
+ .collect::<Vec<_>>(),
+ vec![Some("contract.pdf")]
+ );
+}
+
#[test]
fn sanitizes_full_html_messages() {
let encoded = URL_SAFE.encode("<html><body><p>Hello</p><script>bad()</script></body></html>");