Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c4896668f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/soft_fail_impl  
							
							 
							
							
							
						 
						
							2019-03-08 11:44:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ff8163eae 
								
							
								 
							
						 
						
							
							
								
								Factor out soft fail checks  
							
							 
							
							
							
						 
						
							2019-03-08 11:26:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								469b66c102 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4829  from matrix-org/erikj/device_list_seen_updates  
							
							 
							
							... 
							
							
							
							When re-syncing device lists reset the state 
							
						 
						
							2019-03-08 09:54:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d42b41544a 
								
							
								 
							
						 
						
							
							
								
								When re-syncing device lists reset the state  
							
							 
							
							... 
							
							
							
							We keep track of what stream IDs we've seen so that we know what updates
we've handled or missed. If we re-sync we don't know if the updates
we've seen are included in the re-sync (there may be a race), so we
should reset the seen updates. 
							
						 
						
							2019-03-07 16:04:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c633fc02d7 
								
							
								 
							
						 
						
							
							
								
								Add some debug logging for device list handling  
							
							 
							
							
							
						 
						
							2019-03-07 15:58:03 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								f6135d06cf 
								
									
								
							
								 
							
						 
						
							
							
								
								Rewrite userdir to be faster ( #4537 )  
							
							 
							
							
							
						 
						
							2019-03-07 01:22:53 -08:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								0a6e716600 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4815  from matrix-org/erikj/docstrings  
							
							 
							
							... 
							
							
							
							Add docstrings from matrix-org-hotfixes 
							
						 
						
							2019-03-06 18:59:28 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8b7790e68f 
								
							
								 
							
						 
						
							
							
								
								Port  #4422  debug logging from hotfixes  
							
							 
							
							
							
						 
						
							2019-03-06 17:29:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6d13bdec91 
								
							
								 
							
						 
						
							
							
								
								Add docstrings from matrix-org-hotfixes  
							
							 
							
							
							
						 
						
							2019-03-06 17:24:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a9de04be72 
								
							
								 
							
						 
						
							
							
								
								Implement soft fail  
							
							 
							
							
							
						 
						
							2019-03-06 16:22:16 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
							
								
							
								6f3cde8b25 
								
							
								 
							
						 
						
							
							
								
								Make registration ratelimiter separate from the main events one  
							
							 
							
							
							
						 
						
							2019-03-06 11:02:42 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
							
								
							
								f4195f4118 
								
							
								 
							
						 
						
							
							
								
								Revert "Split ratelimiters in two (one for events, one for registration)"  
							
							 
							
							... 
							
							
							
							This reverts commit d7dbad3526 . 
							
						 
						
							2019-03-06 10:55:22 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
							
								
							
								d7dbad3526 
								
							
								 
							
						 
						
							
							
								
								Split ratelimiters in two (one for events, one for registration)  
							
							 
							
							
							
						 
						
							2019-03-05 18:41:27 +00:00  
						
					 
				
					
						
							
							
								 
								Brendan Abolivier
							
						 
						
							 
							
							
								
								
							
							
								
							
								a4c3a361b7 
								
									
								
							
								 
							
						 
						
							
							
								
								Add rate-limiting on registration ( #4735 )  
							
							 
							
							... 
							
							
							
							* Rate-limiting for registration
* Add unit test for registration rate limiting
* Add config parameters for rate limiting on auth endpoints
* Doc
* Fix doc of rate limiting function
Co-Authored-By: babolivier <contact@brendanabolivier.com>
* Incorporate review
* Fix config parsing
* Fix linting errors
* Set default config for auth rate limiting
* Fix tests
* Add changelog
* Advance reactor instead of mocked clock
* Move parameters to registration specific config and give them more sensible default values
* Remove unused config options
* Don't mock the rate limiter un MAU tests
* Rename _register_with_store into register_with_store
* Make CI happy
* Remove unused import
* Update sample config
* Fix ratelimiting test for py2
* Add non-guest test 
							
						 
						
							2019-03-05 14:25:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								b050a10871 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4699  from matrix-org/erikj/stop_fed_not_in_room  
							
							 
							
							... 
							
							
							
							Stop backpaginating when events not visible 
							
						 
						
							2019-03-05 09:32:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aa06d26ae0 
								
							
								 
							
						 
						
							
							
								
								clarify comments  
							
							 
							
							
							
						 
						
							2019-03-05 09:16:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								c3c542bb4a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4796  from matrix-org/erikj/factor_out_e2e_keys  
							
							 
							
							... 
							
							
							
							Allow /keys/{changes,query} API to run on worker 
							
						 
						
							2019-03-05 09:06:25 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bfa7d46a10 
								
							
								 
							
						 
						
							
							
								
								Allow /keys/{changes,query} API to run on worker  
							
							 
							
							
							
						 
						
							2019-03-04 18:30:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								157e5a8f27 
								
							
								 
							
						 
						
							
							
								
								Split DeviceHandler into master and worker  
							
							 
							
							
							
						 
						
							2019-03-04 18:29:26 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								b29693a30b 
								
							
								 
							
						 
						
							
							
								
								Clean up read-receipt handling.  
							
							 
							
							... 
							
							
							
							Remove a call to run_as_background_process: there is no need to run this as a
background process, because build_and_send_edu does not block.
We may as well inline the whole of _push_remotes. 
							
						 
						
							2019-03-04 18:16:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d1523aed6b 
								
							
								 
							
						 
						
							
							
								
								Only check history visibility when filtering  
							
							 
							
							... 
							
							
							
							When filtering events to send to server we check more than just history
visibility. However when deciding whether to backfill or not we only
care about the history visibility. 
							
						 
						
							2019-03-04 14:43:42 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								856c83f5f8 
								
									
								
							
								 
							
						 
						
							
							
								
								Avoid rebuilding Edu objects in worker mode ( #4770 )  
							
							 
							
							... 
							
							
							
							In worker mode, on the federation sender, when we receive an edu for sending
over the replication socket, it is parsed into an Edu object. There is no point
extracting the contents of it so that we can then immediately build another Edu. 
							
						 
						
							2019-03-04 12:57:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8b63fe4c26 
								
							
								 
							
						 
						
							
							
								
								s/get_forward_events/get_successor_events/  
							
							 
							
							
							
						 
						
							2019-03-04 11:56:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fbc047f2a5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/stop_fed_not_in_room  
							
							 
							
							
							
						 
						
							2019-03-04 11:54:58 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								3064952939 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix incorrect log about not persisting duplicate state event. ( #4776 )  
							
							 
							
							... 
							
							
							
							We were logging this when it was not true. 
							
						 
						
							2019-03-01 16:47:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b183fef9ac 
								
							
								 
							
						 
						
							
							
								
								Update comments  
							
							 
							
							
							
						 
						
							2019-02-27 13:06:10 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								802884d4ee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate_develop  
							
							 
							
							
							
						 
						
							2019-02-26 14:23:40 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6fcb25202f 
								
							
								 
							
						 
						
							
							
								
								Put function def back to the way it was  
							
							 
							
							
							
						 
						
							2019-02-26 14:17:38 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								7a4632af9c 
								
							
								 
							
						 
						
							
							
								
								Prevent showing non-fed rooms in fed /publicRooms  
							
							 
							
							
							
						 
						
							2019-02-26 13:37:24 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								c74624a633 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Prevent showing non-fed rooms in fed /publicRooms"  
							
							 
							
							
							
						 
						
							2019-02-26 13:20:38 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
								
								
							
							
								
							
								a1a6473293 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4736  from matrix-org/anoa/public_rooms_federate  
							
							 
							
							... 
							
							
							
							Config option to prevent showing non-fed rooms in fed /publicRooms 
							
						 
						
							2019-02-26 13:07:15 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								c4414768af 
								
							
								 
							
						 
						
							
							
								
								Cleaner chunk logic  
							
							 
							
							
							
						 
						
							2019-02-26 12:22:34 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								a712aa3a9c 
								
							
								 
							
						 
						
							
							
								
								Correct indent  
							
							 
							
							
							
						 
						
							2019-02-26 12:13:55 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								16565e67db 
								
							
								 
							
						 
						
							
							
								
								Correct docstring types and chunk logic  
							
							 
							
							
							
						 
						
							2019-02-26 12:12:48 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								40c2271680 
								
							
								 
							
						 
						
							
							
								
								Clean up room chunk logic  
							
							 
							
							
							
						 
						
							2019-02-26 12:04:34 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6728bf3940 
								
							
								 
							
						 
						
							
							
								
								Make not showing non-federated rooms the default  
							
							 
							
							
							
						 
						
							2019-02-26 11:52:52 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6946c20111 
								
							
								 
							
						 
						
							
							
								
								Result may be None  
							
							 
							
							
							
						 
						
							2019-02-26 11:27:19 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								71669a0fba 
								
							
								 
							
						 
						
							
							
								
								Address rich comments  
							
							 
							
							
							
						 
						
							2019-02-26 11:25:00 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								70ea2f4e1d 
								
							
								 
							
						 
						
							
							
								
								switch from google.com to recaptcha.net for reCAPTCHA ( #4731 )  
							
							 
							
							... 
							
							
							
							* add trivial clarification about jemalloc
* switch from google.com to recaptcha.net
because https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally  
							
						 
						
							2019-02-25 11:15:36 -08:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								1330aa4a8f 
								
							
								 
							
						 
						
							
							
								
								elif not else if  
							
							 
							
							
							
						 
						
							2019-02-25 17:28:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								65f3fbfbf7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4737  from matrix-org/erikj/failure_log_tb  
							
							 
							
							... 
							
							
							
							Log tracebacks correctly 
							
						 
						
							2019-02-25 17:26:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c7b333c545 
								
							
								 
							
						 
						
							
							
								
								Log tracebacks correctly  
							
							 
							
							
							
						 
						
							2019-02-25 16:56:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9c598dddcb 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							 
							
							
							
						 
						
							2019-02-25 16:32:02 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								8aaf7ffc44 
								
							
								 
							
						 
						
							
							
								
								syntax derp  
							
							 
							
							
							
						 
						
							2019-02-25 15:27:17 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								84c0a20dfe 
								
							
								 
							
						 
						
							
							
								
								Simplify call to generate_room_entry  
							
							 
							
							
							
						 
						
							2019-02-25 15:23:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4b9e5076c4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_rooms_federate  
							
							 
							
							
							
						 
						
							2019-02-25 15:08:18 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								07493607a8 
								
							
								 
							
						 
						
							
							
								
								Docs and arg name clarification  
							
							 
							
							
							
						 
						
							2019-02-25 15:04:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								bd398b874e 
								
							
								 
							
						 
						
							
							
								
								Don't restrict non-fed rooms over client APIs  
							
							 
							
							
							
						 
						
							2019-02-25 15:04:46 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								e4b078a600 
								
							
								 
							
						 
						
							
							
								
								Config option to prevent showing non-fed rooms in fed /publicRooms  
							
							 
							
							
							
						 
						
							2019-02-25 15:04:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d730c2c22b 
								
							
								 
							
						 
						
							
							
								
								More comments  
							
							 
							
							
							
						 
						
							2019-02-25 14:45:02 +00:00