OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity
MatrixSynapse/synapse
History
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
..
_scripts Run Black. (#5482) 2019-06-20 19:32:02 +10:00
api Change user deactivated errcode to USER_DEACTIVATED and use it (#5686) 2019-07-31 15:19:06 +01:00
app Drop dependency on sdnotify (#5871) 2019-08-17 09:09:52 +01:00
appservice Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
config Fix a bug with saml attribute maps. 2019-09-19 20:32:14 +01:00
crypto Share SSL options for well-known requests 2019-07-31 10:39:24 +01:00
events Merge pull request #5805 from matrix-org/erikj/validate_state 2019-08-01 13:45:48 +01:00
federation Wrap `get_local_public_room_list` call in `maybeDeferred` because it 2019-08-14 14:53:49 +01:00
groups Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
handlers Handle TimelineBatch being limited and empty. 2019-08-06 12:59:00 +01:00
http Make default well known cache global again. 2019-08-13 10:06:51 +01:00
logging Make Jaeger fully configurable (#5694) 2019-07-23 15:46:04 +01:00
metrics Support Prometheus_client 0.4.0+ (#5636) 2019-07-18 23:57:15 +10:00
module_api Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
push Remove redundant return 2019-08-13 12:50:36 +01:00
replication Bugfixes 2019-07-24 13:47:51 +01:00
res/templates Allow defining HTML templates to serve the user on account renewal 2019-08-01 11:59:27 +02:00
rest Don't load the media repo when configured to use an external media repo (#5754) 2019-08-13 21:49:28 +10:00
server_notices Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
state Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
static Add 'rel' attribute to default welcome page. (#5695) 2019-07-19 12:03:36 +01:00
storage Merge pull request #5809 from matrix-org/erikj/handle_pusher_stop 2019-08-13 14:08:29 +01:00
streams Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
util Fix a bug with saml attribute maps. 2019-09-19 20:32:14 +01:00
__init__.py 1.3.1 2019-08-17 09:16:17 +01:00
event_auth.py Run Black. (#5482) 2019-06-20 19:32:02 +10:00
notifier.py Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00
python_dependencies.py Drop dependency on sdnotify (#5871) 2019-08-17 09:09:52 +01:00
secrets.py Run Black. (#5482) 2019-06-20 19:32:02 +10:00
server.py cleanups 2019-06-27 00:37:41 +01:00
server.pyi Run Black. (#5482) 2019-06-20 19:32:02 +10:00
types.py Run Black. (#5482) 2019-06-20 19:32:02 +10:00
visibility.py Replace returnValue with return (#5736) 2019-07-23 23:00:55 +10:00