Matrix-Mirrors/forked-synapse - forked-synapse - Gitea: Git with a cup of tea

Matrix-Mirrors/forked-synapse

mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00

2 lines

73 B

Plaintext

Raw Normal View History

Fix a bug with saml attribute maps. Fixes a bug where the default attribute maps were prioritised over user-specified ones, resulting in incorrect mappings. The problem is that if you call SPConfig.load() multiple times, it adds new attribute mappers to a list. So by calling it with the default config first, and then the user-specified config, we would always get the default mappers before the user-specified mappers. To solve this, let's merge the config dicts first, and then pass them to SPConfig.

2019-09-19 15:29:11 -04:00

Fix a bug which caused SAML attribute maps to be overridden by defaults.