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 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								f2de2d644a
								
							
								
							
						 | 
						
							
							
								
								Move the impl of backfill to use events.
							
							
							
							
							
						 | 
						
							2014-10-31 09:59:02 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								12ce441e67
								
							
								
							
						 | 
						
							
							
								
								Convert event ids to be of the form :example.com
							
							
							
							
							
						 | 
						
							2014-10-30 17:00:11 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								da511334d2
								
							
								
							
						 | 
						
							
							
								
								Make federation return the old current state, so that we can use it to do auth
							
							
							
							
							
						 | 
						
							2014-10-30 11:53:35 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e7858b6d7e
								
							
								
							
						 | 
						
							
							
								
								Start filling out and using new events tables
							
							
							
							
							
						 | 
						
							2014-10-29 16:59:24 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								bf8cdda2f5
								
							
								
							
						 | 
						
							
							
								
								It doesn't want a dict
							
							
							
							
							
						 | 
						
							2014-10-17 20:10:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b3b1961496
								
							
								
							
						 | 
						
							
							
								
								Fix bug where people could join private rooms
							
							
							
							
							
						 | 
						
							2014-10-17 19:37:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5ffe5ab43f
								
							
								
							
						 | 
						
							
							
								
								Use state groups to get current state. Make join dance actually work.
							
							
							
							
							
						 | 
						
							2014-10-17 18:56:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								f71627567b
								
							
								
							
						 | 
						
							
							
								
								Finish implementing the new join dance.
							
							
							
							
							
						 | 
						
							2014-10-17 15:04:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1116f5330e
								
							
								
							
						 | 
						
							
							
								
								Start implementing the invite/join dance. Continue moving auth to use event.state_events
							
							
							
							
							
						 | 
						
							2014-10-16 16:56:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e7bc1291a0
								
							
								
							
						 | 
						
							
							
								
								Begin making auth use event.old_state_events
							
							
							
							
							
						 | 
						
							2014-10-15 16:06:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1ca51c8586
								
							
								
							
						 | 
						
							
							
								
								SYN-46: An invite received from fedearation didn't wake up the event stream for the invited user.
							
							
							
							
							
						 | 
						
							2014-09-25 13:01:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								59516a8bb1
								
							
								
							
						 | 
						
							
							
								
								Correctly handle receiving 'missing' Pdus from federation, rather than just discarding them.
							
							
							
							
							
						 | 
						
							2014-09-15 16:40:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e639a3516d
								
							
								
							
						 | 
						
							
							
								
								Improve logging in federation handler.
							
							
							
							
							
						 | 
						
							2014-09-15 16:24:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								bcaea74352
								
							
								
							
						 | 
						
							
							
								
								Error code must be an integer
							
							
							
							
							
						 | 
						
							2014-09-03 19:19:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								c9d1ee24ca
								
							
								
							
						 | 
						
							
							
								
								Import SynapseError
							
							
							
							
							
						 | 
						
							2014-09-03 19:15:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9b18151104
								
							
								
							
						 | 
						
							
							
								
								Handle timeouts slightly nicer.
							
							
							
							
							
						 | 
						
							2014-09-03 19:13:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5b645f9d34
								
							
								
							
						 | 
						
							
							
								
								Don't do auth for change_membership in federation handler, it doesn't work and federation doesn't do auth in general either. Add a hacky timeout when trying to join a remote room.
							
							
							
							
							
						 | 
						
							2014-09-03 19:08:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								8a7c1d6a00
								
							
								
							
						 | 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
							
							
							
							
							
						 | 
						
							2014-09-03 17:31:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								722c19d033
								
							
								
							
						 | 
						
							
							
								
								Fix FederationHandler to event.origin
							
							
							
							
							
						 | 
						
							2014-08-28 18:32:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7b079a26a5
								
							
								
							
						 | 
						
							
							
								
								Remove get_state_for_room function from federation handler
							
							
							
							
							
						 | 
						
							2014-08-28 15:32:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7acede1e42
								
							
								
							
						 | 
						
							
							
								
								Fix pyflakes warnings
							
							
							
							
							
						 | 
						
							2014-08-28 13:51:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								15ab5f5ad8
								
							
								
							
						 | 
						
							
							
								
								Merge backfill_ and backfill in federation handler
							
							
							
							
							
						 | 
						
							2014-08-28 13:45:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								2aeaa7b77c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into storage_transactions
							
							
							
							
							
							
							
							Conflicts:
	synapse/handlers/room.py
	synapse/storage/stream.py 
							
						 | 
						
							2014-08-27 17:15:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b30358f439
								
							
								
							
						 | 
						
							
							
								
								add _get_room_member, fix datastore methods
							
							
							
							
							
						 | 
						
							2014-08-27 16:51:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								8af5e360d6
								
							
								
							
						 | 
						
							
							
								
								Remove store_id from notifier.on_new_room_event calls.
							
							
							
							
							
						 | 
						
							2014-08-27 16:23:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a03c7f27a8
								
							
								
							
						 | 
						
							
							
								
								Fill out prev_events before calling persist_event
							
							
							
							
							
						 | 
						
							2014-08-27 14:32:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d2798de660
								
							
								
							
						 | 
						
							
							
								
								Fold federation/handler into handlers/federation
							
							
							
							
							
						 | 
						
							2014-08-26 19:49:42 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a29d12a18a
								
							
								
							
						 | 
						
							
							
								
								Use state_key rather than target_user_id
							
							
							
							
							
						 | 
						
							2014-08-26 16:13:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								ac21dfff6d
								
							
								
							
						 | 
						
							
							
								
								Fix pyflakes errors
							
							
							
							
							
						 | 
						
							2014-08-26 16:02:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								47c3a089c5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
							
							
							
							
							
						 | 
						
							2014-08-26 09:26:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								cab3095803
								
							
								
							
						 | 
						
							
							
								
								Removed member list servlet: now using generic state paths.
							
							
							
							
							
						 | 
						
							2014-08-26 09:26:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1587ea26fe
								
							
								
							
						 | 
						
							
							
								
								Wait for getting a Join in response to an invite/join dance.
							
							
							
							
							
						 | 
						
							2014-08-21 14:38:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								5ef0948eaa
								
							
								
							
						 | 
						
							
							
								
								Better handle the edge cases of trying to remote join rooms
							
							
							
							
							
						 | 
						
							2014-08-20 14:42:47 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								234128586b
								
							
								
							
						 | 
						
							
							
								
								Print out stacktrace when we failed to persist event.
							
							
							
							
							
						 | 
						
							2014-08-19 14:30:28 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								75b6d982a0
								
							
								
							
						 | 
						
							
							
								
								Add a 'backfill room' button
							
							
							
							
							
						 | 
						
							2014-08-19 14:20:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								f98e6380f1
								
							
								
							
						 | 
						
							
							
								
								add in whitespace after copyright statements to improve legibility
							
							
							
							
							
						 | 
						
							2014-08-13 03:14:34 +01:00 | 
						
					
				
					
						
							
							
								 
								matrix.org
							
						 | 
						
							
							
							
							
								
							
								4f475c7697
								
							
								
							
						 | 
						
							
							
								
								Reference Matrix Home Server
							
							
							
							
							
						 | 
						
							2014-08-12 15:10:52 +01:00 |