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 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
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-expose-headers` header.
4 changes: 4 additions & 0 deletions synapse/http/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,10 @@ def set_cors_headers(request: SynapseRequest) -> None:
b"Access-Control-Allow-Headers",
b"X-Requested-With, Content-Type, Authorization, Date",
)
request.setHeader(
b"Access-Control-Expose-Headers",
b"Synapse-Trace-Id",
)


def set_corp_headers(request: Request) -> None:
Expand Down
4 changes: 4 additions & 0 deletions tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@ def _check_cors_standard_headers(self, channel: FakeChannel) -> None:
[b"X-Requested-With, Content-Type, Authorization, Date"],
"has correct CORS Headers header",
)
self.assertEqual(
channel.headers.getRawHeaders(b"Access-Control-Expose-Headers"),
[b"Synapse-Trace-Id"],
)

def _check_cors_msc3886_headers(self, channel: FakeChannel) -> None:
# Ensure the correct CORS headers have been added
Expand Down