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

generate boundary with token_hex #2702

Merged
merged 6 commits into from
Sep 25, 2024
Merged

generate boundary with token_hex #2702

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
f5921a2
generate boundary with token_hex
trim21 Sep 23, 2024
d187d9b
generate boundary with token_hex
trim21 Sep 23, 2024
0c8acb2
fix
trim21 Sep 23, 2024
14dfc7f
boundary size
trim21 Sep 25, 2024
5915331
Update starlette/responses.py
Kludex Sep 25, 2024
3ca56fb
Merge branch 'master' into boundary-gen
Kludex Sep 25, 2024
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
5 changes: 3 additions & 2 deletions starlette/responses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from email.utils import format_datetime, formatdate
from functools import partial
from mimetypes import guess_type
from random import choices as random_choices
from secrets import token_hex
from urllib.parse import quote

import anyio
Expand Down Expand Up @@ -401,7 +401,8 @@ async def _handle_multiple_ranges(
file_size: int,
send_header_only: bool,
) -> None:
boundary = "".join(random_choices("abcdefghijklmnopqrstuvwxyz0123456789", k=13))
# In firefox and chrome, they use boundary with 95-96 bits entropy (that's roughly 13 bytes).
boundary = token_hex(13)
content_length, header_generator = self.generate_multipart(
ranges, boundary, file_size, self.headers["content-type"]
)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_responses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,13 +598,13 @@ def test_file_response_range_multi(file_response_client: TestClient) -> None:
response = file_response_client.get("/", headers={"Range": "bytes=0-100, 200-300"})
assert response.status_code == 206
assert response.headers["content-range"].startswith("multipart/byteranges; boundary=")
assert response.headers["content-length"] == "400"
assert response.headers["content-length"] == "439"


def test_file_response_range_multi_head(file_response_client: TestClient) -> None:
response = file_response_client.head("/", headers={"Range": "bytes=0-100, 200-300"})
assert response.status_code == 206
assert response.headers["content-length"] == "400"
assert response.headers["content-length"] == "439"
assert response.content == b""

response = file_response_client.head(
Expand Down