Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								49e01e5710 
								
							 
						 
						
							
							
								
								Fix defaults on checking threepids  
							
							
							
						 
						
							2019-06-10 23:09:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Morgan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3719680ee4 
								
							 
						 
						
							
							
								
								Add ability to perform password reset via email without trusting the identity server ( #5377 )  
							
							... 
							
							
							
							Sends password reset emails from the homeserver instead of proxying to the identity server. This is now the default behaviour for security reasons. If you wish to continue proxying password reset requests to the identity server you must now enable the email.trust_identity_server_for_password_resets option.
This PR is a culmination of 3 smaller PRs which have each been separately reviewed:
* #5308 
* #5345 
* #5368  
							
						 
						
							2019-06-06 17:34:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard van der Hoff 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71063a69b8 
								
							 
						 
						
							
							
								
								Fix missing logcontext for PresenceHandler.on_shutdown. ( #5369 )  
							
							... 
							
							
							
							Fixes some warnings, and a scary-looking stacktrace when sytest kills the
process. 
							
						 
						
							2019-06-06 14:45:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f06344e11 
								
							 
						 
						
							
							
								
								Merge pull request  #5089  from dnaf/m-heroes-empty-room-name  
							
							... 
							
							
							
							Make /sync return heroes if room name or canonical alias are empty 
							
						 
						
							2019-06-06 11:18:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64fa928792 
								
							 
						 
						
							
							
								
								Simplify condition  
							
							
							
						 
						
							2019-06-06 10:34:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9c43c8463 
								
							 
						 
						
							
							
								
								Merge pull request  #5355  from matrix-org/babolivier/heroes_left_members  
							
							... 
							
							
							
							Include left members in room summaries' heroes 
							
						 
						
							2019-06-06 10:05:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								75538813fc 
								
							 
						 
						
							
							
								
								Fix background updates to handle redactions/rejections ( #5352 )  
							
							... 
							
							
							
							* Fix background updates to handle redactions/rejections
In background updates based on current state delta stream we need to
handle that we may not have all the events (or at least that
`get_events` may raise an exception). 
							
						 
						
							2019-06-06 00:45:46 +10:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0a2f522644 
								
							 
						 
						
							
							
								
								Simplify condition  
							
							
							
						 
						
							2019-06-05 14:02:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
							
							
								
							
							
								40596aec0e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into m-heroes-empty-room-name  
							
							
							
						 
						
							2019-06-05 13:38:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dbbaf25dd3 
								
							 
						 
						
							
							
								
								Do user_id != me checks before deciding whether we should pick heroes from the joined members or the parted ones  
							
							
							
						 
						
							2019-06-05 11:50:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								bc3d6b918b 
								
							 
						 
						
							
							
								
								Add logging when request fails and clarify we ignore errors.  
							
							
							
						 
						
							2019-06-05 11:37:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								220a733d73 
								
							 
						 
						
							
							
								
								Fix handling of failures when calling /event_auth.  
							
							... 
							
							
							
							When processing an incoming event over federation, we may try and
resolve any unexpected differences in auth events. This is a
non-essential process and so should not stop the processing of the event
if it fails (e.g. due to the remote disappearing or not implementing the
necessary endpoints).
Fixes  #3330  
							
						 
						
							2019-06-03 09:56:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard van der Hoff 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d828d1dc57 
								
							 
						 
						
							
							
								
								Merge pull request  #5309  from matrix-org/rav/limit_displayname_length  
							
							... 
							
							
							
							Limit displaynames and avatar URLs 
							
						 
						
							2019-06-01 11:34:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard van der Hoff 
								
							 
						 
						
							
							
							
							
								
							
							
								d16c6375fe 
								
							 
						 
						
							
							
								
								Limit displaynames and avatar URLs  
							
							... 
							
							
							
							These end up in join events everywhere, so let's limit them.
Fixes  #5079  
							
						 
						
							2019-06-01 10:44:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard van der Hoff 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5726378ece 
								
							 
						 
						
							
							
								
								Fix "db txn 'update_presence' from sentinel context" log messages ( #5275 )  
							
							... 
							
							
							
							Fixes  #4414 . 
						
							2019-05-28 21:20:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d16f5574b6 
								
							 
						 
						
							
							
								
								Merge pull request  #5220  from matrix-org/erikj/dont_bundle_live_events  
							
							... 
							
							
							
							Don't bundle aggregations with events in /sync or /events or state queries 
							
						 
						
							2019-05-24 10:36:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								4cb577c23f 
								
							 
						 
						
							
							
								
								Don't bundle aggs for /state and /members etc APIs  
							
							
							
						 
						
							2019-05-24 09:52:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Morgan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6368150a74 
								
							 
						 
						
							
							
								
								Add config option for setting homeserver's default room version ( #5223 )  
							
							... 
							
							
							
							Replaces DEFAULT_ROOM_VERSION constant with a method that first checks the config, then returns a hardcoded value if the option is not present.
That hardcoded value is now located in the server.py config file. 
							
						 
						
							2019-05-23 15:00:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard van der Hoff 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								85d1e03b9d 
								
							 
						 
						
							
							
								
								Simplifications and comments in do_auth ( #5227 )  
							
							... 
							
							
							
							I was staring at this function trying to figure out wtf it was actually
doing. This is (hopefully) a non-functional refactor which makes it a bit
clearer. 
							
						 
						
							2019-05-23 11:17:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Amber Brown 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a30e4acb4 
								
							 
						 
						
							
							
								
								Room Statistics ( #4338 )  
							
							
							
						 
						
							2019-05-21 11:36:50 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9526aa96a6 
								
							 
						 
						
							
							
								
								Merge pull request  #5212  from matrix-org/erikj/deny_multiple_reactions  
							
							... 
							
							
							
							Block attempts to annotate the same event twice 
							
						 
						
							2019-05-21 17:08:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								44b8ba484e 
								
							 
						 
						
							
							
								
								Fix words  
							
							
							
						 
						
							2019-05-21 16:51:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard van der Hoff 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4aef549ad 
								
							 
						 
						
							
							
								
								Exclude soft-failed events from fwd-extremity candidates. ( #5146 )  
							
							... 
							
							
							
							When considering the candidates to be forward-extremities, we must exclude soft
failures.
Hopefully fixes  #5090 . 
							
						 
						
							2019-05-21 16:10:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								de7672b78f 
								
							 
						 
						
							
							
								
								Don't bundle events in /sync or /events  
							
							... 
							
							
							
							As we'll send down the annotations too anyway, so this just ends up
confusing clients. 
							
						 
						
							2019-05-21 13:54:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								c7ec06e8a6 
								
							 
						 
						
							
							
								
								Block attempts to annotate the same event twice  
							
							
							
						 
						
							2019-05-20 17:39:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									ReidAnderson 
								
							 
						 
						
							
							
							
							
								
							
							
								3787133c9e 
								
							 
						 
						
							
							
								
								Limit UserIds to a length that fits in a state key ( #5198 )  
							
							
							
						 
						
							2019-05-20 11:20:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bytepoets-blo 
								
							 
						 
						
							
							
							
							
								
							
							
								291e1eea5e 
								
							 
						 
						
							
							
								
								fix mapping of return values for get_or_register_3pid_guest ( #5177 )  
							
							... 
							
							
							
							* fix mapping of return values for get_or_register_3pid_guest 
							
						 
						
							2019-05-17 17:27:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
							
							
								
							
							
								cd32375846 
								
							 
						 
						
							
							
								
								Add option to disable per-room profiles  
							
							
							
						 
						
							2019-05-16 14:34:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthew Hodgson 
								
							 
						 
						
							
							
							
							
								
							
							
								4a6d5de98c 
								
							 
						 
						
							
							
								
								Make /sync attempt to return device updates for both joined and invited users ( #3484 )  
							
							
							
						 
						
							2019-05-16 13:23:43 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Amber Brown 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f1e5b41388 
								
							 
						 
						
							
							
								
								Make all the rate limiting options more consistent ( #5181 )  
							
							
							
						 
						
							2019-05-15 12:06:04 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								b54b03f9e1 
								
							 
						 
						
							
							
								
								Allow client event serialization to be async  
							
							
							
						 
						
							2019-05-14 11:58:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthew Hodgson 
								
							 
						 
						
							
							
							
							
								
							
							
								c0e0740bef 
								
							 
						 
						
							
							
								
								add options to require an access_token to GET /profile and /publicRooms on CS API ( #5083 )  
							
							... 
							
							
							
							This commit adds two config options:
* `restrict_public_rooms_to_local_users`
Requires auth to fetch the public rooms directory through the CS API and disables fetching it through the federation API.
* `require_auth_for_profile_requests`
When set to `true`, requires that requests to `/profile` over the CS API are authenticated, and only returns the user's profile if the requester shares a room with the profile's owner, as per MSC1301.
MSC1301 also specifies a behaviour for federation (only returning the profile if the server asking for it shares a room with the profile's owner), but that's currently really non-trivial to do in a not too expensive way. Next step is writing down a MSC that allows a HS to specify which user sent the profile query. In this implementation, Synapse won't send a profile query over federation if it doesn't believe it already shares a room with the profile's owner, though.
Groups have been intentionally omitted from this commit. 
							
						 
						
							2019-05-08 18:26:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1473058b5e 
								
							 
						 
						
							
							
								
								Do checks on aliases for incoming m.room.aliases events ( #5128 )  
							
							... 
							
							
							
							Follow-up to #5124 
Also added a bunch of checks to make sure everything (both the stuff added on #5124  and this PR) works as intended. 
							
						 
						
							2019-05-08 17:01:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de655e669a 
								
							 
						 
						
							
							
								
								Merge pull request  #5104  from matrix-org/erikj/ratelimit_3pid_invite  
							
							... 
							
							
							
							Ratelimit 3pid invites 
							
						 
						
							2019-05-07 10:12:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								176f31c2e3 
								
							 
						 
						
							
							
								
								Rate limit early  
							
							
							
						 
						
							2019-05-02 15:23:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
							
							
								
							
							
								84196cb231 
								
							 
						 
						
							
							
								
								Add some limitations to alias creation  
							
							
							
						 
						
							2019-05-02 11:05:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								d6118c5be6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ratelimit_3pid_invite  
							
							
							
						 
						
							2019-04-26 18:14:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								28a81ed62f 
								
							 
						 
						
							
							
								
								Ratelimit 3pid invites  
							
							... 
							
							
							
							We do ratelimit sending the 3PID invite events, but that happens after
spamming the identity server. 
							
						 
						
							2019-04-26 18:06:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Richard van der Hoff 
								
							 
						 
						
							
							
							
							
								
							
							
								bd0d45ca69 
								
							 
						 
						
							
							
								
								Fix infinite loop in presence handler  
							
							... 
							
							
							
							Fixes  #5102  
						
							2019-04-26 11:14:49 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Katie Wolfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7e07dc429f 
								
							 
						 
						
							
							
								
								Lint  
							
							... 
							
							
							
							I probably should've just run autopep8 in the first place...
Signed-off-by: Katie Wolfe <katie@dnaf.moe> 
							
						 
						
							2019-04-24 12:43:18 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Katie Wolfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b3e5db402d 
								
							 
						 
						
							
							
								
								Clean up code  
							
							... 
							
							
							
							Signed-off-by: Katie Wolfe <katie@dnaf.moe> 
							
						 
						
							2019-04-24 12:26:55 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Katie Wolfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d3ed79944 
								
							 
						 
						
							
							
								
								Show heroes if room name or canonical alias are empty  
							
							... 
							
							
							
							Fixes  #4194 
Signed-off-by: Katie Wolfe <katie@dnaf.moe> 
						
							2019-04-24 12:26:53 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Katie Wolfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7f025eb425 
								
							 
						 
						
							
							
								
								Show heroes if room name or canonical alias are empty  
							
							... 
							
							
							
							Fixes  #4194 
Signed-off-by: Katie Wolfe <katie@dnaf.moe> 
						
							2019-04-24 12:26:29 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Erik Johnston 
								
							 
						 
						
							
							
							
							
								
							
							
								ca90336a69 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/account_expiration  
							
							
							
						 
						
							2019-04-17 19:44:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
							
							
								
							
							
								eaf41a943b 
								
							 
						 
						
							
							
								
								Add management endpoints for account validity  
							
							
							
						 
						
							2019-04-17 19:34:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								91934025b9 
								
							 
						 
						
							
							
								
								Merge pull request  #5047  from matrix-org/babolivier/account_expiration  
							
							... 
							
							
							
							Send out emails with links to extend an account's validity period 
							
						 
						
							2019-04-17 14:57:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
							
							
								
							
							
								20f0617e87 
								
							 
						 
						
							
							
								
								Send out emails with links to extend an account's validity period  
							
							
							
						 
						
							2019-04-17 14:42:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Brendan Abolivier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8e85493b0c 
								
							 
						 
						
							
							
								
								Add config option to block users from looking up 3PIDs ( #5010 )  
							
							
							
						 
						
							2019-04-04 17:25:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Morgan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								db265f0642 
								
							 
						 
						
							
							
								
								Prevent kicking users who aren't in the room ( #4999 )  
							
							... 
							
							
							
							Prevent kick events from succeeding if the user is not currently in the room. 
							
						 
						
							2019-04-04 13:05:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Morgan 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a4d5c4fd6 
								
							 
						 
						
							
							
								
								Fix grammar and document get_current_users_in_room ( #4998 )  
							
							
							
						 
						
							2019-04-03 14:32:20 +01:00