Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								50d9d97408 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3642  from matrix-org/rav/another_room_id_check  
							
							 
							
							... 
							
							
							
							Check room visibility for /event/ requests 
							
						 
						
							2018-08-02 15:21:59 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8cefc690c9 
								
							
								 
							
						 
						
							
							
								
								changelogs  
							
							 
							
							
							
						 
						
							2018-08-02 15:11:19 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0bf5ec0db7 
								
							
								 
							
						 
						
							
							
								
								Check room visibility for /event/ requests  
							
							 
							
							... 
							
							
							
							Make sure that the user has permission to view the requeseted event for
/event/{eventId} and /room/{roomId}/event/{eventId} requests.
Also check that the event is in the given room for
/room/{roomId}/event/{eventId}, for sanity. 
							
						 
						
							2018-08-02 15:03:27 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								a937497cf5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3641  from matrix-org/rav/room_id_check  
							
							 
							
							... 
							
							
							
							Validation for events/rooms in fed requests 
							
						 
						
							2018-08-02 14:22:05 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								a013404292 
								
							
								 
							
						 
						
							
							
								
								changelog  
							
							 
							
							
							
						 
						
							2018-08-02 14:00:29 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								14fa9d4d92 
								
							
								 
							
						 
						
							
							
								
								Avoid extra db lookups  
							
							 
							
							... 
							
							
							
							Since we're about to look up the events themselves anyway, we can skip the
extra db queries here. 
							
						 
						
							2018-08-02 13:55:51 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c4ffbecb68 
								
							
								 
							
						 
						
							
							
								
								fix test, update constructor call  
							
							 
							
							
							
						 
						
							2018-08-02 13:51:05 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0a65450d04 
								
							
								 
							
						 
						
							
							
								
								Validation for events/rooms in fed requests  
							
							 
							
							... 
							
							
							
							When we get a federation request which refers to an event id, make sure that
said event is in the room the caller claims it is in.
(patch supplied by @turt2live) 
							
						 
						
							2018-08-02 13:48:40 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								00f99f74b1 
								
							
								 
							
						 
						
							
							
								
								insertion into monthly_active_users  
							
							 
							
							
							
						 
						
							2018-08-02 13:47:19 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								4a6725d9d1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/mau_tracker  
							
							 
							
							
							
						 
						
							2018-08-02 11:04:18 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								40c1c59cf4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3621  from matrix-org/erikj/split_fed_store  
							
							 
							
							... 
							
							
							
							Split out DB writes in federation handler 
							
						 
						
							2018-08-02 10:41:42 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								08281fe6b7 
								
							
								 
							
						 
						
							
							
								
								self.db_conn unused  
							
							 
							
							
							
						 
						
							2018-08-01 23:26:24 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c21d82bab3 
								
							
								 
							
						 
						
							
							
								
								normalise reaping query  
							
							 
							
							
							
						 
						
							2018-08-01 23:24:38 +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  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								b8d7d3996b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3620  from fuzzmz/return-404-room-not-found  
							
							 
							
							... 
							
							
							
							return 404 if room not found 
							
						 
						
							2018-08-01 16:34:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								908be65e64 
								
							
								 
							
						 
						
							
							
								
								changelog  
							
							 
							
							
							
						 
						
							2018-08-01 16:23:31 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								b7f203a566 
								
							
								 
							
						 
						
							
							
								
								count_monthly_users is now async  
							
							 
							
							
							
						 
						
							2018-08-01 16:17:42 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								7ff44d9215 
								
							
								 
							
						 
						
							
							
								
								improve clarity  
							
							 
							
							
							
						 
						
							2018-08-01 16:17:00 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								38b98e5a98 
								
							
								 
							
						 
						
							
							
								
								changelog  
							
							 
							
							
							
						 
						
							2018-08-01 16:07:49 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								01e93f48ed 
								
							
								 
							
						 
						
							
							
								
								Kill off MatrixCodeMessageException  
							
							 
							
							... 
							
							
							
							This code brings the SimpleHttpClient into line with the
MatrixFederationHttpClient by having it raise HttpResponseExceptions when a
request fails (rather than trying to parse for matrix errors and maybe raising
MatrixCodeMessageException).
Then, whenever we were checking for MatrixCodeMessageException and turning them
into SynapseErrors, we now need to check for HttpResponseExceptions and call
to_synapse_error. 
							
						 
						
							2018-08-01 16:02:46 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								018d75a148 
								
							
								 
							
						 
						
							
							
								
								Refactor code for turning HttpResponseException into SynapseError  
							
							 
							
							... 
							
							
							
							This commit replaces SynapseError.from_http_response_exception with
HttpResponseException.to_synapse_error.
The new method actually returns a ProxiedRequestError, which allows us to pass
through additional metadata from the API call. 
							
						 
						
							2018-08-01 16:02:46 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								fa7dc889f1 
								
							
								 
							
						 
						
							
							
								
								Be more careful which errors we send back over the C-S API  
							
							 
							
							... 
							
							
							
							We really shouldn't be sending all CodeMessageExceptions back over the C-S API;
it will include things like 401s which we shouldn't proxy.
That means that we need to explicitly turn a few HttpResponseExceptions into
SynapseErrors in the federation layer.
The effect of the latter is that the matrix errcode will get passed through
correctly to calling clients, which might help with some of the random
M_UNKNOWN errors when trying to join rooms. 
							
						 
						
							2018-08-01 16:02:38 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								c82ccd3027 
								
							
								 
							
						 
						
							
							
								
								Factor out exception handling in federation_client  
							
							 
							
							... 
							
							
							
							Factor out the error handling from make_membership_event, send_join, and
send_leave, so that it can be shared. 
							
						 
						
							2018-08-01 16:01:04 +01: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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a6d7b74915 
								
							
								 
							
						 
						
							
							
								
								update docs  
							
							 
							
							
							
						 
						
							2018-08-01 13:39:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4b256b9271 
								
							
								 
							
						 
						
							
							
								
								_persist_auth_tree no longer returns anything  
							
							 
							
							
							
						 
						
							2018-08-01 13:39:07 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								4e5ac901dd 
								
							
								 
							
						 
						
							
							
								
								clean up  
							
							 
							
							
							
						 
						
							2018-08-01 12:03:57 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								f9f5559971 
								
							
								 
							
						 
						
							
							
								
								fix comment  
							
							 
							
							
							
						 
						
							2018-08-01 12:03:42 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								4e6e00152c 
								
							
								 
							
						 
						
							
							
								
								fix known broken test  
							
							 
							
							
							
						 
						
							2018-08-01 11:48:37 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								0aba3d361a 
								
							
								 
							
						 
						
							
							
								
								count_monthly_users() async  
							
							 
							
							
							
						 
						
							2018-08-01 11:47:58 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								2c54f1c225 
								
							
								 
							
						 
						
							
							
								
								remove need to plot limit_usage_by_mau  
							
							 
							
							
							
						 
						
							2018-08-01 11:46:59 +01:00  
						
					 
				
					
						
							
							
								 
								Jan Christian Grünhage
							
						 
						
							 
							
							
								
								
							
							
								
							
								c4842e16cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3543  from bebehei/docker  
							
							 
							
							... 
							
							
							
							Improvements for Docker usage 
							
						 
						
							2018-08-01 11:32:45 +02:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								6e63d6868c 
								
									
								
							
								 
							
						 
						
							
							
								
								Update 2952.bugfix  
							
							 
							
							
							
						 
						
							2018-08-01 10:31:22 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								f49147d14f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3634  from matrix-org/rav/wtf_is_a_replication_layer  
							
							 
							
							... 
							
							
							
							rename replication_layer to federation_client 
							
						 
						
							2018-08-01 10:29:29 +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
							
						 
						
							 
							
							
							
								
							
								6023cdd227 
								
							
								 
							
						 
						
							
							
								
								remove errant print  
							
							 
							
							
							
						 
						
							2018-08-01 10:27:17 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								7931393495 
								
							
								 
							
						 
						
							
							
								
								make count_monthly_users async synapse/handlers/auth.py  
							
							 
							
							
							
						 
						
							2018-08-01 10:21:56 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								c507fa15ce 
								
							
								 
							
						 
						
							
							
								
								only need to loop if mau limiting is enabled  
							
							 
							
							
							
						 
						
							2018-08-01 10:20:42 +01:00  
						
					 
				
					
						
							
							
								 
								Serban Constantin
							
						 
						
							 
							
							
								
								
							
							
								
							
								70af98e361 
								
									
								
							
								 
							
						 
						
							
							
								
								return NotFoundError if room not found  
							
							 
							
							... 
							
							
							
							Per the Client-Server API[0] we should return
`M_NOT_FOUND` if the room isn't found instead
of generic SynapseError.
This ensures that /directory/list API returns
404 for room not found instead of 400.
[0]: https://matrix.org/docs/spec/client_server/unstable.html#get-matrix-client-r0-directory-list-room-roomid 
Signed-off-by: Serban Constantin <serban.constantin@gmail.com> 
							
						 
						
							2018-07-31 21:47:23 +03:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								5e2ee64660 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3628  from turt2live/travis/goodby-pdu-failures  
							
							 
							
							... 
							
							
							
							Remove pdu_failures from transactions 
							
						 
						
							2018-07-31 12:13:09 -06:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1841672c85 
								
							
								 
							
						 
						
							
							
								
								changelog  
							
							 
							
							
							
						 
						
							2018-07-31 18:26:54 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								6ef983ce5c 
								
							
								 
							
						 
						
							
							
								
								api into monthly_active_users table  
							
							 
							
							
							
						 
						
							2018-07-31 16:36:24 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								bdbdceeafa 
								
							
								 
							
						 
						
							
							
								
								rename replication_layer to federation_client  
							
							 
							
							... 
							
							
							
							I have HAD ENOUGH of trying to remember wtf a replication layer is in terms of
classes. 
							
						 
						
							2018-07-31 15:44:05 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								16bd63f32f 
								
							
								 
							
						 
						
							
							
								
								Newsfile  
							
							 
							
							
							
						 
						
							2018-07-31 14:48:43 +01:00