diff options
| author | Shay <hillerys@element.io> | 2023-03-20 11:14:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 11:14:05 -0700 |
| commit | 5ab7146e191c4160cbecf4c6dec6a0f2ed00e171 (patch) | |
| tree | 8d78b403302acef5ed02df8cb6e8904ecc8006bb | |
| parent | Mirror images to the GitHub Container Registry (`ghcr.io/matrix-org/synapse`)... (diff) | |
| download | synapse-5ab7146e191c4160cbecf4c6dec6a0f2ed00e171.tar.xz | |
Add Synapse-Trace-Id to access-control-expose-headers header (#14974)
| -rw-r--r-- | changelog.d/14974.misc | 1 | ||||
| -rw-r--r-- | synapse/http/server.py | 4 | ||||
| -rw-r--r-- | tests/test_server.py | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/changelog.d/14974.misc b/changelog.d/14974.misc new file mode 100644 index 0000000000..05c5f01444 --- /dev/null +++ b/changelog.d/14974.misc @@ -0,0 +1 @@ +Add `Synapse-Trace-Id` to `access-control-expose-headers` header. diff --git a/synapse/http/server.py b/synapse/http/server.py index 9314454af1..7b760505b2 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -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: diff --git a/tests/test_server.py b/tests/test_server.py index d67d7722a4..e266c06a2c 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -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 |