Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shay 2023-03-20 11:14:05 -07:00 committed by GitHub
parent 63e25010d6
commit 5ab7146e19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/14974.misc Normal file
View File

@ -0,0 +1 @@
Add `Synapse-Trace-Id` to `access-control-expose-headers` header.

4
synapse/http/server.py
View File

@ -892,6 +892,10 @@ def set_cors_headers(request: SynapseRequest) -> None:
b"Access-Control-Allow-Headers", b"Access-Control-Allow-Headers",
b"X-Requested-With, Content-Type, Authorization, Date", 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: def set_corp_headers(request: Request) -> None:

4
tests/test_server.py
View File

@ -266,6 +266,10 @@ class OptionsResourceTests(unittest.TestCase):
[b"X-Requested-With, Content-Type, Authorization, Date"], [b"X-Requested-With, Content-Type, Authorization, Date"],
"has correct CORS Headers header", "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: def _check_cors_msc3886_headers(self, channel: FakeChannel) -> None:
# Ensure the correct CORS headers have been added # Ensure the correct CORS headers have been added