Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7e6e588e60 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we resent "limit exceeded" server notices  
							
							 
							
							... 
							
							
							
							This was due to a bug where we mutated a cached event's contents 
							
						 
						
							2018-08-23 16:21:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c5842dff1a 
								
							
								 
							
						 
						
							
							
								
								Actually run the tests  
							
							 
							
							
							
						 
						
							2018-08-23 10:35:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fd2dbf1836 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
							
							 
							
							
							
						 
						
							2018-08-22 17:06:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9643a6f7f2 
								
							
								 
							
						 
						
							
							
								
								Update notice format  
							
							 
							
							
							
						 
						
							2018-08-22 17:00:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								764030cf63 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3659  from matrix-org/erikj/split_profiles  
							
							 
							
							... 
							
							
							
							Allow profile updates to happen on workers 
							
						 
						
							2018-08-22 11:35:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								3bf8bab8f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3673  from matrix-org/erikj/refactor_state_handler  
							
							 
							
							... 
							
							
							
							Refactor state module to support multiple room versions 
							
						 
						
							2018-08-22 10:04:55 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								bb81e78ec6 
								
									
								
							
								 
							
						 
						
							
							
								
								Split the state_group_cache in two ( #3726 )  
							
							 
							
							... 
							
							
							
							Splits the state_group_cache in two.
One half contains normal state events; the other contains member events.
The idea is that the lazyloading common case of: "I want a subset of member events plus all of the other state" can be accomplished efficiently by splitting the cache into two, and asking for "all events" from the non-members cache, and "just these keys" from the members cache.  This means we can avoid having to make DictionaryCache aware of these sort of complicated queries, whilst letting LL requests benefit from the caching.
Previously we were unable to sensibly use the caching and had to pull all state from the DB irrespective of the filtering, which made things slow.  Hopefully fixes https://github.com/matrix-org/synapse/issues/3720 . 
							
						 
						
							2018-08-22 00:56:37 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4d664278af 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_state_handler  
							
							 
							
							
							
						 
						
							2018-08-20 14:49:43 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e07970165f 
								
							
								 
							
						 
						
							
							
								
								rename error code  
							
							 
							
							
							
						 
						
							2018-08-18 14:39:45 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ba1fbf7d5b 
								
							
								 
							
						 
						
							
							
								
								special case server_notices_mxid  
							
							 
							
							
							
						 
						
							2018-08-18 12:31:08 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								c334ca67bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Integrate presence from hotfixes ( #3694 )  
							
							 
							
							
							
						 
						
							2018-08-18 01:08:45 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								d49b77404b 
								
							
								 
							
						 
						
							
							
								
								clean up, no functional changes  
							
							 
							
							
							
						 
						
							2018-08-17 15:21:34 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								63260397c6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3701  from matrix-org/rav/use_producer_for_responses  
							
							 
							
							... 
							
							
							
							Use a producer to stream back responses 
							
						 
						
							2018-08-17 14:58:45 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								3ee57bdcbb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
							
							 
							
							
							
						 
						
							2018-08-17 14:34:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								782689bd40 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles  
							
							 
							
							
							
						 
						
							2018-08-17 14:15:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ca87ad1def 
								
							
								 
							
						 
						
							
							
								
								Split ProfileHandler into master and worker  
							
							 
							
							
							
						 
						
							2018-08-17 14:15:14 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								b5f638f1f4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
							
							 
							
							
							
						 
						
							2018-08-17 14:04:15 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								69c49d3fa3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/limit_exceeded_error  
							
							 
							
							
							
						 
						
							2018-08-17 12:44:26 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								bcfeb44afe 
								
							
								 
							
						 
						
							
							
								
								call reap on start up and fix under reaping bug  
							
							 
							
							
							
						 
						
							2018-08-16 22:55:32 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								13ad9930c8 
								
							
								 
							
						 
						
							
							
								
								add new error type ResourceLimit  
							
							 
							
							
							
						 
						
							2018-08-16 18:02:02 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								3c1080b6e4 
								
							
								 
							
						 
						
							
							
								
								refactor for readability, and reuse caching for setting tags  
							
							 
							
							
							
						 
						
							2018-08-16 17:02:04 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								a675f9c556 
								
							
								 
							
						 
						
							
							
								
								check for room state before deciding on action  
							
							 
							
							
							
						 
						
							2018-08-16 14:53:35 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								8cfad2e686 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
							
							 
							
							
							
						 
						
							2018-08-15 17:20:38 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								81d727efa9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3689  from matrix-org/neilj/fix_off_by_1+maus  
							
							 
							
							... 
							
							
							
							Fix Mau off by one errors 
							
						 
						
							2018-08-15 16:19:41 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								2f78f432c4 
								
							
								 
							
						 
						
							
							
								
								speed up /members and add at= and membership params ( #3568 )  
							
							 
							
							
							
						 
						
							2018-08-15 16:35:22 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								fc5d937550 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
							
							 
							
							
							
						 
						
							2018-08-15 16:31:40 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								86a00e05e1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus  
							
							 
							
							
							
						 
						
							2018-08-15 16:27:08 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								a87af25fbb 
								
							
								 
							
						 
						
							
							
								
								Fix the tests  
							
							 
							
							
							
						 
						
							2018-08-15 15:12:23 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								75c663c7b9 
								
							
								 
							
						 
						
							
							
								
								update error codes  
							
							 
							
							
							
						 
						
							2018-08-15 11:27:48 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								b8429c7c81 
								
							
								 
							
						 
						
							
							
								
								update error codes for resource limiting  
							
							 
							
							
							
						 
						
							2018-08-15 10:19:48 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ab035bdeac 
								
							
								 
							
						 
						
							
							
								
								replace admin_email with admin_uri for greater flexibility  
							
							 
							
							
							
						 
						
							2018-08-15 10:16:41 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								19b433e3f4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email  
							
							 
							
							
							
						 
						
							2018-08-14 17:44:46 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								b586b8b986 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus  
							
							 
							
							
							
						 
						
							2018-08-14 17:43:22 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								7277216d01 
								
							
								 
							
						 
						
							
							
								
								fix setup_test_homeserver to be postgres compatible  
							
							 
							
							
							
						 
						
							2018-08-14 17:14:39 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								1522ed9c07 
								
							
								 
							
						 
						
							
							
								
								in case max_mau is less than I think  
							
							 
							
							
							
						 
						
							2018-08-14 16:52:30 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								414d54b61a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3670  from matrix-org/neilj/mau_sync_block  
							
							 
							
							... 
							
							
							
							Block ability to read via sync if mau limit exceeded 
							
						 
						
							2018-08-14 15:21:31 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								06b331ff40 
								
							
								 
							
						 
						
							
							
								
								fix off by 1 errors  
							
							 
							
							
							
						 
						
							2018-08-14 15:28:15 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								8f9a7eb58d 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							 
							
							
							
						 
						
							2018-08-14 15:11:54 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ed4bc3d2fc 
								
							
								 
							
						 
						
							
							
								
								fix off by 1s on mau  
							
							 
							
							
							
						 
						
							2018-08-14 15:04:48 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								9b5bf3d858 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'neilj/admin_email' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus  
							
							 
							
							
							
						 
						
							2018-08-14 14:51:38 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e25d87d97b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'neilj/mau_sync_block' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus  
							
							 
							
							
							
						 
						
							2018-08-14 14:32:18 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								bdfbd934d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Implement a new test baseclass to cut down on boilerplate ( #3684 )  
							
							 
							
							
							
						 
						
							2018-08-14 20:53:43 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								f4b49152e2 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							 
							
							
							
						 
						
							2018-08-13 21:09:47 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ce7de9ae6b 
								
							
								 
							
						 
						
							
							
								
								Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"  
							
							 
							
							... 
							
							
							
							This reverts commit 0d43f991a1 . 
							
						 
						
							2018-08-13 18:06:18 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								0d43f991a1 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							 
							
							
							
						 
						
							2018-08-13 18:00:23 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								99dd975dae 
								
									
								
							
								 
							
						 
						
							
							
								
								Run tests under PostgreSQL ( #3423 )  
							
							 
							
							
							
						 
						
							2018-08-13 16:47:46 +10:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								66a4ca1d28 
								
							
								 
							
						 
						
							
							
								
								404 nicely if you try to interact with a missing current version  
							
							 
							
							
							
						 
						
							2018-08-12 19:14:31 -04:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								edc427a351 
								
							
								 
							
						 
						
							
							
								
								flake8  
							
							 
							
							
							
						 
						
							2018-08-12 19:14:31 -04:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								fe87890b18 
								
							
								 
							
						 
						
							
							
								
								implement remaining tests and make them work  
							
							 
							
							
							
						 
						
							2018-08-12 19:14:31 -04:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f6a3067868 
								
							
								 
							
						 
						
							
							
								
								linting  
							
							 
							
							
							
						 
						
							2018-08-12 19:14:31 -04:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								15d513f16f 
								
							
								 
							
						 
						
							
							
								
								fix idiocies and so make tests pass  
							
							 
							
							
							
						 
						
							2018-08-12 19:14:31 -04:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								174be586e5 
								
							
								 
							
						 
						
							
							
								
								first cut at a UT  
							
							 
							
							
							
						 
						
							2018-08-12 19:14:31 -04:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								6c6aba76e1 
								
							
								 
							
						 
						
							
							
								
								implementation of server notices to alert on hitting resource limits  
							
							 
							
							
							
						 
						
							2018-08-10 15:12:59 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								807449d8f2 
								
							
								 
							
						 
						
							
							
								
								fix up a forced long line  
							
							 
							
							
							
						 
						
							2018-08-11 00:01:43 +10:00  
						
					 
				
					
						
							
							
								 
								black
							
						 
						
							 
							
							
							
								
							
								8b3d9b6b19 
								
							
								 
							
						 
						
							
							
								
								Run black.  
							
							 
							
							
							
						 
						
							2018-08-10 23:54:09 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								b37c472419 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename async to async_helpers because `async` is a keyword on Python 3.7 ( #3678 )  
							
							 
							
							
							
						 
						
							2018-08-10 23:50:21 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								3c0213a217 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3439  from vojeroen/send_sni_for_federation_requests  
							
							 
							
							... 
							
							
							
							send SNI for federation requests 
							
						 
						
							2018-08-10 12:23:54 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								885ea9c602 
								
							
								 
							
						 
						
							
							
								
								rename _user_last_seen_monthly_active  
							
							 
							
							
							
						 
						
							2018-08-09 18:02:12 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								04df714259 
								
							
								 
							
						 
						
							
							
								
								fix imports  
							
							 
							
							
							
						 
						
							2018-08-09 17:41:52 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								09cf130898 
								
							
								 
							
						 
						
							
							
								
								only block on sync where user is not part of the mau cohort  
							
							 
							
							
							
						 
						
							2018-08-09 17:39:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e19beb941 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2018-08-09 14:58:49 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								69ce057ea6 
								
							
								 
							
						 
						
							
							
								
								block sync if auth checks fail  
							
							 
							
							
							
						 
						
							2018-08-09 12:26:27 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								3dce9050cf 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block  
							
							 
							
							
							
						 
						
							2018-08-09 11:42:02 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								0ad98e38d0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3655  from matrix-org/neilj/disable_hs  
							
							 
							
							... 
							
							
							
							Flag to disable HS without disabling federation 
							
						 
						
							2018-08-09 10:41:43 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								a5ef110749 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block  
							
							 
							
							
							
						 
						
							2018-08-09 11:40:37 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								2511f3f8a0 
								
									
								
							
								 
							
						 
						
							
							
								
								Test fixes for Python 3 ( #3647 )  
							
							 
							
							
							
						 
						
							2018-08-09 12:22:01 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e92fb00f32 
								
							
								 
							
						 
						
							
							
								
								sync auth blocking  
							
							 
							
							
							
						 
						
							2018-08-08 17:54:49 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								5298d79fb5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/disable_hs  
							
							 
							
							
							
						 
						
							2018-08-08 16:13:03 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								8521ae13e3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3654  from matrix-org/rav/room_versions  
							
							 
							
							... 
							
							
							
							Support for room versioning 
							
						 
						
							2018-08-08 17:10:53 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d2f3ef98ac 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/disable_hs  
							
							 
							
							
							
						 
						
							2018-08-08 15:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								7f3d897e7a 
								
							
								 
							
						 
						
							
							
								
								mock config.max_mau_value  
							
							 
							
							
							
						 
						
							2018-08-08 11:46:23 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e8eba2b4e3 
								
							
								 
							
						 
						
							
							
								
								implement reserved users for mau limits  
							
							 
							
							
							
						 
						
							2018-08-07 17:49:43 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								fbe255f9a4 
								
							
								 
							
						 
						
							
							
								
								add default mau_limits_reserved_threepids  
							
							 
							
							
							
						 
						
							2018-08-06 23:24:54 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								42c6823827 
								
							
								 
							
						 
						
							
							
								
								disable HS from config  
							
							 
							
							
							
						 
						
							2018-08-04 22:07:04 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								d08296f9f2 
								
							
								 
							
						 
						
							
							
								
								remove unused import  
							
							 
							
							
							
						 
						
							2018-08-03 23:00:16 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								886be75ad1 
								
							
								 
							
						 
						
							
							
								
								bug fixes  
							
							 
							
							
							
						 
						
							2018-08-03 22:29:03 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e10830e976 
								
							
								 
							
						 
						
							
							
								
								wip commit - tests failing  
							
							 
							
							
							
						 
						
							2018-08-03 17:55:50 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0ca459ea33 
								
							
								 
							
						 
						
							
							
								
								Basic support for room versioning  
							
							 
							
							... 
							
							
							
							This is the first tranche of support for room versioning. It includes:
 * setting the default room version in the config file
 * new room_version param on the createRoom API
 * storing the version of newly-created rooms in the m.room.create event
 * fishing the version of existing rooms out of the m.room.create event 
							
						 
						
							2018-08-03 16:08:32 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								5593ff6773 
								
							
								 
							
						 
						
							
							
								
								fix (lots of) py3 test failures  
							
							 
							
							
							
						 
						
							2018-08-03 14:59:17 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								b2aab04d2c 
								
							
								 
							
						 
						
							
							
								
								fix py3 test failure  
							
							 
							
							
							
						 
						
							2018-08-03 14:12:56 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								950807d93a 
								
							
								 
							
						 
						
							
							
								
								fix caching and tests  
							
							 
							
							
							
						 
						
							2018-08-03 13:49:53 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								74b1d46ad9 
								
							
								 
							
						 
						
							
							
								
								do mau checks based on monthly_active_users table  
							
							 
							
							
							
						 
						
							2018-08-02 16:57:35 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								9180061b49 
								
							
								 
							
						 
						
							
							
								
								remove unused count_monthly_users  
							
							 
							
							
							
						 
						
							2018-08-02 15:55:29 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c4ffbecb68 
								
							
								 
							
						 
						
							
							
								
								fix test, update constructor call  
							
							 
							
							
							
						 
						
							2018-08-02 13:51:05 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								00f99f74b1 
								
							
								 
							
						 
						
							
							
								
								insertion into monthly_active_users  
							
							 
							
							
							
						 
						
							2018-08-02 13:47:19 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								165e067033 
								
							
								 
							
						 
						
							
							
								
								Revert "change monthly_active_users table to be a single column"  
							
							 
							
							... 
							
							
							
							This reverts commit ec716a35b2 . 
							
						 
						
							2018-08-02 10:59:58 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ec716a35b2 
								
							
								 
							
						 
						
							
							
								
								change monthly_active_users table to be a single column  
							
							 
							
							
							
						 
						
							2018-08-01 17:54:37 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								d766f26de9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker  
							
							 
							
							
							
						 
						
							2018-08-01 17:49:41 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								085435e13a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3630  from matrix-org/neilj/mau_sign_in_log_in_limits  
							
							 
							
							... 
							
							
							
							Initial impl of capping MAU 
							
						 
						
							2018-08-01 15:58:45 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								da7785147d 
								
									
								
							
								 
							
						 
						
							
							
								
								Python 3: Convert some unicode/bytes uses ( #3569 )  
							
							 
							
							
							
						 
						
							2018-08-02 00:54:06 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c480c4c962 
								
							
								 
							
						 
						
							
							
								
								fix isort  
							
							 
							
							
							
						 
						
							2018-08-01 14:25:58 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								6eed16d8a2 
								
							
								 
							
						 
						
							
							
								
								fix test for py3  
							
							 
							
							
							
						 
						
							2018-08-01 14:02:10 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								303f1c851f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sign_in_log_in_limits  
							
							 
							
							
							
						 
						
							2018-08-01 13:42:50 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								4e6e00152c 
								
							
								 
							
						 
						
							
							
								
								fix known broken test  
							
							 
							
							
							
						 
						
							2018-08-01 11:48:37 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								cab782c17e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3384  from matrix-org/rav/rewrite_cachedlist_decorator  
							
							 
							
							... 
							
							
							
							Rewrite cache list decorator 
							
						 
						
							2018-08-01 10:28:56 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								7931393495 
								
							
								 
							
						 
						
							
							
								
								make count_monthly_users async synapse/handlers/auth.py  
							
							 
							
							
							
						 
						
							2018-08-01 10:21:56 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								6ef983ce5c 
								
							
								 
							
						 
						
							
							
								
								api into monthly_active_users table  
							
							 
							
							
							
						 
						
							2018-07-31 16:36:24 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								df2235e7fa 
								
							
								 
							
						 
						
							
							
								
								coding style  
							
							 
							
							
							
						 
						
							2018-07-31 13:16:20 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								7d05406a07 
								
							
								 
							
						 
						
							
							
								
								fix user_ips counting  
							
							 
							
							
							
						 
						
							2018-07-31 12:03:23 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								e908b86832 
								
							
								 
							
						 
						
							
							
								
								Remove pdu_failures from transactions  
							
							 
							
							... 
							
							
							
							The field is never read from, and all the opportunities given to populate it are not utilized. It should be very safe to remove this. 
							
						 
						
							2018-07-30 16:28:47 -06:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								cefac79c10 
								
							
								 
							
						 
						
							
							
								
								monthly_active_tests  
							
							 
							
							
							
						 
						
							2018-07-30 22:08:09 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								251e6c1210 
								
							
								 
							
						 
						
							
							
								
								limit register and sign in on number of monthly users  
							
							 
							
							
							
						 
						
							2018-07-30 15:55:57 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a8cbce0ced 
								
							
								 
							
						 
						
							
							
								
								fix invalidation  
							
							 
							
							
							
						 
						
							2018-07-27 16:17:17 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f102c05856 
								
							
								 
							
						 
						
							
							
								
								Rewrite cache list decorator  
							
							 
							
							... 
							
							
							
							Because it was complicated and annoyed me. I suspect this will be more
efficient too. 
							
						 
						
							2018-07-27 13:47:04 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								7041cd872b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into send_sni_for_federation_requests  
							
							 
							
							
							
						 
						
							2018-07-27 09:17:11 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								2565804030 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/filter_members  
							
							 
							
							
							
						 
						
							2018-07-25 17:27:49 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0620d27f4d 
								
							
								 
							
						 
						
							
							
								
								flake8  
							
							 
							
							
							
						 
						
							2018-07-25 17:21:17 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								0a7ee0ab8b 
								
							
								 
							
						 
						
							
							
								
								add tests for _get_some_state_from_cache  
							
							 
							
							
							
						 
						
							2018-07-25 16:33:52 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f59be4eb0e 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							... 
							
							
							
							on_notifier_poke no longer runs synchonously, so we have to do a different hack
to make sure that the replication data has been sent. Let's actually listen for
its arrival. 
							
						 
						
							2018-07-25 10:30:36 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								cd241d6bda 
								
							
								 
							
						 
						
							
							
								
								incorporate more review  
							
							 
							
							
							
						 
						
							2018-07-24 12:39:40 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								adfe29ec0b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into matthew/filter_members  
							
							 
							
							
							
						 
						
							2018-07-23 19:21:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8fbe418777 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2018-07-23 13:33:49 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								3132b89f12 
								
									
								
							
								 
							
						 
						
							
							
								
								Make the rest of the .iterwhatever go away ( #3562 )  
							
							 
							
							
							
						 
						
							2018-07-21 15:47:18 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3d6df84658 
								
							
								 
							
						 
						
							
							
								
								Test and fix support for cancellation in Linearizer  
							
							 
							
							
							
						 
						
							2018-07-20 13:59:55 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								4f67623674 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3571  from matrix-org/rav/limiter_fixes  
							
							 
							
							... 
							
							
							
							A set of improvements to the Limiter 
							
						 
						
							2018-07-20 13:53:03 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								e1a237eaab 
								
									
								
							
								 
							
						 
						
							
							
								
								Admin API for creating new users ( #3415 )  
							
							 
							
							
							
						 
						
							2018-07-20 22:41:13 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7c712f95bb 
								
							
								 
							
						 
						
							
							
								
								Combine Limiter and Linearizer  
							
							 
							
							... 
							
							
							
							Linearizer was effectively a Limiter with max_count=1, so rather than
maintaining two sets of code, let's combine them. 
							
						 
						
							2018-07-20 13:11:43 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d7275eecf3 
								
							
								 
							
						 
						
							
							
								
								Add a sleep to the Limiter to fix stack overflows.  
							
							 
							
							... 
							
							
							
							Fixes  #3570  
							
						 
						
							2018-07-20 12:37:12 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								650daf5628 
								
							
								 
							
						 
						
							
							
								
								make test work  
							
							 
							
							
							
						 
						
							2018-07-19 20:49:44 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								1fa4f7e03e 
								
							
								 
							
						 
						
							
							
								
								first cut of a UT for testing state store (untested)  
							
							 
							
							
							
						 
						
							2018-07-19 20:19:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								c754e006f4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3556  from matrix-org/rav/background_processes  
							
							 
							
							... 
							
							
							
							Run things as background processes 
							
						 
						
							2018-07-19 11:04:18 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								a97c845271 
								
									
								
							
								 
							
						 
						
							
							
								
								Move v1-only APIs into their own module & isolate deprecated ones ( #3460 )  
							
							 
							
							
							
						 
						
							2018-07-19 20:03:33 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8c69b735e3 
								
							
								 
							
						 
						
							
							
								
								Make Distributor run its processes as a background process  
							
							 
							
							... 
							
							
							
							This is more involved than it might otherwise be, because the current
implementation just drops its logcontexts and runs everything in the sentinel
context.
It turns out that we aren't actually using a bunch of the functionality here
(notably suppress_failures and the fact that Distributor.fire returns a
deferred), so the easiest way to fix this is actually by simplifying a bunch of
code. 
							
						 
						
							2018-07-18 20:55:05 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d897be6a98 
								
							
								 
							
						 
						
							
							
								
								Fix visibility of events from erased users over federation  
							
							 
							
							
							
						 
						
							2018-07-17 14:02:07 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								9c04b4abf9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3541  from matrix-org/rav/optimize_filter_events_for_server  
							
							 
							
							... 
							
							
							
							Refactor and optimze filter_events_for_server 
							
						 
						
							2018-07-17 14:01:39 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								94440ae994 
								
							
								 
							
						 
						
							
							
								
								fix imports  
							
							 
							
							
							
						 
						
							2018-07-17 11:51:26 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								bc006b3c9d 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor REST API tests to use explicit reactors ( #3351 )  
							
							 
							
							
							
						 
						
							2018-07-17 20:43:18 +10:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								850238b4ef 
								
							
								 
							
						 
						
							
							
								
								Add unit test  
							
							 
							
							
							
						 
						
							2018-07-17 10:59:02 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								3fe0938b76 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3530  from matrix-org/erikj/stream_cache  
							
							 
							
							... 
							
							
							
							Don't return unknown entities in get_entities_changed 
							
						 
						
							2018-07-17 13:44:46 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								15b13b537f 
								
							
								 
							
						 
						
							
							
								
								Add a test which profiles filter_events_for_server in a large room  
							
							 
							
							
							
						 
						
							2018-07-16 14:06:09 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								ea69d35651 
								
							
								 
							
						 
						
							
							
								
								Move filter_events_for_server out of FederationHandler  
							
							 
							
							... 
							
							
							
							for easier unit testing. 
							
						 
						
							2018-07-16 13:06:24 +01:00  
						
					 
				
					
						
							
							
								 
								Jeroen
							
						 
						
							 
							
							
							
								
							
								505530f36a 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	synapse/crypto/context_factory.py 
							
						 
						
							2018-07-14 20:24:46 +02:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								33b60c01b5 
								
									
								
							
								 
							
						 
						
							
							
								
								Make auth & transactions more testable ( #3499 )  
							
							 
							
							
							
						 
						
							2018-07-14 07:34:49 +10:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bc832f822f 
								
							
								 
							
						 
						
							
							
								
								Fixup unit test  
							
							 
							
							
							
						 
						
							2018-07-13 17:03:04 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3b391d9c45 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2018-07-13 16:28:04 +01:00  
						
					 
				
					
						
							
							
								 
								Oleg Girko
							
						 
						
							 
							
							
							
								
							
								6c1ec5a1bd 
								
							
								 
							
						 
						
							
							
								
								Use more portable syntax using attrs package.  
							
							 
							
							... 
							
							
							
							Newer syntax
    attr.ib(factory=dict)
is just a syntactic sugar for
    attr.ib(default=attr.Factory(dict))
It was introduced in newest version of attrs package (18.1.0)
and doesn't work with older versions.
We should either require minimum version of attrs to be 18.1.0,
or use older (slightly more verbose) syntax.
Requiring newest version is not a good solution because
Linux distributions may have older version of attrs (17.4.0 in Fedora 28),
and requiring to build (and package)
newer version just to use newer syntactic sugar in only one test
is just too much.
It's much better to fix that test to use older syntax.
Signed-off-by: Oleg Girko <ol@infoserver.lv> 
							
						 
						
							2018-07-10 00:38:49 +01:00  
						
					 
				
					
						
							
							
								 
								Jeroen
							
						 
						
							 
							
							
							
								
							
								b5e157d895 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into send_sni_for_federation_requests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	synapse/http/endpoint.py 
							
						 
						
							2018-07-09 08:51:11 +02:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								feef8461d1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'hera/rav/server_acls' into develop  
							
							 
							
							
							
						 
						
							2018-07-05 11:04:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								1a88640677 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3483  from matrix-org/rav/more_server_name_validation  
							
							 
							
							... 
							
							
							
							More server_name validation 
							
						 
						
							2018-07-05 10:04:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3cf3e08a97 
								
							
								 
							
						 
						
							
							
								
								Implementation of server_acls  
							
							 
							
							... 
							
							
							
							... as described at
https://docs.google.com/document/d/1EttUVzjc2DWe2ciw4XPtNpUpIl9lWXGEsy2ewDS7rtw . 
							
						 
						
							2018-07-04 19:06:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								546bc9e28b 
								
							
								 
							
						 
						
							
							
								
								More server_name validation  
							
							 
							
							... 
							
							
							
							We need to do a bit more validation when we get a server name, but don't want
to be re-doing it all over the shop, so factor out a separate
parse_and_validate_server_name, and do the extra validation.
Also, use it to verify the server name in the config file. 
							
						 
						
							2018-07-04 18:59:51 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								ea555d5633 
								
							
								 
							
						 
						
							
							
								
								Reinstate lost run_on_reactor in unit test  
							
							 
							
							... 
							
							
							
							a61738b  removed a call to run_on_reactor from a unit test, but that call was
doing something useful, in making the function in question asynchronous.
Reinstate the call and add a check that we are testing what we wanted to be
testing. 
							
						 
						
							2018-07-04 09:40:01 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								508196e08a 
								
									
								
							
								 
							
						 
						
							
							
								
								Reject invalid server names ( #3480 )  
							
							 
							
							... 
							
							
							
							Make sure that server_names used in auth headers are sane, and reject them with
a sensible error code, before they disappear off into the depths of the system. 
							
						 
						
							2018-07-03 14:36:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								e3b4043800 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3456  from matrix-org/hawkowl/federation-prevevent-checking  
							
							 
							
							... 
							
							
							
							Check the state of prev_events a bit more thoroughly when coming over federation 
							
						 
						
							2018-06-29 13:55:02 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f82cf3c7df 
								
							
								 
							
						 
						
							
							
								
								add test  
							
							 
							
							
							
						 
						
							2018-06-28 21:14:16 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								e72234f6bd 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2018-06-28 20:56:07 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								f03a5d1a17 
								
							
								 
							
						 
						
							
							
								
								pep8  
							
							 
							
							
							
						 
						
							2018-06-27 11:38:14 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								94f09618e5 
								
							
								 
							
						 
						
							
							
								
								cleanups  
							
							 
							
							
							
						 
						
							2018-06-27 11:38:03 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								35cc3e8b14 
								
							
								 
							
						 
						
							
							
								
								stylistic cleanup  
							
							 
							
							
							
						 
						
							2018-06-27 11:32:09 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								8d62baa48c 
								
							
								 
							
						 
						
							
							
								
								cleanups  
							
							 
							
							
							
						 
						
							2018-06-27 11:31:48 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								77078d6c8e 
								
							
								 
							
						 
						
							
							
								
								handle federation not telling us about prev_events  
							
							 
							
							
							
						 
						
							2018-06-27 11:27:32 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								cd6bcdaf87 
								
									
								
							
								 
							
						 
						
							
							
								
								Better testing framework for homeserver-using things ( #3446 )  
							
							 
							
							
							
						 
						
							2018-06-27 10:37:24 +01:00  
						
					 
				
					
						
							
							
								 
								Jeroen
							
						 
						
							 
							
							
							
								
							
								3d605853c8 
								
							
								 
							
						 
						
							
							
								
								send SNI for federation requests  
							
							 
							
							
							
						 
						
							2018-06-24 22:38:43 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								f79abda87f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3427  from matrix-org/erikj/remove_filters  
							
							 
							
							... 
							
							
							
							remove dead filter_events_for_clients 
							
						 
						
							2018-06-22 14:45:42 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								43e02c409d 
								
							
								 
							
						 
						
							
							
								
								Disable partial state group caching for wildcard lookups  
							
							 
							
							... 
							
							
							
							When _get_state_for_groups is given a wildcard filter, just do a complete
lookup. Hopefully this will give us the best of both worlds by not filling up
the ram if we only need one or two keys, but also making the cache still work
for the federation reader usecase. 
							
						 
						
							2018-06-22 11:52:07 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								77ac14b960 
								
									
								
							
								 
							
						 
						
							
							
								
								Pass around the reactor explicitly ( #3385 )  
							
							 
							
							
							
						 
						
							2018-06-22 09:37:10 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9a793f861c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							 
							
							
							
						 
						
							2018-06-14 16:36:01 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1e77ac66e3 
								
							
								 
							
						 
						
							
							
								
								Fix broken unit test  
							
							 
							
							... 
							
							
							
							We need power levels for this test to do what it is supposed to do. 
							
						 
						
							2018-06-14 14:21:29 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a502cfec00 
								
							
								 
							
						 
						
							
							
								
								remove spurious debug  
							
							 
							
							
							
						 
						
							2018-06-14 14:20:53 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5c9afd6f80 
								
							
								 
							
						 
						
							
							
								
								Make default state_default 50  
							
							 
							
							... 
							
							
							
							Make it so that, before there is a power-levels event in the room, you need a
power level of at least 50 to send state.
Partially addresses https://github.com/matrix-org/matrix-doc/issues/1192  
							
						 
						
							2018-06-14 12:38:09 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								a61738b316 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove run_on_reactor ( #3395 )  
							
							 
							
							
							
						 
						
							2018-06-14 18:27:37 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								bd348f0af6 
								
							
								 
							
						 
						
							
							
								
								remove dead filter_events_for_clients  
							
							 
							
							... 
							
							
							
							This is only used by filter_events_for_client, so we can simplify the whole
thing by just doing one user at a time, and removing a dead storage function to
boot. 
							
						 
						
							2018-06-12 09:51:31 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								f7869f8f8b 
								
									
								
							
								 
							
						 
						
							
							
								
								Port to sortedcontainers (with tests!) ( #3332 )  
							
							 
							
							
							
						 
						
							2018-06-06 00:13:57 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								5dbf305444 
								
									
								
							
								 
							
						 
						
							
							
								
								Put python's logs into Trial when running unit tests ( #3319 )  
							
							 
							
							
							
						 
						
							2018-06-04 16:06:06 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a995fdae39 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2018-05-29 20:19:29 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								adb6bac4d5 
								
							
								 
							
						 
						
							
							
								
								fix another dumb typo  
							
							 
							
							
							
						 
						
							2018-05-29 02:29:22 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								284e36ad04 
								
							
								 
							
						 
						
							
							
								
								fix dumb typo  
							
							 
							
							
							
						 
						
							2018-05-29 02:23:11 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								a8990fa2ec 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into 3218-official-prom  
							
							 
							
							
							
						 
						
							2018-05-22 10:50:26 -05:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a5e2941aad 
								
							
								 
							
						 
						
							
							
								
								Reject attempts to send event before privacy consent is given  
							
							 
							
							... 
							
							
							
							Returns an M_CONSENT_NOT_GIVEN error (cf
https://github.com/matrix-org/matrix-doc/issues/1252 ) if consent is not yet
given. 
							
						 
						
							2018-05-22 12:00:47 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d5dca9a04f 
								
							
								 
							
						 
						
							
							
								
								Move consent config parsing into ConsentConfig  
							
							 
							
							... 
							
							
							
							turns out we need to reuse this, so it's better in the config class. 
							
						 
						
							2018-05-22 11:54:51 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9ea219c514 
								
							
								 
							
						 
						
							
							
								
								Send users a server notice about consent  
							
							 
							
							... 
							
							
							
							When a user first syncs, we will send them a server notice asking them to
consent to the privacy policy if they have not already done so. 
							
						 
						
							2018-05-22 11:54:51 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								fcc525b0b7 
								
							
								 
							
						 
						
							
							
								
								rest of the changes  
							
							 
							
							
							
						 
						
							2018-05-21 19:48:57 -05:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								df9f72d9e5 
								
							
								 
							
						 
						
							
							
								
								replacing portions  
							
							 
							
							
							
						 
						
							2018-05-21 19:47:37 -05:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6e1cb54a05 
								
							
								 
							
						 
						
							
							
								
								Fix logcontext leak in HttpTransactionCache  
							
							 
							
							... 
							
							
							
							ONE DAY I WILL PURGE THE WORLD OF THIS EVIL 
							
						 
						
							2018-05-21 16:58:20 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6d6e7288fe 
								
							
								 
							
						 
						
							
							
								
								Stop the transaction cache caching failures  
							
							 
							
							... 
							
							
							
							The transaction cache has some code which tries to stop it caching failures,
but if the callback function failed straight away, then things would happen
backwards and we'd end up with the failure stuck in the cache. 
							
						 
						
							2018-05-21 16:49:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6406b70aeb 
								
							
								 
							
						 
						
							
							
								
								Use stream rather depth ordering for push actions  
							
							 
							
							... 
							
							
							
							This simplifies things as it is, but will also allow us to change the
way we traverse topologically without having to update the way push
actions work. 
							
						 
						
							2018-05-11 15:30:11 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								902673e356 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3161  from NotAFile/remove-v1auth  
							
							 
							
							... 
							
							
							
							Make Client-Server API return 403 for invalid token 
							
						 
						
							2018-05-03 10:10:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								53a5fdf312 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3175  from matrix-org/erikj/escape_metric_values  
							
							 
							
							... 
							
							
							
							Escape label values in prometheus metrics 
							
						 
						
							2018-05-03 10:01:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								32015e1109 
								
							
								 
							
						 
						
							
							
								
								Escape label values in prometheus metrics  
							
							 
							
							
							
						 
						
							2018-05-02 16:52:42 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								415c6b672e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rav/more_logcontext_leaks  
							
							 
							
							
							
						 
						
							2018-05-02 16:16:01 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								11607006d9 
								
							
								 
							
						 
						
							
							
								
								Remove spurious unittest.DEBUG  
							
							 
							
							
							
						 
						
							2018-05-02 15:48:47 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								46beeb9a30 
								
							
								 
							
						 
						
							
							
								
								Fix a couple of logcontext leaks in unit tests  
							
							 
							
							... 
							
							
							
							... which were making other, innocent, tests, fail.
Plus remove a spurious unittest.DEBUG which was making the output noisy. 
							
						 
						
							2018-05-02 15:46:22 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f22e7cda2c 
								
							
								 
							
						 
						
							
							
								
								Fix a class of logcontext leaks  
							
							 
							
							... 
							
							
							
							So, it turns out that if you have a first `Deferred` `D1`, you can add a
callback which returns another `Deferred` `D2`, and `D2` must then complete
before any further callbacks on `D1` will execute (and later callbacks on `D1`
get the *result* of `D2` rather than `D2` itself).
So, `D1` might have `called=True` (as in, it has started running its
callbacks), but any new callbacks added to `D1` won't get run until `D2`
completes - so if you `yield D1` in an `inlineCallbacks` function, your `yield`
will 'block'.
In conclusion: some of our assumptions in `logcontext` were invalid. We need to
make sure that we don't optimise out the logcontext juggling when this
situation happens. Fortunately, it is easy to detect by checking `D1.paused`. 
							
						 
						
							2018-05-02 11:58:00 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e482f8cd85 
								
							
								 
							
						 
						
							
							
								
								Fix incorrect reference to StringIO  
							
							 
							
							... 
							
							
							
							This was introduced in 4f2f5171 
							
						 
						
							2018-05-02 09:12:26 +01:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								6495dbb326 
								
							
								 
							
						 
						
							
							
								
								Burminate v1auth  
							
							 
							
							... 
							
							
							
							This closes  #2602 
v1auth was created to account for the differences in status code between
the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid
tokens). However since those protocols were merged, this makes the r0
version/endpoint internally inconsistent, and violates the
specification for the r0 endpoint.
This might break clients that rely on this inconsistency with the
specification. This is said to affect the legacy angular reference
client. However, I feel that restoring parity with the spec is more
important. Either way, it is critical to inform developers about this
change, in case they rely on the illegal behaviour.
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-30 22:20:43 +02:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								9e2601f830 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3108  from NotAFile/py3-six-urlparse  
							
							 
							
							... 
							
							
							
							Use six.moves.urlparse 
							
						 
						
							2018-04-30 00:33:05 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								3d1ae61399 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rav/deferred_timeout  
							
							 
							
							
							
						 
						
							2018-04-27 12:54:43 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								286e20f2bc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3109  from NotAFile/py3-tests-fix  
							
							 
							
							... 
							
							
							
							Make tests py3 compatible 
							
						 
						
							2018-04-23 11:59:03 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1ea904b9f0 
								
							
								 
							
						 
						
							
							
								
								Use deferred.addTimeout instead of time_bound_deferred  
							
							 
							
							... 
							
							
							
							This doesn't feel like a wheel we need to reinvent. 
							
						 
						
							2018-04-23 00:53:18 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								d06a9ea5f7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3104  from NotAFile/py3-unittest-config  
							
							 
							
							... 
							
							
							
							Add some more variables to the unittest config 
							
						 
						
							2018-04-20 15:35:58 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								692a3cc806 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3103  from NotAFile/py3-baseexcepton-message  
							
							 
							
							... 
							
							
							
							Use str(e) instead of e.message 
							
						 
						
							2018-04-20 15:34:49 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								639480e14a 
								
							
								 
							
						 
						
							
							
								
								Avoid creating events with huge numbers of prev_events  
							
							 
							
							... 
							
							
							
							In most cases, we limit the number of prev_events for a given event to 10
events. This fixes a particular code path which created events with huge
numbers of prev_events. 
							
						 
						
							2018-04-16 18:41:37 +01:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								a1a3c9660f 
								
							
								 
							
						 
						
							
							
								
								Make tests py3 compatible  
							
							 
							
							... 
							
							
							
							This is a mixed commit that fixes various small issues
 * print parentheses
 * 01 is invalid syntax (it was octal in py2)
 * [x for i in 1, 2] is invalid syntax
 * six moves
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-16 00:39:32 +02:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								2a3c33ff03 
								
							
								 
							
						 
						
							
							
								
								Use six.moves.urlparse  
							
							 
							
							... 
							
							
							
							The imports were shuffled around a bunch in py3
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-15 21:22:43 +02:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								cb9cdfecd0 
								
							
								 
							
						 
						
							
							
								
								Add some more variables to the unittest config  
							
							 
							
							... 
							
							
							
							These worked accidentally before (python2 doesn't complain if you
compare incompatible types) but under py3 this blows up spectacularly
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-15 20:36:39 +02:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								1515560f5c 
								
							
								 
							
						 
						
							
							
								
								Use str(e) instead of e.message  
							
							 
							
							... 
							
							
							
							Doing this I learned e.message was pretty shortlived, added in 2.6,
they realized it was a bad idea and deprecated it in 2.7
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-15 20:32:42 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e939f3bca6 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2018-04-11 14:37:11 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								a3599dda97 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2996  from krombel/allow_auto_join_rooms  
							
							 
							
							... 
							
							
							
							move handling of auto_join_rooms to RegisterHandler 
							
						 
						
							2018-04-10 01:11:00 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								87478c5a60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3061  from NotAFile/add-some-byte-strings  
							
							 
							
							... 
							
							
							
							Add b prefixes to some strings that are bytes in py3 
							
						 
						
							2018-04-09 23:54:05 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								664adb4236 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3016  from silkeh/improve-service-lookups  
							
							 
							
							... 
							
							
							
							Improve handling of SRV records for federation connections 
							
						 
						
							2018-04-09 23:40:06 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								01afc563c3 
								
							
								 
							
						 
						
							
							
								
								Fix overzealous cache invalidation  
							
							 
							
							... 
							
							
							
							Fixes an issue where a cache invalidation would invalidate *all* pending
entries, rather than just the entry that we intended to invalidate. 
							
						 
						
							2018-04-05 16:24:04 +01:00  
						
					 
				
					
						
							
							
								 
								Adrian Tschira
							
						 
						
							 
							
							
							
								
							
								6168351877 
								
							
								 
							
						 
						
							
							
								
								Add b prefixes to some strings that are bytes in py3  
							
							 
							
							... 
							
							
							
							This has no effect on python2
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-04 13:48:51 +02:00  
						
					 
				
					
						
							
							
								 
								Silke
							
						 
						
							 
							
							
							
								
							
								72251d1b97 
								
							
								 
							
						 
						
							
							
								
								Remove address resolution of hosts in SRV records  
							
							 
							
							... 
							
							
							
							Signed-off-by: Silke Hofstra <silke@slxh.eu> 
							
						 
						
							2018-04-04 12:26:50 +02:00  
						
					 
				
					
						
							
							
								 
								Krombel
							
						 
						
							 
							
							
							
								
							
								91ea0202e6 
								
							
								 
							
						 
						
							
							
								
								move handling of auto_join_rooms to RegisterHandler  
							
							 
							
							... 
							
							
							
							Currently the handling of auto_join_rooms only works when a user
registers itself via public register api. Registrations via
registration_shared_secret and ModuleApi do not work
This auto_joins the users in the registration handler which enables
the auto join feature for all 3 registration paths.
This is related to issue #2725 
Signed-Off-by: Matthias Kesler <krombel@krombel.de> 
							
						 
						
							2018-03-14 16:45:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cb9f8e527c 
								
							
								 
							
						 
						
							
							
								
								s/replication_client/federation_client/  
							
							 
							
							
							
						 
						
							2018-03-13 13:26:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cea462e285 
								
							
								 
							
						 
						
							
							
								
								s/replication_server/federation_server  
							
							 
							
							
							
						 
						
							2018-03-13 13:22:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6ea27fafad 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2018-03-13 10:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								631a73f7ef 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2018-03-13 10:39:19 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2c911d75e8 
								
							
								 
							
						 
						
							
							
								
								Fix comment typo  
							
							 
							
							
							
						 
						
							2018-03-05 12:24:49 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c818fcab11 
								
							
								 
							
						 
						
							
							
								
								Test and fix find_first_stream_ordering_after_ts  
							
							 
							
							... 
							
							
							
							It seemed to suffer from a bunch of off-by-one errors. 
							
						 
						
							2018-03-05 12:04:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								784f036306 
								
							
								 
							
						 
						
							
							
								
								Move RoomMemberHandler out of Handlers  
							
							 
							
							
							
						 
						
							2018-03-01 14:36:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								e5b4a208ce 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2892  from matrix-org/erikj/batch_inserts_push_actions  
							
							 
							
							... 
							
							
							
							Batch inserts into event_push_actions_staging 
							
						 
						
							2018-02-26 14:45:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								25634ed152 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							 
							
							
							
						 
						
							2018-02-20 12:40:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e440e28456 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2018-02-20 11:41:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3a061cae26 
								
							
								 
							
						 
						
							
							
								
								Fix unit test  
							
							 
							
							
							
						 
						
							2018-02-15 16:31:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4810f7effd 
								
							
								 
							
						 
						
							
							
								
								Remove context.push_actions  
							
							 
							
							
							
						 
						
							2018-02-15 15:47:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								617199d73d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2847  from matrix-org/erikj/separate_event_creation  
							
							 
							
							... 
							
							
							
							Split event creation into a separate handler 
							
						 
						
							2018-02-06 17:01:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								770b2252ca 
								
							
								 
							
						 
						
							
							
								
								s/_create_new_client_event/create_new_client_event/  
							
							 
							
							
							
						 
						
							2018-02-06 16:40:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								3d33eef6fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Store state groups separately from events ( #2784 )  
							
							 
							
							... 
							
							
							
							* Split state group persist into seperate storage func
* Add per database engine code for state group id gen
* Move store_state_group to StateReadStore
This allows other workers to use it, and so resolve state.
* Hook up store_state_group
* Fix tests
* Rename _store_mult_state_groups_txn
* Rename StateGroupReadStore
* Remove redundant _have_persisted_state_group_txn
* Update comments
* Comment compute_event_context
* Set start val for state_group_id_seq
... otherwise we try to recreate old state groups
* Update comments
* Don't store state for outliers
* Update comment
* Update docstring as state groups are ints 
							
						 
						
							2018-02-06 14:31:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								25c0a020f4 
								
							
								 
							
						 
						
							
							
								
								Updates tests  
							
							 
							
							
							
						 
						
							2018-02-05 16:01:48 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								db91e72ade 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2844  from matrix-org/rav/evicted_metrics  
							
							 
							
							... 
							
							
							
							montoring metrics for number of cache evictions 
							
						 
						
							2018-02-05 16:34:36 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								bc496df192 
								
							
								 
							
						 
						
							
							
								
								report metrics on number of cache evictions  
							
							 
							
							
							
						 
						
							2018-02-05 15:34:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a1beca0e25 
								
							
								 
							
						 
						
							
							
								
								Fix broken unit test for media storage  
							
							 
							
							
							
						 
						
							2018-02-05 12:44:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								1f881e0746 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2791  from matrix-org/erikj/media_storage_refactor  
							
							 
							
							... 
							
							
							
							Ensure media is in local cache before thumbnailing 
							
						 
						
							2018-02-05 11:28:52 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6da4c4d3bd 
								
							
								 
							
						 
						
							
							
								
								Factor out resolve_state_groups to a separate handler  
							
							 
							
							... 
							
							
							
							We extract the storage-independent bits of the state group resolution out to a
separate functiom, and stick it in a new handler, in preparation for its use
from the storage layer. 
							
						 
						
							2018-02-01 12:40:04 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d1f3490e75 
								
							
								 
							
						 
						
							
							
								
								Add tests for user directory search  
							
							 
							
							
							
						 
						
							2018-01-27 17:21:57 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								88b9c5cbf0 
								
							
								 
							
						 
						
							
							
								
								Make it possible to run tests against postgres  
							
							 
							
							
							
						 
						
							2018-01-27 17:15:24 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d7eacc4f87 
								
							
								 
							
						 
						
							
							
								
								Create dbpool as normal in tests  
							
							 
							
							... 
							
							
							
							... instead of creating our own special SQLiteMemoryDbPool, whose purpose was a
bit of a mystery.
For some reason this makes one of the tests run slightly slower, so bump the
sleep(). Sorry. 
							
						 
						
							2018-01-27 17:15:15 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b178eca261 
								
							
								 
							
						 
						
							
							
								
								Run on_new_connection for unit tests  
							
							 
							
							... 
							
							
							
							Configure the connectionpool used for unit tests to run the `on_new_connection`
function. 
							
						 
						
							2018-01-27 17:06:04 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6e9bf67f18 
								
							
								 
							
						 
						
							
							
								
								Remove unused/bitrotted MemoryDataStore  
							
							 
							
							... 
							
							
							
							This isn't used, and looks thoroughly bitrotted. 
							
						 
						
							2018-01-26 00:35:15 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								2b91846497 
								
							
								 
							
						 
						
							
							
								
								Remove spurious unittest.DEBUG  
							
							 
							
							
							
						 
						
							2018-01-26 00:34:27 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								b2da272b77 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2821  from matrix-org/rav/matthew_test_fixes  
							
							 
							
							... 
							
							
							
							Matthew's fixes to the unit tests 
							
						 
						
							2018-01-22 20:43:56 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								ab9f844aaf 
								
									
								
							
								 
							
						 
						
							
							
								
								Add federation_domain_whitelist option ( #2820 )  
							
							 
							
							... 
							
							
							
							Add federation_domain_whitelist
gives a way to restrict which domains your HS is allowed to federate with.
useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network 
							
						 
						
							2018-01-22 19:11:18 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5c431f421c 
								
							
								 
							
						 
						
							
							
								
								Matthew's fixes to the unit tests  
							
							 
							
							... 
							
							
							
							Extracted from https://github.com/matrix-org/synapse/pull/2820  
							
						 
						
							2018-01-22 16:46:16 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d84f65255e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2813  from matrix-org/matthew/registrations_require_3pid  
							
							 
							
							... 
							
							
							
							add registrations_require_3pid and allow_local_3pids 
							
						 
						
							2018-01-22 13:57:22 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								81d037dbd8 
								
							
								 
							
						 
						
							
							
								
								mock registrations_require_3pid  
							
							 
							
							
							
						 
						
							2018-01-19 00:28:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ce4f66133e 
								
							
								 
							
						 
						
							
							
								
								Add unit tests  
							
							 
							
							
							
						 
						
							2018-01-18 16:32:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								b6dc7044a9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2804  from matrix-org/erikj/file_consumer  
							
							 
							
							... 
							
							
							
							Add decent impl of a FileConsumer 
							
						 
						
							2018-01-18 16:31:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1432f7ccd5 
								
							
								 
							
						 
						
							
							
								
								Move test stuff to tests  
							
							 
							
							
							
						 
						
							2018-01-18 11:57:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bc67e7d260 
								
							
								 
							
						 
						
							
							
								
								Add decent impl of a FileConsumer  
							
							 
							
							... 
							
							
							
							Twisted core doesn't have a general purpose one, so we need to write one
ourselves.
Features:
- All writing happens in background thread
- Supports both push and pull producers
- Push producers get paused if the consumer falls behind 
							
						 
						
							2018-01-17 16:43:03 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								44a498418c 
								
							
								 
							
						 
						
							
							
								
								Optimise LoggingContext creation and copying  
							
							 
							
							... 
							
							
							
							It turns out that the only thing we use the __dict__ of LoggingContext for is
`request`, and given we create lots of LoggingContexts and then copy them every
time we do a db transaction or log line, using the __dict__ seems a bit
redundant. Let's try to optimise things by making the request attribute
explicit. 
							
						 
						
							2018-01-16 15:49:42 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								a767f06e3f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2765  from matrix-org/rav/fix_room_uts  
							
							 
							
							... 
							
							
							
							Fix flaky test_rooms UTs 
							
						 
						
							2018-01-09 14:21:03 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f8fa5ae4af 
								
							
								 
							
						 
						
							
							
								
								enable twisted delayedcall debugging in UTs  
							
							 
							
							
							
						 
						
							2018-01-09 12:06:45 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								374c4d4ced 
								
							
								 
							
						 
						
							
							
								
								Remove dead code  
							
							 
							
							... 
							
							
							
							pointless function is pointless 
							
						 
						
							2018-01-09 12:06:45 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								142fb0a7d4 
								
							
								 
							
						 
						
							
							
								
								Disable user_directory updates for UTs  
							
							 
							
							... 
							
							
							
							Fix flakiness in the UTs caused by the user_directory being updated in the
background 
							
						 
						
							2018-01-09 12:06:45 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0211464ba2 
								
							
								 
							
						 
						
							
							
								
								Fix broken config UTs  
							
							 
							
							... 
							
							
							
							https://github.com/matrix-org/synapse/pull/2755  broke log-config generation,
which in turn broke the unit tests. 
							
						 
						
							2018-01-09 11:28:33 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								33cb7ef0b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2723  from matrix-org/matthew/search-all-local-users  
							
							 
							
							... 
							
							
							
							Add all local users to the user_directory and optionally search them 
							
						 
						
							2017-12-05 11:09:47 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d5f9fb06b0 
								
							
								 
							
						 
						
							
							
								
								Refactor UI auth implementation  
							
							 
							
							... 
							
							
							
							Instead of returning False when auth is incomplete, throw an exception which
can be caught with a wrapper. 
							
						 
						
							2017-12-05 09:40:05 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								7b86c1fdcd 
								
							
								 
							
						 
						
							
							
								
								try make tests work a bit more...  
							
							 
							
							
							
						 
						
							2017-12-04 17:10:03 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								95f8a713dc 
								
							
								 
							
						 
						
							
							
								
								erik told me to  
							
							 
							
							
							
						 
						
							2017-12-04 16:56:25 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								ab1dc84779 
								
							
								 
							
						 
						
							
							
								
								Add extra space before inline comment  
							
							 
							
							
							
						 
						
							2017-11-16 18:22:40 +00:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								e836bdf734 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2017-11-16 18:14:39 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								63ef607f1f 
								
							
								 
							
						 
						
							
							
								
								Fix tests for Store.__init__ update  
							
							 
							
							... 
							
							
							
							Fix the test to pass the right number of args to the Store constructors 
							
						 
						
							2017-11-13 10:46:08 +00:00  
						
					 
				
					
						
							
							
								 
								Ilya Zhuravlev
							
						 
						
							 
							
							
							
								
							
								8a4a0ddea6 
								
							
								 
							
						 
						
							
							
								
								Fix appservice tests to account for new behavior of notify_interested_services  
							
							 
							
							
							
						 
						
							2017-11-02 23:19:57 +03:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								02237ce725 
								
							
								 
							
						 
						
							
							
								
								Fix tests for refresh_token removal  
							
							 
							
							
							
						 
						
							2017-11-01 10:19:42 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9ded00f221 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2017-10-31 14:21:13 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							 
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1135193dfd 
								
							
								 
							
						 
						
							
							
								
								Validate group ids when parsing  
							
							 
							
							... 
							
							
							
							May as well do it whenever we parse a Group ID. We check the sigil and basic
structure here so it makes sense to check the grammar in the same place. 
							
						 
						
							2017-10-21 00:30:39 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								dbdfd8967d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2546  from matrix-org/rav/remove_dead_event_injector  
							
							 
							
							... 
							
							
							
							Remove dead class 
							
						 
						
							2017-10-17 13:21:22 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b8e40d146f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2547  from matrix-org/rav/test_make_deferred_yieldable  
							
							 
							
							... 
							
							
							
							Add some tests for make_deferred_yieldable 
							
						 
						
							2017-10-17 13:21:09 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a6ad8148b9 
								
							
								 
							
						 
						
							
							
								
								Fix name of test_logcontext  
							
							 
							
							... 
							
							
							
							The file under test is logcontext.py, not log_context.py 
							
						 
						
							2017-10-17 10:53:34 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5b5f35ccc0 
								
							
								 
							
						 
						
							
							
								
								Add some tests for make_deferred_yieldable  
							
							 
							
							
							
						 
						
							2017-10-17 10:52:31 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9b714abf35 
								
							
								 
							
						 
						
							
							
								
								Remove dead class  
							
							 
							
							... 
							
							
							
							This isn't used anywhere. 
							
						 
						
							2017-10-17 10:43:36 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								33122c5a1b 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							 
							
							
							
						 
						
							2017-10-17 10:39:50 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								cc794d60e7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2532  from matrix-org/rav/fix_linearizer  
							
							 
							
							... 
							
							
							
							Fix stackoverflow and logcontexts from linearizer 
							
						 
						
							2017-10-11 17:29:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								4fad8efbfb 
								
							
								 
							
						 
						
							
							
								
								Fix stackoverflow and logcontexts from linearizer  
							
							 
							
							... 
							
							
							
							1. make it not blow out the stack when there are more than 50 things waiting
   for a lock. Fixes https://github.com/matrix-org/synapse/issues/2505 .
2. Make it not mess up the log contexts. 
							
						 
						
							2017-10-11 15:05:05 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								27955056e0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into erikj/groups_merged  
							
							 
							
							
							
						 
						
							2017-10-02 16:20:41 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f65e31d22f 
								
							
								 
							
						 
						
							
							
								
								Do an AAAA lookup on SRV record targets ( #2462 )  
							
							 
							
							... 
							
							
							
							Support SRV records which point at AAAA records, as well as A records.
Fixes https://github.com/matrix-org/synapse/issues/2405  
							
						 
						
							2017-09-22 20:26:47 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								72472456d8 
								
							
								 
							
						 
						
							
							
								
								Add some more tests for Keyring  
							
							 
							
							
							
						 
						
							2017-09-20 01:32:42 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9864efa532 
								
							
								 
							
						 
						
							
							
								
								Fix concurrent server_key requests ( #2458 )  
							
							 
							
							... 
							
							
							
							Fix a bug where we could end up firing off multiple requests for server_keys
for the same server at the same time. 
							
						 
						
							2017-09-19 23:25:44 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								aa620d09a0 
								
							
								 
							
						 
						
							
							
								
								Add a config option to block all room invites ( #2457 )  
							
							 
							
							... 
							
							
							
							- allows sysadmins the ability to lock down their servers so that people can't
send their users room invites. 
							
						 
						
							2017-09-19 16:08:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b5feaa5a49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged  
							
							 
							
							
							
						 
						
							2017-09-19 11:07:45 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								290777b3d9 
								
							
								 
							
						 
						
							
							
								
								Clean up and document handling of logcontexts in Keyring ( #2452 )  
							
							 
							
							... 
							
							
							
							I'm still unclear on what the intended behaviour for
`verify_json_objects_for_server` is, but at least I now understand the
behaviour of most of the things it calls... 
							
						 
						
							2017-09-18 18:31:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bf81f3cf2c 
								
							
								 
							
						 
						
							
							
								
								Split out profile handler to fix tests  
							
							 
							
							
							
						 
						
							2017-08-25 14:34:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c544188ee3 
								
							
								 
							
						 
						
							
							
								
								Add groups to sync stream  
							
							 
							
							
							
						 
						
							2017-07-20 16:36:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed9a7f5436 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2309  from matrix-org/erikj/user_ip_repl  
							
							 
							
							... 
							
							
							
							Fix up user_ip replication commands 
							
						 
						
							2017-07-06 14:33:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								29a4066a4d 
								
							
								 
							
						 
						
							
							
								
								Update test  
							
							 
							
							
							
						 
						
							2017-07-04 10:21:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c23221666 
								
							
								 
							
						 
						
							
							
								
								Fix up  
							
							 
							
							
							
						 
						
							2017-06-27 15:53:45 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a0a561ae85 
								
							
								 
							
						 
						
							
							
								
								Fix up client ips to read from pending data  
							
							 
							
							
							
						 
						
							2017-06-27 14:46:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								052c5d19d5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2281  from matrix-org/erikj/phone_home_stats  
							
							 
							
							... 
							
							
							
							Fix phone home stats 
							
						 
						
							2017-06-15 12:46:23 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								93e7a38370 
								
							
								 
							
						 
						
							
							
								
								Remove unhelpful test  
							
							 
							
							
							
						 
						
							2017-06-15 09:30:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								23da638360 
								
							
								 
							
						 
						
							
							
								
								Fix typing tests  
							
							 
							
							
							
						 
						
							2017-05-26 10:02:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								11c2a3655f 
								
							
								 
							
						 
						
							
							
								
								Only load jinja2 templates once  
							
							 
							
							... 
							
							
							
							Instead of every time a new email pusher is created, as loading jinja2
templates is slow. 
							
						 
						
							2017-05-22 17:48:58 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bbfe4e996c 
								
							
								 
							
						 
						
							
							
								
								Make get_state_groups_from_groups faster.  
							
							 
							
							... 
							
							
							
							Most of the time was spent copying a dict to filter out sentinel values
that indicated that keys did not exist in the dict. The sentinel values
were added to ensure that we cached the non-existence of keys.
By updating DictionaryCache to keep track of which keys were known to
not exist itself we can remove a dictionary copy. 
							
						 
						
							2017-05-17 15:12:15 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								de042b3b88 
								
							
								 
							
						 
						
							
							
								
								Do some logging when one-time-keys get claimed  
							
							 
							
							... 
							
							
							
							might help us figure out if https://github.com/vector-im/riot-web/issues/3868 
has happened. 
							
						 
						
							2017-05-09 19:04:56 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a7e9d8762d 
								
							
								 
							
						 
						
							
							
								
								Allow clients to upload one-time-keys with new sigs  
							
							 
							
							... 
							
							
							
							When a client retries a key upload, don't give an error if the signature has
changed (but the key is the same).
Fixes https://github.com/vector-im/riot-android/issues/1208 , hopefully. 
							
						 
						
							2017-05-09 19:04:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e5a62ecd8 
								
							
								 
							
						 
						
							
							
								
								Add more granular event send metrics  
							
							 
							
							
							
						 
						
							2017-05-02 14:23:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								85a0d6c7ab 
								
							
								 
							
						 
						
							
							
								
								Remove test of replication resource  
							
							 
							
							
							
						 
						
							2017-04-11 10:59:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a5c401bd12 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2097  from matrix-org/erikj/repl_tcp_client  
							
							 
							
							... 
							
							
							
							Move to using TCP replication 
							
						 
						
							2017-04-05 09:36:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3a1f3f8388 
								
							
								 
							
						 
						
							
							
								
								Change slave storage to use new replication interface  
							
							 
							
							... 
							
							
							
							As the TCP replication uses a slightly different API and streams than
the HTTP replication.
This breaks HTTP replication. 
							
						 
						
							2017-04-03 15:34:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9cee0ce7db 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2075  from matrix-org/erikj/cache_speed  
							
							 
							
							... 
							
							
							
							Speed up cached function access 
							
						 
						
							2017-03-31 10:10:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								350333a09a 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2076  from matrix-org/erikj/as_perf  
							
							 
							
							... 
							
							
							
							Make AS's faster 
							
						 
						
							2017-03-31 09:43:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eefd9fee81 
								
							
								 
							
						 
						
							
							
								
								Fix up tests  
							
							 
							
							
							
						 
						
							2017-03-30 14:14:46 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f9b4bb05e0 
								
							
								 
							
						 
						
							
							
								
								Fix the logcontext handling in the cache wrappers ( #2077 )  
							
							 
							
							... 
							
							
							
							The cache wrappers had a habit of leaking the logcontext into the reactor while
the lookup function was running, and then not restoring it correctly when the
lookup function had completed. It's all the fault of
`preserve_context_over_{fn,deferred}` which are basically a bit broken. 
							
						 
						
							2017-03-30 13:22:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								650f0e69f2 
								
							
								 
							
						 
						
							
							
								
								Compile the regex's used in ASes  
							
							 
							
							
							
						 
						
							2017-03-28 13:27:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								57cfa513f5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2054  from matrix-org/erikj/user_iter_cursor  
							
							 
							
							... 
							
							
							
							Reduce some CPU work on DB threads 
							
						 
						
							2017-03-24 11:40:08 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								9397edb28b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2050  from matrix-org/rav/federation_backoff  
							
							 
							
							... 
							
							
							
							push federation retry limiter down to matrixfederationclient 
							
						 
						
							2017-03-23 22:27:01 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								06ce7335e9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2052  from matrix-org/rav/time_bound_deferred  
							
							 
							
							... 
							
							
							
							Fix time_bound_deferred to throw the right exception 
							
						 
						
							2017-03-23 22:22:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								00957d1aa4 
								
							
								 
							
						 
						
							
							
								
								User Cursor.__iter__ instead of fetchall  
							
							 
							
							... 
							
							
							
							This prevents unnecessary construction of lists 
							
						 
						
							2017-03-23 17:53:49 +00:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								566641a0b5 
								
							
								 
							
						 
						
							
							
								
								use jsonschema.FormatChecker for RoomID and UserID strings  
							
							 
							
							... 
							
							
							
							* use a valid filter in rest/client/v2_alpha test
Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:41 -03:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								acafcf1c5b 
								
							
								 
							
						 
						
							
							
								
								Add valid filter tests, flake8, fix typo  
							
							 
							
							... 
							
							
							
							Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:10 -03:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								e56c79c114 
								
							
								 
							
						 
						
							
							
								
								check_valid_filter using JSONSchema  
							
							 
							
							... 
							
							
							
							* add invalid filter tests
Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:07 -03:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0bfea9a2be 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2017-03-23 13:20:08 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b88a323ffb 
								
							
								 
							
						 
						
							
							
								
								Fix time_bound_deferred to throw the right exception  
							
							 
							
							... 
							
							
							
							Due to a failure to instantiate DeferredTimedOutError, time_bound_deferred
would throw a CancelledError when the deferred timed out, which was rather
confusing. 
							
						 
						
							2017-03-23 12:07:11 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								4bd597d9fc 
								
							
								 
							
						 
						
							
							
								
								push federation retry limiter down to matrixfederationclient  
							
							 
							
							... 
							
							
							
							rather than having to instrument everywhere we make a federation call,
make the MatrixFederationHttpClient manage the retry limiter. 
							
						 
						
							2017-03-23 09:28:46 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								95f21c7a66 
								
							
								 
							
						 
						
							
							
								
								Fix caching of remote servers' signature keys  
							
							 
							
							... 
							
							
							
							The `@cached` decorator on `KeyStore._get_server_verify_key` was missing
its `num_args` parameter, which meant that it was returning the wrong key for
any server which had more than one recorded key.
By way of a fix, change the default for `num_args` to be *all* arguments. To
implement that, factor out a common base class for `CacheDescriptor` and `CacheListDescriptor`. 
							
						 
						
							2017-03-22 15:11:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								37a187bfab 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2033  from matrix-org/erikj/repl_speed  
							
							 
							
							... 
							
							
							
							Don't send the full event json over replication 
							
						 
						
							2017-03-21 13:11:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								737f283a07 
								
							
								 
							
						 
						
							
							
								
								Fix unit test  
							
							 
							
							
							
						 
						
							2017-03-20 14:03:58 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f40c2db05a 
								
							
								 
							
						 
						
							
							
								
								Stop preserve_fn leaking context into the reactor  
							
							 
							
							... 
							
							
							
							Fix a bug in ``logcontext.preserve_fn`` which made it leak context into the
reactor, and add a test for it.
Also, get rid of ``logcontext.reset_context_after_deferred``, which tried to do
the same thing but had its own, different, set of bugs. 
							
						 
						
							2017-03-18 00:07:43 +00:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								c144292373 
								
							
								 
							
						 
						
							
							
								
								Modify test_user_sync so it doesn't look at last_active_ts over last_user_sync_ts  
							
							 
							
							
							
						 
						
							2017-03-15 15:38:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								095b45c165 
								
							
								 
							
						 
						
							
							
								
								Aggregate event push actions  
							
							 
							
							
							
						 
						
							2017-02-14 13:39:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								51adaac953 
								
							
								 
							
						 
						
							
							
								
								Fix email push in pusher worker  
							
							 
							
							... 
							
							
							
							This was broken when device list updates were implemented, as Mailer
could no longer instantiate an AuthHandler due to a dependency on
federation sending. 
							
						 
						
							2017-02-02 10:53:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								692daf6f54 
								
							
								 
							
						 
						
							
							
								
								Remote membership tests for replication  
							
							 
							
							... 
							
							
							
							This is because it now relies of the caches stream, which only works on
postgres. We are trying to test with sqlite. 
							
						 
						
							2017-01-31 16:10:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c7a26b7c32 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2017-01-30 17:11:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b3e1f2aa7a 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2017-01-26 17:16:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c974116f19 
								
							
								 
							
						 
						
							
							
								
								Implement device key caching over federation  
							
							 
							
							
							
						 
						
							2017-01-26 16:07:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2367c5568c 
								
							
								 
							
						 
						
							
							
								
								Add basic implementation of local device list changes  
							
							 
							
							
							
						 
						
							2017-01-25 14:27:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a55fa2047f 
								
							
								 
							
						 
						
							
							
								
								Insert delta of current_state_events to be more efficient  
							
							 
							
							
							
						 
						
							2017-01-20 17:10:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								09eb08f910 
								
							
								 
							
						 
						
							
							
								
								Derive current_state_events from state groups  
							
							 
							
							
							
						 
						
							2017-01-20 11:52:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								15f012032c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1818  from matrix-org/erikj/state_auth_splitout_split  
							
							 
							
							... 
							
							
							
							Optimise state resolution 
							
						 
						
							2017-01-18 10:53:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5d6bad1b3c 
								
							
								 
							
						 
						
							
							
								
								Optimise state resolution  
							
							 
							
							
							
						 
						
							2017-01-17 13:22:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9e8e236d98 
								
							
								 
							
						 
						
							
							
								
								Tidy up test  
							
							 
							
							
							
						 
						
							2017-01-17 11:50:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f85b6ca494 
								
							
								 
							
						 
						
							
							
								
								Speed up cache size calculation  
							
							 
							
							... 
							
							
							
							Instead of calculating the size of the cache repeatedly, which can take
a long time now that it can use a callback, instead cache the size and
update that on insertion and deletion.
This requires changing the cache descriptors to have two caches, one for
pending deferreds and the other for the actual values. There's no reason
to evict from the pending deferreds as they won't take up any more
memory. 
							
						 
						
							2017-01-17 11:18:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f2f179dce2 
								
							
								 
							
						 
						
							
							
								
								Add ExpiringCache tests  
							
							 
							
							
							
						 
						
							2017-01-16 15:33:34 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2fae34bd2c 
								
							
								 
							
						 
						
							
							
								
								Optionally measure size of cache by sum of length of values  
							
							 
							
							
							
						 
						
							2017-01-13 17:46:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6823fe5241 
								
							
								 
							
						 
						
							
							
								
								Linearize updates to membership via PUT /state/  
							
							 
							
							
							
						 
						
							2017-01-09 18:25:13 +00:00  
						
					 
				
					
						
							
							
								 
								Marcin Bachry
							
						 
						
							 
							
							
							
								
							
								24c16fc349 
								
							
								 
							
						 
						
							
							
								
								Fix crash in url preview when html tag has no text  
							
							 
							
							... 
							
							
							
							Signed-off-by: Marcin Bachry <hegel666@gmail.com> 
							
						 
						
							2016-12-14 22:38:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d53a80af25 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1620  from matrix-org/erikj/concurrent_room_access  
							
							 
							
							... 
							
							
							
							Limit the number of events that can be created on a given room concurrently 
							
						 
						
							2016-12-12 10:30:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8b34f71bea 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2016-12-09 16:48:48 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1529c19675 
								
							
								 
							
						 
						
							
							
								
								Prevent user tokens being used as guest tokens ( #1675 )  
							
							 
							
							... 
							
							
							
							Make sure that a user cannot pretend to be a guest by adding 'guest = True'
caveats. 
							
						 
						
							2016-12-06 15:31:37 +00:00  
						
					 
				
					
						
							
							
								 
								Johannes Löthberg
							
						 
						
							 
							
							
							
								
							
								6c9a0ba415 
								
							
								 
							
						 
						
							
							
								
								test_preview: Fix incorrect wrapping  
							
							 
							
							... 
							
							
							
							The old test expected an incorrect wrapping due to the preview function
not using unicode properly, so it got the wrong length.
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> 
							
						 
						
							2016-12-05 16:33:57 +01:00  
						
					 
				
					
						
							
							
								 
								Johannes Löthberg
							
						 
						
							 
							
							
							
								
							
								0697bb2247 
								
							
								 
							
						 
						
							
							
								
								Make test_preview use unicode strings  
							
							 
							
							... 
							
							
							
							Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> 
							
						 
						
							2016-12-05 16:33:57 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								12f3b9000c 
								
							
								 
							
						 
						
							
							
								
								fix imports  
							
							 
							
							
							
						 
						
							2016-11-30 17:45:49 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								aa09d6b8f0 
								
							
								 
							
						 
						
							
							
								
								Rip out more refresh_token code  
							
							 
							
							... 
							
							
							
							We might as well treat all refresh_tokens as invalid. Just return a 403 from
/tokenrefresh, so that we don't have a load of dead, untestable code hanging
around.
Still TODO: removing the table from the schema. 
							
						 
						
							2016-11-30 17:40:18 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								dc4b23e1a1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into rav/no_more_refresh_tokens  
							
							 
							
							
							
						 
						
							2016-11-30 17:10:04 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1c4f05db41 
								
							
								 
							
						 
						
							
							
								
								Stop putting a time caveat on access tokens  
							
							 
							
							... 
							
							
							
							The 'time' caveat on the access tokens was something of a lie, since we weren't
enforcing it; more pertinently its presence stops us ever adding useful time
caveats.
Let's move in the right direction by not lying in our caveats. 
							
						 
						
							2016-11-29 16:49:41 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5c4edc83b5 
								
							
								 
							
						 
						
							
							
								
								Stop generating refresh tokens  
							
							 
							
							... 
							
							
							
							Since we're not doing refresh tokens any more, we should start killing off the
dead code paths. /tokenrefresh itself is a bit of a thornier subject, since
there might be apps out there using it, but we can at least not generate
refresh tokens on new logins. 
							
						 
						
							2016-11-28 10:13:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								feec718265 
								
							
								 
							
						 
						
							
							
								
								Shuffle receipt handler around so that worker apps don't need to load it  
							
							 
							
							
							
						 
						
							2016-11-23 15:14:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ee5e8d71ac 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2016-11-23 14:57:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b69f76c106 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_out_fed_txn  
							
							 
							
							
							
						 
						
							2016-11-23 11:31:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								54fed21c04 
								
							
								 
							
						 
						
							
							
								
								Fix tests and flake8  
							
							 
							
							
							
						 
						
							2016-11-22 18:18:31 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c3d963ac24 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							 
							
							
							
						 
						
							2016-11-22 13:42:11 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0a8b0eeca1 
								
							
								 
							
						 
						
							
							
								
								More tests  
							
							 
							
							
							
						 
						
							2016-11-22 09:59:27 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								53b27bbf06 
								
							
								 
							
						 
						
							
							
								
								Add remaining tests  
							
							 
							
							
							
						 
						
							2016-11-21 17:58:22 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								70a2157b64 
								
							
								 
							
						 
						
							
							
								
								Start adding some tests  
							
							 
							
							
							
						 
						
							2016-11-21 17:52:45 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f97511a1f3 
								
							
								 
							
						 
						
							
							
								
								Move event_fields filtering to serialize_event  
							
							 
							
							... 
							
							
							
							Also make it an inclusive not exclusive filter, as the spec demands. 
							
						 
						
							2016-11-21 17:42:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								524d61bf7e 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2016-11-21 11:53:02 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								3991b4cbdb 
								
							
								 
							
						 
						
							
							
								
								Clean transactions based on time. Add HttpTransactionCache tests.  
							
							 
							
							
							
						 
						
							2016-11-14 11:19:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d073cb7ead 
								
							
								 
							
						 
						
							
							
								
								Add Limiter: limit concurrent access to resource  
							
							 
							
							
							
						 
						
							2016-11-10 16:29:51 +00:00