Commit Graph
426 Commits
Author SHA1 Message Date
Quentin Gliech e4844968d3 Add a configuration option to make email optional for password registration 2025-10-07 17:28:01 +02:00
Quentin Gliech 156c23b743 Trim the secret read by the matrix.secret_file configuration option (#4961) 2025-09-12 15:36:19 +02:00
Martin Weinelt 823c60f43d Trim matrix secret when read from file
Treat the secret the same as synapse when read from file a file, so that
the same secret file can be reused between mas and synapse.

https://github.com/element-hq/synapse/blob/v1.137.0/synapse/config/experimental.py#L50
2025-09-03 01:37:47 +02:00
Quentin Gliech 6eac7ed2d7 Automatically derive the kid from the key fingerprint if missing (#4876) 2025-09-02 17:04:35 +02:00
Kai A. Hiller a65c9afb29 Switch to JWK Thumbprints 2025-08-20 18:22:21 +02:00
Kai A. Hiller 3d911a8beb Remove kid from test config and config generation 2025-08-20 18:04:39 +02:00
Quentin Gliech 3eaa27ce8c Un-hide a few elidded lifetimes 2025-08-18 10:35:28 +02:00
Quentin Gliech 6a2492e70b Fix a few clippy lints, mostly in doc comments 2025-08-18 10:34:28 +02:00
Quentin Gliech 45b6b567db Collapse a few nested if now that we have if let chains 2025-08-18 10:29:30 +02:00
Kai A. Hiller 1b7b43b559 Auto-generate kid if not given 2025-08-08 11:38:45 +02:00
Quentin Gliech 9969898031 Merge branch 'main' into secret_file 2025-08-05 15:37:32 +02:00
Quentin Gliech f302711a37 Make MAS use the modern Synapse API by default 2025-08-05 15:03:32 +02:00
Quentin Gliech 884c66891a Merge branch 'main' into secret_file 2025-08-05 11:17:39 +02:00
Kai A. Hiller a7e7c3caa1 Add clients.[].client_secret_file config option 2025-08-04 19:32:39 +02:00
Quentin Gliech ea873577aa Fix many clippy warnings
This is because the tracing-attributes update made clippy look at those
again. I've removed the `too_many_lines` lint, as it's not really useful
and we ignore it most of the time anyway.
2025-07-30 14:49:38 +02:00
Kai A. Hiller d4a318a8ae Add matrix.secret_file config option 2025-07-29 19:46:07 +02:00
Kai A. Hiller 33096c7c87 Fix typo in secrets config output 2025-07-24 10:21:55 +02:00
Quentin Gliech cfa9a23d86 Merge branch 'main' into feat/allow_override_user 2025-07-21 17:03:35 +02:00
Quentin Gliech 832244675d Threaten to switch to using the modern API in a few releases. 2025-07-21 13:15:48 +02:00
olivier 776da31c52 fix err return 2025-07-21 10:13:04 +02:00
olivier c7b57f7d4c fix rust style 2025-07-21 09:52:24 +02:00
Olivier DandQuentin Gliech cdc75ffbf3 use match
Co-authored-by: Quentin Gliech <quenting@element.io>
2025-07-21 09:52:24 +02:00
mcalinghee 3774850c94 use of UpstreamOAuthProviderLocalpartPreference 2025-07-21 09:52:24 +02:00
mcalinghee 98912f4ada allow importing existing users when the localpart matches in upstream OAuth 2.0 logins 2025-07-21 09:52:24 +02:00
Quentin Gliech c649603830 Use the new dedicated Synapse API 2025-07-18 16:39:24 +02:00
Quentin Gliech 63a47aa41b Box all the figment errors to avoid large enum differences 2025-07-16 19:23:06 +02:00
Quentin Gliech 8d6621f00e Log out oauth & compat sessions when receiving a backchannel logout request 2025-07-04 16:27:10 +02:00
Quentin Gliech e28ffccc3a Backchannel logout behavior settings on upstream providers 2025-07-04 16:27:10 +02:00
Quentin Gliech 3bc32dca72 Merge branch 'main' into ref-merge/60f16ef1ade7094e9954f70dd4f6737b63f8f0b7 2025-06-17 17:08:29 +02:00
Quentin Gliech 81a61e3c06 Fix loading of DER-encoded key files 2025-06-17 16:52:33 +02:00
Quentin Gliech c3707c13ae Add license headers in most files that missed them 2025-06-12 11:01:07 +02:00
Quentin Gliech 3d96dc9d47 Update license headers to match the actual license 2025-06-12 10:32:16 +02:00
Quentin Gliech 97e83e1467 Define all the dependencies at the workspace level 2025-06-10 14:25:38 +02:00
Quentin Gliech 8df03bf185 Support for experimental plan management tab in UI (#4549) 2025-06-10 14:14:24 +02:00
Hugh Nimmo-Smith 48639202a4 Lint 2025-06-06 10:40:13 +01:00
Hugh Nimmo-Smith d6dd647f79 Make plan_management_iframe_uri be a String not URL 2025-06-06 10:31:45 +01:00
Quentin Gliech 50b41a6613 Add secrets.encryption_file config option (#4617) 2025-06-05 15:14:55 +02:00
Quentin Gliech ae71b75ce1 config: Refactor parsing of secrets section (#4602) 2025-06-05 15:13:00 +02:00
Kai A. Hiller 3ac2e983bb Skip encryption serialization if None
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-04 11:53:43 +02:00
Kai A. Hiller f1937ff5c1 Treat content of encryption_file as hex-encoded
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-04 11:53:43 +02:00
Kai A. Hiller d8081c29b1 Skip deserialization if field is None 2025-06-04 11:52:33 +02:00
Kai A. Hiller c5b1db7042 Use default implementation of validate function 2025-06-04 10:27:16 +02:00
V02460andQuentin Gliech bc13812035 Use futures-util dependency
Co-authored-by: Quentin Gliech <quenting@element.io>
2025-06-04 10:25:14 +02:00
Quentin Gliech 685f4761cd Add config flag to require registration tokens for password registrations 2025-06-03 17:42:53 +02:00
Kai A. Hiller c8cbb7329e Add secrets.encryption_file config option
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-02 18:39:19 +02:00
Kai A. Hiller c67fb80b1e Load keys concurrently
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-02 14:06:43 +02:00
Kai A. Hiller ec693edb72 Refactor key options in secret config
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-02 14:06:43 +02:00
Kai A. Hiller e92d16c35c Refactor password options in secret config
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-02 14:06:43 +02:00
Kai A. Hiller b0fcf0bf78 Add KeyConfig doc comment
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-02 14:06:43 +02:00
Kai A. Hiller 2def4f561c Add futures crate
Signed-off-by: Kai A. Hiller <git@kaialexhiller.de>
2025-06-02 14:06:43 +02:00