diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:29:11 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 20:32:14 +0100 |
| commit | b74606ea2262a717193f08bb6876459c1ee2d97d (patch) | |
| tree | 20a2d0e2bd3a2ff67f7034d91aed8cba0f068601 /changelog.d/6069.bugfix | |
| parent | 1.3.1 (diff) | |
| download | synapse-b74606ea2262a717193f08bb6876459c1ee2d97d.tar.xz | |
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.
Diffstat (limited to 'changelog.d/6069.bugfix')
| -rw-r--r-- | changelog.d/6069.bugfix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/6069.bugfix b/changelog.d/6069.bugfix new file mode 100644 index 0000000000..a437ac41a9 --- /dev/null +++ b/changelog.d/6069.bugfix @@ -0,0 +1 @@ +Fix a bug which caused SAML attribute maps to be overridden by defaults. |