forked-synapse/synapse/config
Richard van der Hoff b74606ea22 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 20:32:14 +01:00
..
__init__.py ConsentResource to gather policy consent from users 2018-05-15 15:11:59 +01:00
__main__.py Fix synapse.config.__main__ on python 3 (#4356) 2019-01-08 10:03:09 +11:00
_base.py Clean up arg name and remove lying comment 2019-07-16 11:39:40 +01:00
api.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
appservice.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
captcha.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
cas.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
consent_config.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
database.py Change add_arguments to be a static method 2019-07-15 14:09:33 +01:00
emailconfig.py Make errors about email password resets much clearer (#5616) 2019-07-05 10:44:12 +01:00
groups.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
homeserver.py Add basic opentracing support (#5544) 2019-07-11 10:36:03 +01:00
jwt_config.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
key.py Remove non-functional 'expire_access_token' setting (#5782) 2019-07-30 08:25:02 +01:00
logger.py Remove non-dedicated logging options and command line arguments (#5678) 2019-07-19 01:40:08 +10:00
metrics.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
password_auth_providers.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
password.py Added possibilty to disable local password authentication (#5092) 2019-06-27 18:37:29 +01:00
push.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
ratelimiting.py Fixes to the federation rate limiter (#5621) 2019-07-05 11:10:19 +01:00
registration.py Lint 2019-08-01 12:19:08 +02:00
repository.py fix config being a dict, actually 2019-08-14 02:06:42 +10:00
room_directory.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
saml2_config.py Fix a bug with saml attribute maps. 2019-09-19 20:32:14 +01:00
server_notices_config.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
server.py Room Complexity Client Implementation (#5783) 2019-07-30 02:47:27 +10:00
spam_checker.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
stats.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
third_party_event_rules.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
tls.py Update the TLS cipher string and provide configurability for TLS on outgoing federation (#5550) 2019-06-28 18:19:09 +10:00
tracer.py Make Jaeger fully configurable (#5694) 2019-07-23 15:46:04 +01:00
user_directory.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
voip.py Don't load the generated config as the default. 2019-06-24 14:14:52 +01:00
workers.py Fix logging in workers (#5729) 2019-07-22 16:05:00 +01:00