mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-09 18:06:34 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #36023 -- Handled controls chars in content_disposition_header.

Browse Source 
To use the simple `filename="..."` form, the value must conform to the
official grammar from RFC6266[^1]:

    filename-parm       = "filename" "=" value
    value               = <value, defined in [RFC2616], Section 3.6>
                        ; token | quoted-string

The `quoted-string` definition comes from RFC 9110[^2]:

```
    quoted-string  = DQUOTE *( qdtext / quoted-pair ) DQUOTE
    qdtext         = HTAB / SP / %x21 / %x23-5B / %x5D-7E / obs-text

The backslash octet ("\") can be used as a single-octet quoting
mechanism within quoted-string and comment constructs. Recipients that
process the value of a quoted-string MUST handle a quoted-pair as if
it were replaced by the octet following the backslash.

    quoted-pair    = "\" ( HTAB / SP / VCHAR / obs-text )

A sender SHOULD NOT generate a quoted-pair in a quoted-string except
where necessary to quote DQUOTE and backslash octets occurring within
that string.
```

That is, quoted strings are able to express horizontal tabs, space
characters, and everything in the range from 0x21 to 0x7e, expect for
0x22 (`"`) and 0x5C (`\`), which can still be expressed but must be
escaped with their own `\`.

We ignore the case of `obs-text`, which is defined as the range
0x80-0xFF, since its presence is there for permissive parsing of
accidental high-bit characters, and it should not be generated by
conforming implementations.

Transform this character range into a regex and apply it in addition
to the "is ASCII" check.  This ensures that all simple filenames are
expressed in the simple format, and that all filenames with newlines
and other control characters are properly expressed with the
percent-encoded `filename*=...`form.

[^1]: https://datatracker.ietf.org/doc/html/rfc6266#section-4.1
[^2]: https://datatracker.ietf.org/doc/html/rfc9110#name-quoted-strings
This commit is contained in:
Alex Vandiver 2024-12-06 10:47:31 -05:00 committed by Sarah Boyce
parent 40d5516385
commit 8914b571eb
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/utils/http.py
View File

@ -362,10 +362,19 @@ def content_disposition_header(as_attachment, filename):
disposition = "attachment" if as_attachment else "inline"
try:
filename.encode("ascii")
is_ascii = True
except UnicodeEncodeError:
is_ascii = False
# Quoted strings can contain horizontal tabs, space characters, and
# characters from 0x21 to 0x7e, except 0x22 (`"`) and 0x5C (`\`) which
# can still be expressed but must be escaped with their own `\`.
# https://datatracker.ietf.org/doc/html/rfc9110#name-quoted-strings
quotable_characters = r"^[\t \x21-\x7e]*$"
if is_ascii and re.match(quotable_characters, filename):
file_expr = 'filename="{}"'.format(
filename.replace("\\", "\\\\").replace('"', r"\"")
)
except UnicodeEncodeError:
else:
file_expr = "filename*=utf-8''{}".format(quote(filename))
return f"{disposition}; {file_expr}"
elif as_attachment:

1
tests/utils_tests/test_http.py
View File

@ -511,6 +511,7 @@ class ContentDispositionHeaderTests(unittest.TestCase):
(True, '"espécimen" filename'),
"attachment; filename*=utf-8''%22esp%C3%A9cimen%22%20filename",
),
((True, "some\nfile"), "attachment; filename*=utf-8''some%0Afile"),
)
for (is_attachment, filename), expected in tests: