034db2ba21 
								
							
								 
							
						 
						
							
							
								
								Fix dummy event insertion consent bug ( #6053 )  
							
							... 
							
							
							
							Fixes  #5905  
						
							2019-09-26 11:47:53 +01:00  
				
					
						
							
							
								 
						
							
							
								57dd41a45b 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix comments  
							
							... 
							
							
							
							Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> 
							
						 
						
							2019-09-11 13:54:50 +01:00  
				
					
						
							
							
								 
						
							
							
								c64c3bb4c5 
								
							
								 
							
						 
						
							
							
								
								Fix how we check for self redaction  
							
							
							
						 
						
							2019-09-11 11:18:04 +01:00  
				
					
						
							
							
								 
						
							
							
								54ce81c86d 
								
							
								 
							
						 
						
							
							
								
								Allow use of different ratelimits for admin redactions.  
							
							... 
							
							
							
							This is useful to allow room admins to quickly deal with a large number
of abusive messages. 
							
						 
						
							2019-09-11 10:46:38 +01:00  
				
					
						
							
							
								 
						
							
							
								c998f25006 
								
									
								
							
								 
							
						 
						
							
							
								
								Apply suggestions from code review  
							
							... 
							
							
							
							Co-Authored-By: Erik Johnston <erik@matrix.org> 
							
						 
						
							2019-08-23 10:28:54 +01:00  
				
					
						
							
							
								 
						
							
							
								9ba32f6573 
								
							
								 
							
						 
						
							
							
								
								Exempt bot users  
							
							
							
						 
						
							2019-08-23 09:56:31 +01:00  
				
					
						
							
							
								 
						
							
							
								886eceba3e 
								
							
								 
							
						 
						
							
							
								
								Return user_type in get_user_by_id  
							
							
							
						 
						
							2019-08-23 09:14:52 +01:00  
				
					
						
							
							
								 
						
							
							
								cf89266b98 
								
							
								 
							
						 
						
							
							
								
								Deny redaction of events in a different room.  
							
							... 
							
							
							
							We already correctly filter out such redactions, but we should also deny
them over the CS API. 
							
						 
						
							2019-07-31 16:12:27 +01:00  
				
					
						
							
							
								 
						
							
							
								f30a71a67b 
								
									
								
							
								 
							
						 
						
							
							
								
								Stop trying to fetch events with event_id=None. ( #5753 )  
							
							... 
							
							
							
							`None` is not a valid event id, so queuing up a database fetch for it seems
like a silly thing to do.
I considered making `get_event` return `None` if `event_id is None`, but then
its interaction with `allow_none` seemed uninituitive, and strong typing ftw. 
							
						 
						
							2019-07-24 13:16:18 +01:00  
				
					
						
							
							
								 
						
							
							
								4806651744 
								
									
								
							
								 
							
						 
						
							
							
								
								Replace returnValue with return ( #5736 )  
							
							
							
						 
						
							2019-07-23 23:00:55 +10:00  
				
					
						
							
							
								 
						
							
							
								9c70a02a9c 
								
									
								
							
								 
							
						 
						
							
							
								
								Ignore redactions of m.room.create events ( #5701 )  
							
							
							
						 
						
							2019-07-17 19:08:02 +01:00  
				
					
						
							
							
								 
						
							
							
								463b072b12 
								
									
								
							
								 
							
						 
						
							
							
								
								Move logging utilities out of the side drawer of util/ and into logging/ ( #5606 )  
							
							
							
						 
						
							2019-07-04 00:07:04 +10:00  
				
					
						
							
							
								 
						
							
							
								32e7c9e7f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Run Black. ( #5482 )  
							
							
							
						 
						
							2019-06-20 19:32:02 +10:00  
				
					
						
							
							
								 
						
							
							
								554609288b 
								
							
								 
							
						 
						
							
							
								
								Run as background process and fix comments  
							
							
							
						 
						
							2019-06-19 11:33:03 +01:00  
				
					
						
							
							
								 
						
							
							
								b42f90470f 
								
							
								 
							
						 
						
							
							
								
								Add experimental option to reduce extremities.  
							
							... 
							
							
							
							Adds new config option `cleanup_extremities_with_dummy_events` which
periodically sends dummy events to rooms with more than 10 extremities.
THIS IS REALLY EXPERIMENTAL. 
							
						 
						
							2019-06-18 15:02:18 +01:00  
				
					
						
							
							
								 
						
							
							
								f874b16b2e 
								
							
								 
							
						 
						
							
							
								
								Add plugin APIs for implementations of custom event rules.  
							
							
							
						 
						
							2019-06-14 18:16:03 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4cb577c23f 
								
							
								 
							
						 
						
							
							
								
								Don't bundle aggs for /state and /members etc APIs  
							
							
							
						 
						
							2019-05-24 09:52:33 +01:00  
				
					
						
							
							
								 
						
							
							
								44b8ba484e 
								
							
								 
							
						 
						
							
							
								
								Fix words  
							
							
							
						 
						
							2019-05-21 16:51:45 +01:00  
				
					
						
							
							
								 
						
							
							
								c7ec06e8a6 
								
							
								 
							
						 
						
							
							
								
								Block attempts to annotate the same event twice  
							
							
							
						 
						
							2019-05-20 17:39:05 +01:00  
				
					
						
							
							
								 
						
							
							
								b54b03f9e1 
								
							
								 
							
						 
						
							
							
								
								Allow client event serialization to be async  
							
							
							
						 
						
							2019-05-14 11:58:01 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4a4d5c4fd6 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix grammar and document get_current_users_in_room ( #4998 )  
							
							
							
						 
						
							2019-04-03 14:32:20 +01:00  
				
					
						
							
							
								 
						
							
							
								54a87a7b08 
								
									
								
							
								 
							
						 
						
							
							
								
								Collect room-version variations into one place ( #4969 )  
							
							... 
							
							
							
							Collect all the things that make room-versions different to one another into
one place, so that it's easier to define new room versions. 
							
						 
						
							2019-04-01 10:24:38 +01:00  
				
					
						
							
							
								 
						
							
							
								cd62981a6a 
								
							
								 
							
						 
						
							
							
								
								Revert spurious delete  
							
							
							
						 
						
							2019-03-20 17:51:27 +00:00  
				
					
						
							
							
								 
						
							
							
								aa959a6c07 
								
							
								 
							
						 
						
							
							
								
								Use flags  
							
							
							
						 
						
							2019-03-20 17:40:29 +00:00  
				
					
						
							
							
								 
						
							
							
								7d47cc1305 
								
							
								 
							
						 
						
							
							
								
								Move requester check into assert_accepted_privacy_policy  
							
							
							
						 
						
							2019-03-20 17:08:36 +00:00  
				
					
						
							
							
								 
						
							
							
								74c46d81fa 
								
							
								 
							
						 
						
							
							
								
								Only require consent for events with an associated request  
							
							... 
							
							
							
							There are a number of instances where a server or admin may puppet a
user to join/leave rooms, which we don't want to fail if the user has
not consented to the privacy policy. We fix this by adding a check to
test if the requester has an associated access_token, which is used as a
proxy to answer the question of whether the action is being done on
behalf of a real request from the user. 
							
						 
						
							2019-03-20 16:50:23 +00:00  
				
					
						
							
							
								 
						
							
							
								88f0675967 
								
							
								 
							
						 
						
							
							
								
								fix test_auto_create_auto_join_where_no_consent ( #4886 )  
							
							
							
						 
						
							2019-03-19 11:38:59 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								a696c48133 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah  
							
							
							
						 
						
							2019-01-29 22:00:33 +00:00  
				
					
						
							
							
								 
						
							
							
								5891a6edc8 
								
							
								 
							
						 
						
							
							
								
								Correctly set context.app_service  
							
							
							
						 
						
							2019-01-29 12:09:10 +00:00  
				
					
						
							
							
								 
						
							
							
								7709d2bd16 
								
							
								 
							
						 
						
							
							
								
								Implement rechecking of redactions  
							
							
							
						 
						
							2019-01-29 11:56:20 +00:00  
				
					
						
							
							
								 
						
							
							
								be47cfa9c9 
								
							
								 
							
						 
						
							
							
								
								Refactor event building into EventBuilder  
							
							... 
							
							
							
							This is so that everything is done in one place, making it easier to
change the event format based on room version 
							
						 
						
							2019-01-29 11:13:00 +00:00  
				
					
						
							
							
								 
						
							
							
								073f6c2e5e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4494  from matrix-org/erikj/fixup_event_validator  
							
							... 
							
							
							
							Split up event validation between event and builder 
							
						 
						
							2019-01-29 10:55:07 +00:00  
				
					
						
							
							
								 
						
							
							
								d758d5310e 
								
							
								 
							
						 
						
							
							
								
								Correctly use default room version if none is set  
							
							
							
						 
						
							2019-01-28 17:26:39 +00:00  
				
					
						
							
							
								 
						
							
							
								b872c7b1b4 
								
							
								 
							
						 
						
							
							
								
								Split up event validation between event and builder  
							
							... 
							
							
							
							The validator was being run on the EventBuilder objects, and so the
validator only checked a subset of fields. With the upcoming
EventBuilder refactor even fewer fields will be there to validate.
To get around this we split the validation into those that can be run
against an EventBuilder and those run against a fully fledged event. 
							
						 
						
							2019-01-28 17:00:14 +00:00  
				
					
						
							
							
								 
						
							
							
								ae2a957dba 
								
							
								 
							
						 
						
							
							
								
								Pass through room version to event auth  
							
							
							
						 
						
							2019-01-25 18:31:41 +00:00  
				
					
						
							
							
								 
						
							
							
								a50cf929c1 
								
							
								 
							
						 
						
							
							
								
								Require event format version to parse or create events  
							
							
							
						 
						
							2019-01-25 10:32:19 +00:00  
				
					
						
							
							
								 
						
							
							
								be6a7e47fa 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Require event format version to parse or create events"  
							
							
							
						 
						
							2019-01-25 10:23:51 +00:00  
				
					
						
							
							
								 
						
							
							
								f431ff3fb8 
								
							
								 
							
						 
						
							
							
								
								Require event format version to parse or create events  
							
							
							
						 
						
							2019-01-23 20:21:33 +00:00  
				
					
						
							
							
								 
						
							
							
								9b827c40ca 
								
									
								
							
								 
							
						 
						
							
							
								
								Log some bits about event creation ( #4121 )  
							
							... 
							
							
							
							I found these helpful in debugging my room upgrade tests. 
							
						 
						
							2018-10-31 15:42:23 +00:00  
				
					
						
							
							
								 
						
							
							
								cb53ce9d64 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor state group lookup to reduce DB hits ( #4011 )  
							
							... 
							
							
							
							Currently when fetching state groups from the data store we make two
hits two the database: once for members and once for non-members (unless
request is filtered to one or the other). This adds needless load to the
datbase, so this PR refactors the lookup to make only a single database
hit. 
							
						 
						
							2018-10-25 17:49:55 +01:00  
				
					
						
							
							
								 
						
							
							
								e7a16c6210 
								
							
								 
							
						 
						
							
							
								
								Remove redundant run_as_background_process() from pusherpool  
							
							... 
							
							
							
							`on_new_notifications` and `on_new_receipts` in `HttpPusher` and `EmailPusher`
now always return synchronously, so we can remove the `defer.gatherResults` on
their results, and the `run_as_background_process` wrappers can be removed too
because the PusherPool methods will now complete quickly enough. 
							
						 
						
							2018-10-22 16:12:11 +01:00  
				
					
						
							
							
								 
						
							
							
								8174c6725b 
								
							
								 
							
						 
						
							
							
								
								Avoid reraise, to improve stacktraces  
							
							
							
						 
						
							2018-10-01 18:50:34 +01:00  
				
					
						
							
							
								 
						
							
							
								c144252a8c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3710  from matrix-org/rav/logcontext_for_pusher_updates  
							
							... 
							
							
							
							Fix logcontexts for running pushers 
							
						 
						
							2018-08-17 16:21:49 +01:00  
				
					
						
							
							
								 
						
							
							
								66f7dc8c87 
								
							
								 
							
						 
						
							
							
								
								Fix logcontexts for running pushers  
							
							... 
							
							
							
							First of all, avoid resetting the logcontext before running the pushers, to fix
the "Starting db txn 'get_all_updated_receipts' from sentinel context" warning.
Instead, give them their own "background process" logcontexts. 
							
						 
						
							2018-08-17 00:32:39 +01:00  
				
					
						
							
							
								 
						
							
							
								372bf073c1 
								
							
								 
							
						 
						
							
							
								
								block event creation and room creation on hitting resource limits  
							
							
							
						 
						
							2018-08-16 21:25:16 +01:00  
				
					
						
							
							
								 
						
							
							
								2f78f432c4 
								
							
								 
							
						 
						
							
							
								
								speed up /members and add at= and membership params ( #3568 )  
							
							
							
						 
						
							2018-08-15 16:35:22 +01:00  
				
					
						
							
							
								 
						
							
							
								b37c472419 
								
									
								
							
								 
							
						 
						
							
							
								
								Rename async to async_helpers because `async` is a keyword on Python 3.7 ( #3678 )  
							
							
							
						 
						
							2018-08-10 23:50:21 +10:00