Skip to content

Handle content-disposition with trailing semicolon (fixes #212) #216

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

Merged
andrewtimberlake merged 1 commit into from
Dec 4, 2025
Merged

Handle content-disposition with trailing semicolon (fixes #212) #216

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
11 changes: 8 additions & 3 deletions lib/mail/parsers/rfc_2822.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ defmodule Mail.Parsers.RFC2822 do

value =
case value do
[value | params] = list when is_binary(value) and is_list(params) ->
[value | params] = list when is_binary(value) ->
if is_params(params) do
[value | concatenate_continuation_params(params, opts)]
else
Expand Down Expand Up @@ -462,8 +462,9 @@ defmodule Mail.Parsers.RFC2822 do
end
end

defp parse_header_value("content-disposition", value),
do: parse_structured_header_value(value)
defp parse_header_value("content-disposition", value) do
List.wrap(parse_structured_header_value(value))
end

defp parse_header_value(_key, value),
do: value
Expand Down Expand Up @@ -506,6 +507,10 @@ defmodule Mail.Parsers.RFC2822 do
[decoded | params]
end

defp decode_header_value(_key, value, _opts) when is_list(value) do
value
end

defp decode_header_value(_key, {name, email}, opts) do
decoded = parse_encoded_word(name, opts)
{decoded, email}
Expand Down
9 changes: 9 additions & 0 deletions test/mail/parsers/rfc_2822_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,6 +1094,15 @@ defmodule Mail.Parsers.RFC2822Test do
assert message.headers["content-type"] == ["text/html", {"charset", "us-ascii"}]
end

test "content-disposition with trailing semicolon" do
message =
parse_email("""
Content-Disposition: inline;
""")

assert message.headers["content-disposition"] == ["inline"]
end

describe "RFC 2231 parameter continuations" do
test "parses parameter continuations for long filenames" do
message =
Expand Down