Skip to content

Commit 5d811d1

Browse files
committed
/_matrix/client/(r0|v3|unstable)/room_keys/version fix
1 parent 26a4ed7 commit 5d811d1

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

charts/synapse/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v2
22
appVersion: 1.151.0
33
description: matrix synapse kubernetes deployment
44
name: synapse
5-
version: 2.3.15
5+
version: 2.3.16

charts/synapse/scripts/envoy.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,13 @@ static_resources:
134134
timeout: 300s
135135
auto_host_rewrite: true
136136
cluster: httpd-client-reader
137+
- match:
138+
safe_regex:
139+
regex: '^/_matrix/client/(r0|v3|unstable)/room_keys/version'
140+
route:
141+
timeout: 300s
142+
auto_host_rewrite: true
143+
cluster: httpd-client-reader
137144
# notifications
138145
# source: notifications.py:46 client_patterns("/notifications$") -> (r0|v3|unstable)
139146
- match:

charts/synapse/values.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,13 @@ ingress:
398398
# routes to account_data stream writer singleton worker
399399
# source: account_data.py, tags.py - all client_patterns() without v1 -> (r0|v3|unstable)
400400
accountData:
401+
# original
401402
- "/_matrix/client/(r0|v3|unstable)/.*/tags"
402403
- "/_matrix/client/(r0|v3|unstable)/.*/account_data"
403-
# https://matrix-org.github.io/synapse/latest/workers.html#the-receipts-stream
404+
# fix priority
405+
- '/_matrix/client/(r0|v3|unstable)/user/[^/]+/rooms/(?:%21|!)[A-Za-z0-9._=\-]+(?::|%3[Aa])[A-Za-z0-9.\-]+/account_data'
406+
- '/_matrix/client/(r0|v3|unstable)/user/[^/]+/rooms/(?:%21|!)[A-Za-z0-9._=\-]+(?::|%3[Aa])[A-Za-z0-9.\-]+/tags'
407+
# https://matrix-org.github.io/synapse/latest/workers.html#the-receipts-stream
404408
# routes to receipts stream writer multiple workers
405409
# source: receipts.py:41, read_marker.py:40 - client_patterns() -> (r0|v3|unstable)
406410
# Caution(!): patterns must be longer than roomRoutes (73 chars) because of ImplementationSpecific
@@ -523,6 +527,7 @@ ingress:
523527
- "/_matrix/client/(api/v1|r0|v3|unstable)/profile/" # workers.md:285
524528
#
525529
- "/_matrix/client/(api/v1|r0|v3|unstable)/account/(3pid|whoami|deactivate)" # workers.md:244
530+
- "/_matrix/client/(r0|v3|unstable)/room_keys/version"
526531
# disabled if MAS is enabled
527532
# NOTE: /register* entries here are shadowed by masterOverridesRoutes `register` (no $ anchor).
528533
# Only login$ and password_policy$ can actually reach client_reader.

0 commit comments

Comments
 (0)