Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9e982750ee 
								
							
								 
							
						 
						
							
							
								
								Persist rejection of invites over federation  
							
							 
							
							
							
						 
						
							2016-03-15 13:24:31 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								239badea9b 
								
							
								 
							
						 
						
							
							
								
								Use syntax that works on both py2.7 and py3  
							
							 
							
							
							
						 
						
							2016-03-07 20:13:10 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b4022cc487 
								
							
								 
							
						 
						
							
							
								
								Pass whole requester to ratelimiting  
							
							 
							
							... 
							
							
							
							This will enable more detailed decisions 
							
						 
						
							2016-03-03 16:43:42 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							 
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								4bfb32f685 
								
							
								 
							
						 
						
							
							
								
								Branch off member and non member sends  
							
							 
							
							... 
							
							
							
							Unclean, needs tidy-up, but works 
							
						 
						
							2016-02-15 18:21:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7b0d846407 
								
							
								 
							
						 
						
							
							
								
								Atomically persit push actions when we persist the event  
							
							 
							
							
							
						 
						
							2016-02-09 16:19:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							 
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d6d60b4d6c 
								
							
								 
							
						 
						
							
							
								
								Federation: drop events which cause SynapseErrors  
							
							 
							
							... 
							
							
							
							... rather than rejecting any attempt to federate channels which contain such
events. 
							
						 
						
							2016-01-27 17:02:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5a7d1ecffc 
								
							
								 
							
						 
						
							
							
								
								Add regex cache. Only caculate push actions for users that have sent read receipts, and are on that server  
							
							 
							
							
							
						 
						
							2016-01-19 16:01:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								63485b3029 
								
							
								 
							
						 
						
							
							
								
								Re-enable urnead notifications  
							
							 
							
							
							
						 
						
							2016-01-18 14:48:30 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ac5a4477ad 
								
							
								 
							
						 
						
							
							
								
								Require unbanning before other membership changes  
							
							 
							
							
							
						 
						
							2016-01-15 16:27:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fcb05b4c82 
								
							
								 
							
						 
						
							
							
								
								Temporarily disable notification branch  
							
							 
							
							
							
						 
						
							2016-01-13 17:39:58 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c232780081 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #456  from matrix-org/store_event_actions  
							
							 
							
							... 
							
							
							
							Send unread notification counts 
							
						 
						
							2016-01-08 14:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							 
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c79f221192 
								
							
								 
							
						 
						
							
							
								
								Add is_guest flag to users db to track whether a user is a guest user or not. Use this so we can run _filter_events_for_client when calculating event_push_actions.  
							
							 
							
							
							
						 
						
							2016-01-06 11:38:09 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								3051c9d002 
								
							
								 
							
						 
						
							
							
								
								Address minor PR issues  
							
							 
							
							
							
						 
						
							2016-01-04 13:39:29 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c061b47c57 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into store_event_actions  
							
							 
							
							
							
						 
						
							2015-12-21 15:30:26 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f73f154ec2 
								
							
								 
							
						 
						
							
							
								
								Only run pushers for users on this hs!  
							
							 
							
							
							
						 
						
							2015-12-21 15:28:54 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								bdacee476d 
								
							
								 
							
						 
						
							
							
								
								Add display_name to 3pid invite in m.room.member invites  
							
							 
							
							
							
						 
						
							2015-12-17 18:55:08 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								8c5f252edb 
								
							
								 
							
						 
						
							
							
								
								Strip address and such out of 3pid invites  
							
							 
							
							... 
							
							
							
							We're not meant to leak that into the graph 
							
						 
						
							2015-12-17 18:09:51 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a84a693327 
								
							
								 
							
						 
						
							
							
								
								Having consulted The Erikle, this should go at the end of on_receive_pdu, otherwise it will be triggered whenever we backfill too.  
							
							 
							
							
							
						 
						
							2015-12-10 17:18:46 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								99afb4b750 
								
							
								 
							
						 
						
							
							
								
								Ensure that the event that gets persisted is the one that was signed  
							
							 
							
							
							
						 
						
							2015-12-10 17:08:21 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								21f135ba76 
								
							
								 
							
						 
						
							
							
								
								Very first cut of calculating actions for events as they come in. Doesn't store them yet. Not very efficient.  
							
							 
							
							
							
						 
						
							2015-12-10 16:26:08 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c2c70f7daf 
								
							
								 
							
						 
						
							
							
								
								Use the context returned by _handle_new_event  
							
							 
							
							
							
						 
						
							2015-12-02 12:01:24 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c30cdb0d68 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							 
							
							
							
						 
						
							2015-12-02 10:49:35 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								2a0ec3b89d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into markjh/edu_frequency  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/federation.py
	synapse/handlers/room.py 
							
						 
						
							2015-12-02 10:40:22 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a9526831a4 
								
							
								 
							
						 
						
							
							
								
								Wrap calls to distributor.fire in appropriately named functions so that static analysis can work out want is calling what  
							
							 
							
							
							
						 
						
							2015-12-01 20:53:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ed0f79bdc5 
								
							
								 
							
						 
						
							
							
								
								Only fire user_joined_room if the membership has changed  
							
							 
							
							
							
						 
						
							2015-12-01 19:46:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c0b3554401 
								
							
								 
							
						 
						
							
							
								
								Fix missing profile data in federation joins  
							
							 
							
							... 
							
							
							
							There was a regression where we stopped including profile data in
initial joins for rooms joined over federation. 
							
						 
						
							2015-11-12 16:19:55 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								38d82edf0e 
								
							
								 
							
						 
						
							
							
								
								Allow guest users to join and message rooms  
							
							 
							
							
							
						 
						
							2015-11-10 16:57:13 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							 
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c452dabc3d 
								
							
								 
							
						 
						
							
							
								
								Remove the LockManager class because it wasn't being used  
							
							 
							
							
							
						 
						
							2015-11-04 14:08:15 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								137fafce4e 
								
							
								 
							
						 
						
							
							
								
								Allow rejecting invites  
							
							 
							
							... 
							
							
							
							This is done by using the same /leave flow as you would use if you had
already accepted the invite and wanted to leave. 
							
						 
						
							2015-10-20 11:58:58 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f38df51e8d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							 
							
							
							
						 
						
							2015-10-15 11:51:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								858634e1d0 
								
							
								 
							
						 
						
							
							
								
								Remove unused room_id arg  
							
							 
							
							
							
						 
						
							2015-10-14 09:31:20 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0c38e8637f 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary class-wrapping  
							
							 
							
							
							
						 
						
							2015-10-13 18:00:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								bb407cd624 
								
							
								 
							
						 
						
							
							
								
								Re-add accidentally removed code  
							
							 
							
							
							
						 
						
							2015-10-13 17:19:26 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								17dffef5ec 
								
							
								 
							
						 
						
							
							
								
								Move event contents into third_party_layout field  
							
							 
							
							
							
						 
						
							2015-10-13 15:48:12 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d4bb28c59b 
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Merge pull request  #283  from matrix-org/erikj/atomic_join_federation""  
							
							 
							
							... 
							
							
							
							This reverts commit 34d26d3687 . 
							
						 
						
							2015-10-06 09:58:21 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								c05b5ef7b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							 
							
							
							
						 
						
							2015-10-06 08:10:34 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								34d26d3687 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #283  from matrix-org/erikj/atomic_join_federation"  
							
							 
							
							... 
							
							
							
							This reverts commit 5879edbb09 , reversing
changes made to b43930d4c9 . 
							
						 
						
							2015-10-05 19:10:47 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								58e6a58eb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							 
							
							
							
						 
						
							2015-10-05 10:33:41 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								49ebd472fa 
								
							
								 
							
						 
						
							
							
								
								Explicitly add Create event as auth event  
							
							 
							
							
							
						 
						
							2015-10-02 13:22:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5879edbb09 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #283  from matrix-org/erikj/atomic_join_federation  
							
							 
							
							... 
							
							
							
							Atomically persist events when joining a room over federation/ 
							
						 
						
							2015-10-02 09:18:44 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								5b3e9713dd 
								
							
								 
							
						 
						
							
							
								
								Implement third party identifier invites  
							
							 
							
							
							
						 
						
							2015-10-01 17:49:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								83892d0d30 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2015-09-30 16:41:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9d39615b7d 
								
							
								 
							
						 
						
							
							
								
								Rename var  
							
							 
							
							
							
						 
						
							2015-09-30 16:37:59 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								60728c8c9e 
								
							
								 
							
						 
						
							
							
								
								synapse/handlers/federation.py:_handle_auth_events was unused  
							
							 
							
							
							
						 
						
							2015-09-23 10:25:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c34ffd2736 
								
							
								 
							
						 
						
							
							
								
								Fix getting an event for a room the server forgot it was in  
							
							 
							
							
							
						 
						
							2015-09-17 10:26:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								54e688277a 
								
							
								 
							
						 
						
							
							
								
								Also persist state  
							
							 
							
							
							
						 
						
							2015-09-17 10:26:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3a01901d6c 
								
							
								 
							
						 
						
							
							
								
								Capture err  
							
							 
							
							
							
						 
						
							2015-09-17 10:26:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								744e7d2790 
								
							
								 
							
						 
						
							
							
								
								Also handle state  
							
							 
							
							
							
						 
						
							2015-09-17 10:26:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a3e332af19 
								
							
								 
							
						 
						
							
							
								
								Don't bail out of joining if we encounter a rejected event  
							
							 
							
							
							
						 
						
							2015-09-17 10:26:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4678055173 
								
							
								 
							
						 
						
							
							
								
								Refactor do_invite_join  
							
							 
							
							
							
						 
						
							2015-09-17 10:24:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e9ee62db0 
								
							
								 
							
						 
						
							
							
								
								Add missing param in store.get_state_groups invocation  
							
							 
							
							
							
						 
						
							2015-08-21 09:15:13 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9f7f228ec2 
								
							
								 
							
						 
						
							
							
								
								Remove pointless map  
							
							 
							
							
							
						 
						
							2015-08-13 17:20:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1b994a97dd 
								
							
								 
							
						 
						
							
							
								
								Fix application of ACLs  
							
							 
							
							
							
						 
						
							2015-08-11 10:41:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07507643cb 
								
							
								 
							
						 
						
							
							
								
								Use dictionary cache to do group -> state fetching  
							
							 
							
							
							
						 
						
							2015-08-05 15:11:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4d6cb8814e 
								
							
								 
							
						 
						
							
							
								
								Speed up event filtering (for ACL) logic  
							
							 
							
							
							
						 
						
							2015-08-04 09:32:23 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								baa55fb69e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #193  from matrix-org/erikj/bulk_persist_event  
							
							 
							
							... 
							
							
							
							Add bulk insert events API 
							
						 
						
							2015-07-14 10:49:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b5f0d73ea3 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							 
							
							
							
						 
						
							2015-07-09 17:09:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fb47c3cfbe 
								
							
								 
							
						 
						
							
							
								
								Rename key and values for m.room.history_visibility. Support 'invited' value  
							
							 
							
							
							
						 
						
							2015-07-06 13:05:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c3e2600c67 
								
							
								 
							
						 
						
							
							
								
								Filter and redact events that the other server doesn't have permission to see during backfill  
							
							 
							
							
							
						 
						
							2015-07-03 17:52:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5130d80d79 
								
							
								 
							
						 
						
							
							
								
								Add bulk insert events API  
							
							 
							
							
							
						 
						
							2015-06-25 17:29:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8047fd2434 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #176  from matrix-org/erikj/backfill_auth  
							
							 
							
							... 
							
							
							
							Improve backfill. 
							
						 
						
							2015-06-03 17:25:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1c3d844e73 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute context  
							
							 
							
							
							
						 
						
							2015-06-03 16:41:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								09e23334de 
								
							
								 
							
						 
						
							
							
								
								Add a timeout  
							
							 
							
							
							
						 
						
							2015-06-02 11:00:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02410e9239 
								
							
								 
							
						 
						
							
							
								
								Handle the fact we might be missing auth events  
							
							 
							
							
							
						 
						
							2015-06-02 10:58:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e552b78d50 
								
							
								 
							
						 
						
							
							
								
								Add some logging  
							
							 
							
							
							
						 
						
							2015-06-02 10:28:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fde0da6f19 
								
							
								 
							
						 
						
							
							
								
								Correctly look up auth_events  
							
							 
							
							
							
						 
						
							2015-06-02 10:19:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3f04a08a0c 
								
							
								 
							
						 
						
							
							
								
								Don't process events we've already processed. Remember to process state events  
							
							 
							
							
							
						 
						
							2015-06-02 10:11:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bbfbf898e 
								
							
								 
							
						 
						
							
							
								
								Correctly pass in auth_events  
							
							 
							
							
							
						 
						
							2015-06-01 17:02:23 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								20814fabdd 
								
							
								 
							
						 
						
							
							
								
								Actually fetch state for new backwards extremeties when backfilling.  
							
							 
							
							
							
						 
						
							2015-05-20 11:59:02 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7223129916 
								
							
								 
							
						 
						
							
							
								
								Don't apply new room join hack if depth > 5  
							
							 
							
							
							
						 
						
							2015-05-19 14:16:08 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5e7883ec19 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf  
							
							 
							
							
							
						 
						
							2015-05-19 10:50:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ef910a0358 
								
							
								 
							
						 
						
							
							
								
								Do work in parellel when joining a room  
							
							 
							
							
							
						 
						
							2015-05-18 17:17:04 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								899d4675dd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'notifier_unify' into notifier_performance  
							
							 
							
							
							
						 
						
							2015-05-14 11:36:44 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								63878c0379 
								
							
								 
							
						 
						
							
							
								
								Don't bother checking for updates if the stream token hasn't advanced for a user  
							
							 
							
							
							
						 
						
							2015-05-13 13:42:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								80fd2b574c 
								
							
								 
							
						 
						
							
							
								
								Don't talk to yourself when backfilling  
							
							 
							
							
							
						 
						
							2015-05-12 16:19:46 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a6fb2aa2a5 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #144  from matrix-org/erikj/logging_context  
							
							 
							
							... 
							
							
							
							Preserving logging contexts 
							
						 
						
							2015-05-12 15:23:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07a1223156 
								
							
								 
							
						 
						
							
							
								
								s/backfil/backfill/  
							
							 
							
							
							
						 
						
							2015-05-12 14:09:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0d31ad5101 
								
							
								 
							
						 
						
							
							
								
								Typos everywhere  
							
							 
							
							
							
						 
						
							2015-05-12 14:02:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a0dfffb33c 
								
							
								 
							
						 
						
							
							
								
								And another typo.  
							
							 
							
							
							
						 
						
							2015-05-12 14:00:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6e5ac4a28f 
								
							
								 
							
						 
						
							
							
								
								Err, gatherResults doesn't take a dict...  
							
							 
							
							
							
						 
						
							2015-05-12 13:58:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								95dedb866f 
								
							
								 
							
						 
						
							
							
								
								Unwrap defer.gatherResults failures  
							
							 
							
							
							
						 
						
							2015-05-12 13:14:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								367382b575 
								
							
								 
							
						 
						
							
							
								
								Handle the case where the other side is unreachable when backfilling  
							
							 
							
							
							
						 
						
							2015-05-12 10:35:45 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								84e6b4001f 
								
							
								 
							
						 
						
							
							
								
								Initial hack at wiring together pagination and backfill  
							
							 
							
							
							
						 
						
							2015-05-11 18:01:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2236ef6c92 
								
							
								 
							
						 
						
							
							
								
								Fix up leak. Add warnings.  
							
							 
							
							
							
						 
						
							2015-05-08 19:53:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2d386d7038 
								
							
								 
							
						 
						
							
							
								
								That wasn't a deferred  
							
							 
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ac2823b3c 
								
							
								 
							
						 
						
							
							
								
								Remove inlineCallbacks from non-generator  
							
							 
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								42c12c04f6 
								
							
								 
							
						 
						
							
							
								
								Remove some run_on_reactors  
							
							 
							
							
							
						 
						
							2015-05-01 14:41:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a43b40449b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into mysql  
							
							 
							
							
							
						 
						
							2015-04-08 16:46:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								19234cc6c3 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							 
							
							
							
						 
						
							2015-04-08 14:10:06 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e8f1521605 
								
							
								 
							
						 
						
							
							
								
								Don't yield on notifying all listeners  
							
							 
							
							
							
						 
						
							2015-04-08 14:08:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								278149f533 
								
							
								 
							
						 
						
							
							
								
								Sanitize TransactionStore  
							
							 
							
							
							
						 
						
							2015-03-23 13:43:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bb24609158 
								
							
								 
							
						 
						
							
							
								
								Clean out event_forward_extremities table when the server rejoins the room  
							
							 
							
							
							
						 
						
							2015-03-18 11:19:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b2e6ee5b43 
								
							
								 
							
						 
						
							
							
								
								Remove concept of context.auth_events, instead use context.current_state  
							
							 
							
							
							
						 
						
							2015-03-16 13:06:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e25e0f4da9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu  
							
							 
							
							
							
						 
						
							2015-02-23 14:36:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								db215b7e00 
								
							
								 
							
						 
						
							
							
								
								Implement and use new batched get missing pdu  
							
							 
							
							
							
						 
						
							2015-02-23 13:58:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2bafeca270 
								
							
								 
							
						 
						
							
							
								
								Add missing comma so that it generates a dict and not a set  
							
							 
							
							
							
						 
						
							2015-02-20 14:08:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ac2a79faa 
								
							
								 
							
						 
						
							
							
								
								Initial stab at implementing a batched get_missing_pdus request  
							
							 
							
							
							
						 
						
							2015-02-19 17:24:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								47281f8fa4 
								
							
								 
							
						 
						
							
							
								
								Change some debug logging to info  
							
							 
							
							
							
						 
						
							2015-02-17 13:14:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b99a33f283 
								
							
								 
							
						 
						
							
							
								
								resolve_events expect lists, not dicts  
							
							 
							
							
							
						 
						
							2015-02-15 20:20:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b11a6e1c3c 
								
							
								 
							
						 
						
							
							
								
								Fix wrong variable name  
							
							 
							
							
							
						 
						
							2015-02-13 15:37:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e441c10a73 
								
							
								 
							
						 
						
							
							
								
								pyflakes  
							
							 
							
							
							
						 
						
							2015-02-13 14:23:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c652a2b5f 
								
							
								 
							
						 
						
							
							
								
								When we see a difference in current state, actually use state conflict resolution algorithm  
							
							 
							
							
							
						 
						
							2015-02-13 14:20:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								76935078d1 
								
							
								 
							
						 
						
							
							
								
								Remove more debug logging  
							
							 
							
							
							
						 
						
							2015-02-11 16:51:22 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed877d6585 
								
							
								 
							
						 
						
							
							
								
								Remove debug logging  
							
							 
							
							
							
						 
						
							2015-02-11 16:50:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ddb816cf60 
								
							
								 
							
						 
						
							
							
								
								Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict  
							
							 
							
							
							
						 
						
							2015-02-11 15:44:28 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cc0532a4bf 
								
							
								 
							
						 
						
							
							
								
								Explicitly list the RejectedReasons that we can prove  
							
							 
							
							
							
						 
						
							2015-02-06 15:16:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e890ce223c 
								
							
								 
							
						 
						
							
							
								
								Don't query auth if the only difference is events that were rejected due to auth.  
							
							 
							
							
							
						 
						
							2015-02-06 14:16:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c78b5fb1f1 
								
							
								 
							
						 
						
							
							
								
								Make seen_ids a set  
							
							 
							
							
							
						 
						
							2015-02-06 13:52:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3737329d9b 
								
							
								 
							
						 
						
							
							
								
								Handle the fact the list.remove raises if element doesn't exist  
							
							 
							
							
							
						 
						
							2015-02-06 10:53:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e1515c3e91 
								
							
								 
							
						 
						
							
							
								
								Pass through list of room hosts from room alias query to federation so that it can retry against different room hosts  
							
							 
							
							
							
						 
						
							2015-02-05 13:44:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d45e2302ed 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'signature_failures' of github.com:matrix-org/synapse into federation_client_retries  
							
							 
							
							
							
						 
						
							2015-02-04 16:30:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae46f10fc5 
								
							
								 
							
						 
						
							
							
								
								Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations  
							
							 
							
							
							
						 
						
							2015-02-04 16:28:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								650e32d455 
								
							
								 
							
						 
						
							
							
								
								Change context.auth_events to what the auth_events would be bases on context.current_state, rather than based on the auth_events from the event.  
							
							 
							
							
							
						 
						
							2015-02-04 14:06:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c0462dbf15 
								
							
								 
							
						 
						
							
							
								
								Rearrange persist_event so that do all the queries that need to be done before returning early if we have already persisted that event.  
							
							 
							
							
							
						 
						
							2015-02-04 10:16:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7dd1c5c542 
								
							
								 
							
						 
						
							
							
								
								Neaten the handling of state and auth_chain up a bit  
							
							 
							
							
							
						 
						
							2015-02-03 16:12:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6efd4d1649 
								
							
								 
							
						 
						
							
							
								
								Don't completely die if get auth_chain or querying auth_chain requests fail  
							
							 
							
							
							
						 
						
							2015-02-03 13:57:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								77a076bd25 
								
							
								 
							
						 
						
							
							
								
								Set combinations is | and not +  
							
							 
							
							
							
						 
						
							2015-02-03 13:35:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fed29251d7 
								
							
								 
							
						 
						
							
							
								
								Spelling  
							
							 
							
							
							
						 
						
							2015-02-03 13:23:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								06c34bfbae 
								
							
								 
							
						 
						
							
							
								
								Give exception better message  
							
							 
							
							
							
						 
						
							2015-02-03 11:23:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ff2273b30 
								
							
								 
							
						 
						
							
							
								
								Add FIXME note.  
							
							 
							
							
							
						 
						
							2015-02-03 11:23:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								51969f9e5f 
								
							
								 
							
						 
						
							
							
								
								Return rejected events if asked for it over federation.  
							
							 
							
							
							
						 
						
							2015-02-03 10:40:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e7ca813dd4 
								
							
								 
							
						 
						
							
							
								
								Try to ensure we don't persist an event we have already persisted. In persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.  
							
							 
							
							
							
						 
						
							2015-02-03 10:39:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4c0da49d7c 
								
							
								 
							
						 
						
							
							
								
								Resign events when we return them via /query_auth/  
							
							 
							
							
							
						 
						
							2015-01-30 22:53:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2cd29dbdd9 
								
							
								 
							
						 
						
							
							
								
								Fix bug where accepting invite over federation didn't work. Add logging.  
							
							 
							
							
							
						 
						
							2015-01-30 16:51:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b724a809c4 
								
							
								 
							
						 
						
							
							
								
								Only auth_events with event if event in event.auth_events  
							
							 
							
							
							
						 
						
							2015-01-30 15:57:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a70a801184 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we superfluously asked for current state. Change API of /query_auth/ so that we don't duplicate events in the response.  
							
							 
							
							
							
						 
						
							2015-01-30 13:34:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0c2d245fdf 
								
							
								 
							
						 
						
							
							
								
								Update the current state of an event if we update auth events.  
							
							 
							
							
							
						 
						
							2015-01-30 11:08:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c1d860870b 
								
							
								 
							
						 
						
							
							
								
								Fix regression where we no longer correctly handled the case of gaps in our event graph  
							
							 
							
							
							
						 
						
							2015-01-30 10:48:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								78015948a7 
								
							
								 
							
						 
						
							
							
								
								Initial implementation of auth conflict resolution  
							
							 
							
							
							
						 
						
							2015-01-29 16:52:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0ef5bfd6a9 
								
							
								 
							
						 
						
							
							
								
								Start implementing auth conflict res  
							
							 
							
							
							
						 
						
							2015-01-28 16:16:53 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5759bec43c 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5fed042640 
								
							
								 
							
						 
						
							
							
								
								Finish renaming "context" to "room_id" in federation codebase  
							
							 
							
							
							
						 
						
							2015-01-16 19:01:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								333836ff92 
								
							
								 
							
						 
						
							
							
								
								PEP8 and pyflakes warnings  
							
							 
							
							
							
						 
						
							2015-01-07 16:18:12 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								9cb4f75d53 
								
							
								 
							
						 
						
							
							
								
								SYN-154: Better error messages when joining an unknown room by ID.  
							
							 
							
							... 
							
							
							
							The simple fix doesn't work here because room creation also involves
unknown room IDs. The check relies on the presence of m.room.create for
rooms being created, whereas bogus room IDs have no state events at all. 
							
						 
						
							2015-01-07 15:21:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							 
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								041ac476a5 
								
							
								 
							
						 
						
							
							
								
								Supply auth_chain along with current state in '/state/', fetch auth events from a remote server if we are missing some of them  
							
							 
							
							
							
						 
						
							2014-12-18 18:47:13 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								dea5d4b03b 
								
							
								 
							
						 
						
							
							
								
								Don't yield on sending the event accross federation.  
							
							 
							
							
							
						 
						
							2014-12-18 11:29:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								21cab3a7ec 
								
							
								 
							
						 
						
							
							
								
								Fix where we pulled in event.state_events from hotfixes branch  
							
							 
							
							
							
						 
						
							2014-12-16 19:16:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2215faa361 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'hotfixes-v0.5.4a' of github.com:matrix-org/synapse into release-v0.6.0  
							
							 
							
							
							
						 
						
							2014-12-16 19:11:13 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3defd5b3ee 
								
							
								 
							
						 
						
							
							
								
								Add FIXME  
							
							 
							
							
							
						 
						
							2014-12-16 19:07:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								96779d2490 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we did not send the full auth chain to people that joined over federation  
							
							 
							
							
							
						 
						
							2014-12-16 18:57:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2d7716d4d0 
								
							
								 
							
						 
						
							
							
								
								Make error messages slightly more helpful  
							
							 
							
							
							
						 
						
							2014-12-16 18:41:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c3eae8a88c 
								
							
								 
							
						 
						
							
							
								
								Construct the EventContext in the state handler rather than constructing one and then immediately calling state_handler.annotate_context_with_state  
							
							 
							
							
							
						 
						
							2014-12-16 15:59:17 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3c7857e49b 
								
							
								 
							
						 
						
							
							
								
								clean up coding style a bit  
							
							 
							
							
							
						 
						
							2014-12-16 15:24:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3c77d13aa5 
								
							
								 
							
						 
						
							
							
								
								Kill off synapse.api.events.*  
							
							 
							
							
							
						 
						
							2014-12-16 11:29:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6a1da99fab 
								
							
								 
							
						 
						
							
							
								
								Add fixme to raising of AuthError in federation land  
							
							 
							
							
							
						 
						
							2014-12-16 09:35:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d3eb12c7b8 
								
							
								 
							
						 
						
							
							
								
								Fix federation test  
							
							 
							
							
							
						 
						
							2014-12-11 17:01:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0b04369238 
								
							
								 
							
						 
						
							
							
								
								Fix public room joining by making sure replaces_state never points to itself.  
							
							 
							
							
							
						 
						
							2014-12-11 15:56:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1d2a0040cf 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we clobbered old state group values  
							
							 
							
							
							
						 
						
							2014-12-10 15:55:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aae8a37e63 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							
							
						 
						
							2014-12-10 13:18:40 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02db1fd2e7 
								
							
								 
							
						 
						
							
							
								
								Fix AttributeError  
							
							 
							
							
							
						 
						
							2014-12-10 12:00:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								95aa903ffa 
								
							
								 
							
						 
						
							
							
								
								Try and figure out how and why signatures are being changed.  
							
							 
							
							
							
						 
						
							2014-12-10 11:37:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5eca288d28 
								
							
								 
							
						 
						
							
							
								
								Fix joining from an invite  
							
							 
							
							
							
						 
						
							2014-12-09 14:47:27 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8529fba02d 
								
							
								 
							
						 
						
							
							
								
								fix a million stupid bugs and make it actually work  
							
							 
							
							
							
						 
						
							2014-12-08 19:34:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								609c31e8df 
								
							
								 
							
						 
						
							
							
								
								More bug fixes  
							
							 
							
							
							
						 
						
							2014-12-08 17:50:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d044121168 
								
							
								 
							
						 
						
							
							
								
								Various typos and bug fixes.  
							
							 
							
							
							
						 
						
							2014-12-08 09:08:26 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								9c43b258ec 
								
							
								 
							
						 
						
							
							
								
								actually reset retry schedule if we can successfuly talk to it  
							
							 
							
							
							
						 
						
							2014-12-08 00:17:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6630e1b579 
								
							
								 
							
						 
						
							
							
								
								Start making more things use EventContext rather than event.*  
							
							 
							
							
							
						 
						
							2014-12-05 16:20:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c31dba86ec 
								
							
								 
							
						 
						
							
							
								
								Convert rest and handlers to use new event structure  
							
							 
							
							
							
						 
						
							2014-12-04 15:50:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5d7c9ab789 
								
							
								 
							
						 
						
							
							
								
								Begin converting things to use the new Event structure  
							
							 
							
							
							
						 
						
							2014-12-04 11:27:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								027542e2e5 
								
							
								 
							
						 
						
							
							
								
								Fix bugs when joining a remote room that has dodgy event graphs. This should also fix the number of times a HS will trigger a GET /event/  
							
							 
							
							
							
						 
						
							2014-11-27 16:02:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0294fba042 
								
							
								 
							
						 
						
							
							
								
								on_receive_pdu takes more args  
							
							 
							
							
							
						 
						
							2014-11-27 14:46:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07699b5871 
								
							
								 
							
						 
						
							
							
								
								Change the way we get missing auth and state events  
							
							 
							
							
							
						 
						
							2014-11-27 14:31:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b8849c8cbf 
								
							
								 
							
						 
						
							
							
								
								Re-sign events when we return them via federation as a temporary hack to work around the problem where we reconstruct events differently than when they were signed  
							
							 
							
							
							
						 
						
							2014-11-27 13:53:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								858e87ab0d 
								
							
								 
							
						 
						
							
							
								
								Add a workaround for bug where some initial join events don't reference creation events in their auth_events  
							
							 
							
							
							
						 
						
							2014-11-26 16:29:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6c485c282d 
								
							
								 
							
						 
						
							
							
								
								Catch exceptions when trying to add an entry to rooms tables  
							
							 
							
							
							
						 
						
							2014-11-26 16:06:20 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3598c11c8d 
								
							
								 
							
						 
						
							
							
								
								Correctly handle the case where we get an event for an unknown room, which turns out we are actually in  
							
							 
							
							
							
						 
						
							2014-11-26 10:41:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								64fc859dac 
								
							
								 
							
						 
						
							
							
								
								Fix bugs in invite/join dances.  
							
							 
							
							... 
							
							
							
							We now do more implement more of the auth on the events so that we
don't reject valid events. 
							
						 
						
							2014-11-25 17:59:49 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4bd0ab76c6 
								
							
								 
							
						 
						
							
							
								
								We don't always want to Auth get_persisted_pdu  
							
							 
							
							
							
						 
						
							2014-11-24 12:56:17 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								db9ce032a4 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 codestyle warnings  
							
							 
							
							
							
						 
						
							2014-11-20 17:26:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								32090aee16 
								
							
								 
							
						 
						
							
							
								
								Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts  
							
							 
							
							
							
						 
						
							2014-11-20 16:24:00 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								2eaf689f71 
								
							
								 
							
						 
						
							
							
								
								These lines aren't doing anything  
							
							 
							
							
							
						 
						
							2014-11-17 10:41:35 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								cb4b6c844a 
								
							
								 
							
						 
						
							
							
								
								Merge PDUs and Events into one object  
							
							 
							
							
							
						 
						
							2014-11-14 21:25:02 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8c2b5ea7c4 
								
							
								 
							
						 
						
							
							
								
								Fix PDU and event signatures  
							
							 
							
							
							
						 
						
							2014-11-14 19:11:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								de1ec90133 
								
							
								 
							
						 
						
							
							
								
								Validate signatures on incoming events  
							
							 
							
							
							
						 
						
							2014-11-14 19:11:04 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b2596c660b 
								
							
								 
							
						 
						
							
							
								
								Add a few more comments to the federation handler  
							
							 
							
							
							
						 
						
							2014-11-12 16:20:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6fea478d2e 
								
							
								 
							
						 
						
							
							
								
								Fix bugs with invites/joins across federatiom.  
							
							 
							
							... 
							
							
							
							Both in terms of auth and not trying to fetch missing PDUs for invites,
joins etc. 
							
						 
						
							2014-11-12 11:24:11 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3db2c0d43e 
								
							
								 
							
						 
						
							
							
								
								Rename annotate_state_groups to annotate_event_with_state  
							
							 
							
							
							
						 
						
							2014-11-11 16:58:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5ff0bfb81d 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we /always/ created a new state group  
							
							 
							
							
							
						 
						
							2014-11-11 14:16:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5d439b127b 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2014-11-10 13:46:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								003668cfaa 
								
							
								 
							
						 
						
							
							
								
								Add auth to the various server-server APIs  
							
							 
							
							
							
						 
						
							2014-11-10 13:37:24 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6447db063a 
								
							
								 
							
						 
						
							
							
								
								Fix backfill to work. Add auth to backfill request  
							
							 
							
							
							
						 
						
							2014-11-10 11:59:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65f846ade0 
								
							
								 
							
						 
						
							
							
								
								Notify users about invites.  
							
							 
							
							
							
						 
						
							2014-11-10 11:15:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07286a73b1 
								
							
								 
							
						 
						
							
							
								
								Use current state to get room hosts, rather than querying the database  
							
							 
							
							
							
						 
						
							2014-11-07 16:03:31 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02c3b1c9e2 
								
							
								 
							
						 
						
							
							
								
								Add '/event_auth/' federation api  
							
							 
							
							
							
						 
						
							2014-11-07 15:35:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d2fb2b8095 
								
							
								 
							
						 
						
							
							
								
								Implement invite part of invite join dance  
							
							 
							
							
							
						 
						
							2014-11-07 13:41:00 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3b4dec442d 
								
							
								 
							
						 
						
							
							
								
								Return auth chain when handling send_join  
							
							 
							
							
							
						 
						
							2014-11-07 11:22:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								49948d72f3 
								
							
								 
							
						 
						
							
							
								
								Fix joining over federation  
							
							 
							
							
							
						 
						
							2014-11-07 10:53:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								233969bb58 
								
							
								 
							
						 
						
							
							
								
								Update to use replaces_state rather than prev_state  
							
							 
							
							
							
						 
						
							2014-11-06 15:25:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4317c8e583 
								
							
								 
							
						 
						
							
							
								
								Implement new replace_state and changed prev_state  
							
							 
							
							... 
							
							
							
							`prev_state` is now a list of previous state ids, similiar to
prev_events. `replace_state` now points to what we think was replaced. 
							
						 
						
							2014-11-06 15:10:55 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								96c001e668 
								
							
								 
							
						 
						
							
							
								
								Fix auth checks to all use the given old_event_state  
							
							 
							
							
							
						 
						
							2014-11-05 11:07:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								da4a09f977 
								
							
								 
							
						 
						
							
							
								
								Don't bother locking  
							
							 
							
							
							
						 
						
							2014-11-04 16:51:23 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2a49f177fe 
								
							
								 
							
						 
						
							
							
								
								On AuthError, raise a FederationError  
							
							 
							
							
							
						 
						
							2014-11-04 15:10:43 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aa76bf39ab 
								
							
								 
							
						 
						
							
							
								
								Remove unused imports  
							
							 
							
							
							
						 
						
							2014-11-04 14:14:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ad6eacb3e9 
								
							
								 
							
						 
						
							
							
								
								Rename PDU fields to match that of events.  
							
							 
							
							
							
						 
						
							2014-11-03 13:06:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								21fe249d62 
								
							
								 
							
						 
						
							
							
								
								Actually don't store any PDUs  
							
							 
							
							
							
						 
						
							2014-10-31 10:47:34 +00:00