Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add Synapse-Trace-Id to access-control-expose-headers header #14974

Merged
merged 8 commits into from
Mar 20, 2023
Merged
Show file tree
Hide file tree
Changes from 4 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
1 change: 1 addition & 0 deletions changelog.d/14974.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add `Synapse-Trace-Id` to `access-control-allow-headers` header.
H-Shay marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion synapse/http/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ def set_cors_headers(request: SynapseRequest) -> None:
else:
request.setHeader(
b"Access-Control-Allow-Headers",
b"X-Requested-With, Content-Type, Authorization, Date",
b"X-Requested-With, Content-Type, Authorization, Date, Synapse-Trace-Id",
)


Expand Down
2 changes: 1 addition & 1 deletion tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def _check_cors_standard_headers(self, channel: FakeChannel) -> None:
)
self.assertEqual(
channel.headers.getRawHeaders(b"Access-Control-Allow-Headers"),
[b"X-Requested-With, Content-Type, Authorization, Date"],
[b"X-Requested-With, Content-Type, Authorization, Date, Synapse-Trace-Id"],
"has correct CORS Headers header",
)

Expand Down