Browse Source

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

tags/v1.80.0rc1
Shay 1 year ago
committed by GitHub
parent
commit
5ab7146e19
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
  1. +1
    -0
      changelog.d/14974.misc
  2. +4
    -0
      synapse/http/server.py
  3. +4
    -0
      tests/test_server.py

+ 1
- 0
changelog.d/14974.misc View File

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

+ 4
- 0
synapse/http/server.py View File

@@ -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:


+ 4
- 0
tests/test_server.py View File

@@ -266,6 +266,10 @@ class OptionsResourceTests(unittest.TestCase):
[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


Loading…
Cancel
Save