Skip to content

Commit 138a85f

Browse files
shcherbakshcherbak
committed
keys to user-hash workers
1 parent 4ffe5e7 commit 138a85f

7 files changed

Lines changed: 40 additions & 121 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.4.16
5+
version: 2.4.17

‎charts/synapse/templates/envoy-configmap.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ data:
165165
name: whoami_hash
166166
{{- end }}
167167
168-
169168
{{- range $route := .Values.ingress.syncKeysRoutes }}
170169
- match:
171170
safe_regex:

‎charts/synapse/tests/golden/fixtures/test-envoy-configmap-msc4306.golden.yaml‎

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ data:
225225
name: whoami_hash
226226
- match:
227227
safe_regex:
228-
regex: '^/_matrix/client/(r0|v3|unstable)/room_keys/keys(/[^/]+)?(/[^/]+)?$'
228+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/room_keys/.*$'
229229
route:
230230
timeout: 300s
231231
auto_host_rewrite: true
@@ -239,7 +239,7 @@ data:
239239
name: whoami_hash
240240
- match:
241241
safe_regex:
242-
regex: '^/_matrix/client/(r0|v3|unstable)/room_keys/version(/[^/]+)?$'
242+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/(query|changes|claim|room_keys/.*)$'
243243
route:
244244
timeout: 300s
245245
auto_host_rewrite: true
@@ -351,35 +351,35 @@ data:
351351
cluster: httpd-account-data
352352
- match:
353353
safe_regex:
354-
regex: '^/_matrix/client/(r0|v3)/delete_devices$'
354+
regex: '^/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
355355
route:
356356
timeout: 300s
357357
auto_host_rewrite: true
358358
cluster: httpd-device-lists
359359
- match:
360360
safe_regex:
361-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/.*)?$'
361+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
362362
route:
363363
timeout: 300s
364364
auto_host_rewrite: true
365365
cluster: httpd-device-lists
366366
- match:
367367
safe_regex:
368-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
368+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
369369
route:
370370
timeout: 300s
371371
auto_host_rewrite: true
372372
cluster: httpd-device-lists
373373
- match:
374374
safe_regex:
375-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
375+
regex: '^/_matrix/client/(r0|v3)/delete_devices$'
376376
route:
377377
timeout: 300s
378378
auto_host_rewrite: true
379379
cluster: httpd-device-lists
380380
- match:
381381
safe_regex:
382-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
382+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/.*)?$'
383383
route:
384384
timeout: 300s
385385
auto_host_rewrite: true
@@ -667,34 +667,6 @@ data:
667667
timeout: 300s
668668
auto_host_rewrite: true
669669
cluster: httpd-matrix-auth
670-
- match:
671-
safe_regex:
672-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/changes$'
673-
route:
674-
timeout: 300s
675-
auto_host_rewrite: true
676-
cluster: httpd-client-reader
677-
- match:
678-
safe_regex:
679-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/claim$'
680-
route:
681-
timeout: 300s
682-
auto_host_rewrite: true
683-
cluster: httpd-client-reader
684-
- match:
685-
safe_regex:
686-
regex: '^/_matrix/client/unstable/org\.matrix\.msc3983/keys/claim$'
687-
route:
688-
timeout: 300s
689-
auto_host_rewrite: true
690-
cluster: httpd-client-reader
691-
- match:
692-
safe_regex:
693-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/query$'
694-
route:
695-
timeout: 300s
696-
auto_host_rewrite: true
697-
cluster: httpd-client-reader
698670
- match:
699671
safe_regex:
700672
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact/.*'

‎charts/synapse/tests/golden/fixtures/test-envoy-configmap-no-mas.golden.yaml‎

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ data:
246246
name: whoami_hash
247247
- match:
248248
safe_regex:
249-
regex: '^/_matrix/client/(r0|v3|unstable)/room_keys/keys(/[^/]+)?(/[^/]+)?$'
249+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/room_keys/.*$'
250250
route:
251251
timeout: 300s
252252
auto_host_rewrite: true
@@ -260,7 +260,7 @@ data:
260260
name: whoami_hash
261261
- match:
262262
safe_regex:
263-
regex: '^/_matrix/client/(r0|v3|unstable)/room_keys/version(/[^/]+)?$'
263+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/(query|changes|claim|room_keys/.*)$'
264264
route:
265265
timeout: 300s
266266
auto_host_rewrite: true
@@ -372,35 +372,35 @@ data:
372372
cluster: httpd-account-data
373373
- match:
374374
safe_regex:
375-
regex: '^/_matrix/client/(r0|v3)/delete_devices$'
375+
regex: '^/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
376376
route:
377377
timeout: 300s
378378
auto_host_rewrite: true
379379
cluster: httpd-device-lists
380380
- match:
381381
safe_regex:
382-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/.*)?$'
382+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
383383
route:
384384
timeout: 300s
385385
auto_host_rewrite: true
386386
cluster: httpd-device-lists
387387
- match:
388388
safe_regex:
389-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
389+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
390390
route:
391391
timeout: 300s
392392
auto_host_rewrite: true
393393
cluster: httpd-device-lists
394394
- match:
395395
safe_regex:
396-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
396+
regex: '^/_matrix/client/(r0|v3)/delete_devices$'
397397
route:
398398
timeout: 300s
399399
auto_host_rewrite: true
400400
cluster: httpd-device-lists
401401
- match:
402402
safe_regex:
403-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
403+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/.*)?$'
404404
route:
405405
timeout: 300s
406406
auto_host_rewrite: true
@@ -660,34 +660,6 @@ data:
660660
timeout: 300s
661661
auto_host_rewrite: true
662662
cluster: httpd-user-dir
663-
- match:
664-
safe_regex:
665-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/changes$'
666-
route:
667-
timeout: 300s
668-
auto_host_rewrite: true
669-
cluster: httpd-client-reader
670-
- match:
671-
safe_regex:
672-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/claim$'
673-
route:
674-
timeout: 300s
675-
auto_host_rewrite: true
676-
cluster: httpd-client-reader
677-
- match:
678-
safe_regex:
679-
regex: '^/_matrix/client/unstable/org\.matrix\.msc3983/keys/claim$'
680-
route:
681-
timeout: 300s
682-
auto_host_rewrite: true
683-
cluster: httpd-client-reader
684-
- match:
685-
safe_regex:
686-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/query$'
687-
route:
688-
timeout: 300s
689-
auto_host_rewrite: true
690-
cluster: httpd-client-reader
691663
- match:
692664
safe_regex:
693665
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact/.*'

‎charts/synapse/tests/golden/fixtures/test-envoy-configmap.golden.yaml‎

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ data:
211211
name: whoami_hash
212212
- match:
213213
safe_regex:
214-
regex: '^/_matrix/client/(r0|v3|unstable)/room_keys/keys(/[^/]+)?(/[^/]+)?$'
214+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/room_keys/.*$'
215215
route:
216216
timeout: 300s
217217
auto_host_rewrite: true
@@ -225,7 +225,7 @@ data:
225225
name: whoami_hash
226226
- match:
227227
safe_regex:
228-
regex: '^/_matrix/client/(r0|v3|unstable)/room_keys/version(/[^/]+)?$'
228+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/(query|changes|claim|room_keys/.*)$'
229229
route:
230230
timeout: 300s
231231
auto_host_rewrite: true
@@ -337,35 +337,35 @@ data:
337337
cluster: httpd-account-data
338338
- match:
339339
safe_regex:
340-
regex: '^/_matrix/client/(r0|v3)/delete_devices$'
340+
regex: '^/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
341341
route:
342342
timeout: 300s
343343
auto_host_rewrite: true
344344
cluster: httpd-device-lists
345345
- match:
346346
safe_regex:
347-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/.*)?$'
347+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
348348
route:
349349
timeout: 300s
350350
auto_host_rewrite: true
351351
cluster: httpd-device-lists
352352
- match:
353353
safe_regex:
354-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
354+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
355355
route:
356356
timeout: 300s
357357
auto_host_rewrite: true
358358
cluster: httpd-device-lists
359359
- match:
360360
safe_regex:
361-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
361+
regex: '^/_matrix/client/(r0|v3)/delete_devices$'
362362
route:
363363
timeout: 300s
364364
auto_host_rewrite: true
365365
cluster: httpd-device-lists
366366
- match:
367367
safe_regex:
368-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
368+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/devices(/.*)?$'
369369
route:
370370
timeout: 300s
371371
auto_host_rewrite: true
@@ -653,34 +653,6 @@ data:
653653
timeout: 300s
654654
auto_host_rewrite: true
655655
cluster: httpd-matrix-auth
656-
- match:
657-
safe_regex:
658-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/changes$'
659-
route:
660-
timeout: 300s
661-
auto_host_rewrite: true
662-
cluster: httpd-client-reader
663-
- match:
664-
safe_regex:
665-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/claim$'
666-
route:
667-
timeout: 300s
668-
auto_host_rewrite: true
669-
cluster: httpd-client-reader
670-
- match:
671-
safe_regex:
672-
regex: '^/_matrix/client/unstable/org\.matrix\.msc3983/keys/claim$'
673-
route:
674-
timeout: 300s
675-
auto_host_rewrite: true
676-
cluster: httpd-client-reader
677-
- match:
678-
safe_regex:
679-
regex: '^/_matrix/client/(r0|v3|unstable)/keys/query$'
680-
route:
681-
timeout: 300s
682-
auto_host_rewrite: true
683-
cluster: httpd-client-reader
684656
- match:
685657
safe_regex:
686658
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact/.*'

‎charts/synapse/tests/golden/fixtures/test-envoy-deployment.golden.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
app: synapse
2525
component: synapse-client-reader-envoy
2626
annotations:
27-
checksum/config: 7871cc315e55568339135531aa7453d1f5802c4e49d3939756e9875f06b9949e
27+
checksum/config: fac424abd0ce2c7141e142175540d744069d53668949e072ea858f44e5e2d602
2828
spec:
2929
terminationGracePeriodSeconds: 60
3030
containers:

‎charts/synapse/values.yaml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -401,13 +401,13 @@ ingress:
401401

402402
# shold be before encryption rules ^/_matrix/client/(r0|v3|unstable)/keys/.*
403403
deviceListsRoutes:
404+
- '/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
405+
- '/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
406+
- '/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
404407
- '/_matrix/client/(r0|v3)/delete_devices$'
405408
#- /_matrix/client/(api/v1|r0|v3|unstable)/devices(/|$)
406409
- '/_matrix/client/(api/v1|r0|v3|unstable)/devices(/.*)?$'
407410
#- /_matrix/client/(r0|v3|unstable)/keys/upload
408-
- '/_matrix/client/(r0|v3|unstable)/keys/upload(/.*)?$'
409-
- '/_matrix/client/(api/v1|r0|v3|unstable)/keys/device_signing/upload$'
410-
- '/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$'
411411

412412
# validated 020626
413413
threadSubscriptionsRoutes:
@@ -435,11 +435,6 @@ ingress:
435435
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/[^/]+/initialSync$"
436436
- '/_matrix/client/unstable/org\.matrix\.simplified_msc3575/sync$'
437437

438-
# by user-id
439-
syncKeysRoutes:
440-
- '/_matrix/client/(r0|v3|unstable)/room_keys/keys(/[^/]+)?(/[^/]+)?$'
441-
- '/_matrix/client/(r0|v3|unstable)/room_keys/version(/[^/]+)?$'
442-
443438
userDirectoryRoutes:
444439
- "/_matrix/client/(r0|v3|unstable)/user_directory/search$"
445440

@@ -455,14 +450,23 @@ ingress:
455450
- '/_matrix/client/(r0|v3|unstable)/knock/.*'
456451
- '/_matrix/client/(api/v1|r0|v3|unstable)/profile/.*'
457452
# by round-robin
458-
clientReaderRoomKeys:
459-
- '/_matrix/client/(r0|v3|unstable)/keys/changes$'
460-
- '/_matrix/client/(r0|v3|unstable)/keys/claim$'
461-
- '/_matrix/client/unstable/org\.matrix\.msc3983/keys/claim$'
462-
- '/_matrix/client/(r0|v3|unstable)/keys/query$'
453+
clientReaderRoomKeys: []
454+
# - "/_matrix/client/(api/v1|r0|v3|unstable)/room_keys/.*$"
455+
# #- "/_matrix/client/(api/v1|r0|v3|unstable)/room_keys/"
456+
# - "/_matrix/client/(api/v1|r0|v3|unstable)/keys/(query|changes|claim|room_keys/.*)$"
457+
# #- "/_matrix/client/(api/v1|r0|v3|unstable)/keys/(query|changes|claim|room_keys/)"
458+
463459
# moved to deviceListsRoutes
464460
# - '/_matrix/client/(r0|v3|unstable)/keys/query$'
465461

462+
# by user-id
463+
syncKeysRoutes:
464+
# - '/_matrix/client/(r0|v3|unstable)/room_keys/keys(/[^/]+)?(/[^/]+)?$'
465+
# - '/_matrix/client/(r0|v3|unstable)/room_keys/version(/[^/]+)?$'
466+
- "/_matrix/client/(api/v1|r0|v3|unstable)/room_keys/.*$"
467+
#- "/_matrix/client/(api/v1|r0|v3|unstable)/room_keys/"
468+
- "/_matrix/client/(api/v1|r0|v3|unstable)/keys/(query|changes|claim|room_keys/.*)$"
469+
#- "/_matrix/client/(api/v1|r0|v3|unstable)/keys/(query|changes|claim|room_keys/)"
466470
# by round-robin
467471
clientReaderRoutes:
468472
- '/_matrix/client/versions$'

0 commit comments

Comments
 (0)