Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions .changeset/fix-gmail-header-case-insensitive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@googleworkspace/cli": patch
---

fix(gmail): match message header names case-insensitively.

`parse_message_headers` used exact-case string matching, so headers whose field
names use non-canonical casing — e.g. `"CC"` (common from Exchange/Outlook) or a
lowercase `"from"` from some MTAs — fell through and were silently dropped. This
dropped CC recipients from `+reply-all`. Per RFC 5322 §1.2.2 header field names
are case-insensitive (the sibling `get_part_header` already uses
`eq_ignore_ascii_case`). Normalize the name to lowercase before matching.
50 changes: 41 additions & 9 deletions crates/google-workspace-cli/src/helpers/gmail/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,20 @@ fn parse_message_headers(headers: &[Value]) -> ParsedMessageHeaders {
let name = header.get("name").and_then(|v| v.as_str()).unwrap_or("");
let value = header.get("value").and_then(|v| v.as_str()).unwrap_or("");

match name {
"From" => parsed.from = value.to_string(),
"Reply-To" => append_address_list_header_value(&mut parsed.reply_to, value),
"To" => append_address_list_header_value(&mut parsed.to, value),
"Cc" => append_address_list_header_value(&mut parsed.cc, value),
"Subject" => parsed.subject = value.to_string(),
"Date" => parsed.date = value.to_string(),
"Message-ID" | "Message-Id" => parsed.message_id = value.to_string(),
"References" => append_header_value(&mut parsed.references, value),
// RFC 5322 §1.2.2: header field names are case-insensitive. Gmail
// preserves the sender's original casing, so e.g. `"CC"` from
// Exchange/Outlook (or a lowercase `"from"` from some MTAs) would fall
// through a case-sensitive match and be silently dropped — dropping CC
// recipients in +reply-all (#642).
match name.to_ascii_lowercase().as_str() {
"from" => parsed.from = value.to_string(),
"reply-to" => append_address_list_header_value(&mut parsed.reply_to, value),
"to" => append_address_list_header_value(&mut parsed.to, value),
"cc" => append_address_list_header_value(&mut parsed.cc, value),
"subject" => parsed.subject = value.to_string(),
"date" => parsed.date = value.to_string(),
"message-id" => parsed.message_id = value.to_string(),
"references" => append_header_value(&mut parsed.references, value),
_ => {}
}
Comment on lines +266 to 276

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Using name.to_ascii_lowercase() inside the loop allocates a new String on the heap for every single header parsed. This can be avoided entirely by using eq_ignore_ascii_case in an if/else if chain, which performs case-insensitive comparison without any allocations.

        if name.eq_ignore_ascii_case("From") {
            parsed.from = value.to_string();
        } else if name.eq_ignore_ascii_case("Reply-To") {
            append_address_list_header_value(&mut parsed.reply_to, value);
        } else if name.eq_ignore_ascii_case("To") {
            append_address_list_header_value(&mut parsed.to, value);
        } else if name.eq_ignore_ascii_case("Cc") {
            append_address_list_header_value(&mut parsed.cc, value);
        } else if name.eq_ignore_ascii_case("Subject") {
            parsed.subject = value.to_string();
        } else if name.eq_ignore_ascii_case("Date") {
            parsed.date = value.to_string();
        } else if name.eq_ignore_ascii_case("Message-ID") {
            parsed.message_id = value.to_string();
        } else if name.eq_ignore_ascii_case("References") {
            append_header_value(&mut parsed.references, value);
        }

}
Expand Down Expand Up @@ -3758,6 +3763,33 @@ mod tests {
);
}

#[test]
fn test_parse_message_headers_case_insensitive() {
// Regression for #642: Exchange/Outlook emit "CC" in uppercase and some
// MTAs emit lowercase field names. Per RFC 5322 §1.2.2 header field
// names are case-insensitive, so every variant must be recognized
// (previously a case-sensitive match silently dropped them — e.g. CC
// recipients vanished from +reply-all).
let headers = [
json!({ "name": "FROM", "value": "alice@example.com" }),
json!({ "name": "to", "value": "bob@example.com" }),
json!({ "name": "CC", "value": "carol@example.com" }),
json!({ "name": "Reply-TO", "value": "team@example.com" }),
json!({ "name": "subject", "value": "Re: test" }),
json!({ "name": "MESSAGE-ID", "value": "<msg@example.com>" }),
json!({ "name": "References", "value": "<ref@example.com>" }),
];

let parsed = parse_message_headers(&headers);
assert_eq!(parsed.from, "alice@example.com");
assert_eq!(parsed.to, "bob@example.com");
assert_eq!(parsed.cc, "carol@example.com");
assert_eq!(parsed.reply_to, "team@example.com");
assert_eq!(parsed.subject, "Re: test");
assert_eq!(parsed.message_id, "<msg@example.com>");
assert_eq!(parsed.references, "<ref@example.com>");
}

#[test]
fn test_filename_control_char_sanitization() {
let payload = json!({
Expand Down
Loading