Mark Haines
							
						 
						
							 
							
							
							
								
							
								fb46937413 
								
							
								 
							
						 
						
							
							
								
								Support clients supplying older tokens, fix short poll test  
							
							 
							
							
							
						 
						
							2015-10-30 16:38:35 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f69a5c9134 
								
							
								 
							
						 
						
							
							
								
								Fix a 500 error resulting from empty room_ids  
							
							 
							
							... 
							
							
							
							POST /_matrix/client/api/v1/rooms//send/a.b.c gave a 500 error, because we
assumed that rooms always had at least one character. 
							
						 
						
							2015-10-26 18:44:03 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b0ac0a9438 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #319  from matrix-org/erikj/filter_refactor  
							
							 
							
							... 
							
							
							
							Refactor api.filtering to have a Filter API 
							
						 
						
							2015-10-22 13:17:10 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								87da71bace 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #314  from matrix-org/paul/event-redaction  
							
							 
							
							... 
							
							
							
							Add some unit tests of prune_events() 
							
						 
						
							2015-10-22 11:07:20 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								45cd2b0233 
								
							
								 
							
						 
						
							
							
								
								Refactor api.filtering to have a Filter API  
							
							 
							
							
							
						 
						
							2015-10-20 15:33:25 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f510586372 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2015-10-20 12:00:22 +01: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  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								9ed784098a 
								
							
								 
							
						 
						
							
							
								
								Invoke EventBuilder directly instead of going via the EventBuilderFactory  
							
							 
							
							
							
						 
						
							2015-10-19 17:42:34 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								531e3aa75e 
								
							
								 
							
						 
						
							
							
								
								Capture __init__.py  
							
							 
							
							
							
						 
						
							2015-10-19 17:37:35 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								a8795c9644 
								
							
								 
							
						 
						
							
							
								
								Use assertIn() instead of assertTrue on the 'in' operator  
							
							 
							
							
							
						 
						
							2015-10-19 15:24:49 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								07b58a431f 
								
							
								 
							
						 
						
							
							
								
								Another signing test vector using an 'm.room.message' with content, so that the implementation will have to redact it  
							
							 
							
							
							
						 
						
							2015-10-19 15:00:52 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								0aab34004b 
								
							
								 
							
						 
						
							
							
								
								Initial minimial hack at a test of event hashing and signing  
							
							 
							
							
							
						 
						
							2015-10-19 14:40:15 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								aff4d850bd 
								
							
								 
							
						 
						
							
							
								
								Add some unit tests of prune_events()  
							
							 
							
							
							
						 
						
							2015-10-16 19:56:46 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8897781558 
								
							
								 
							
						 
						
							
							
								
								update filtering tests  
							
							 
							
							
							
						 
						
							2015-10-13 14:13:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								17c80c8a3d 
								
							
								 
							
						 
						
							
							
								
								rename schema_prepare to prepare_database  
							
							 
							
							
							
						 
						
							2015-10-13 13:56:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ec398af41c 
								
							
								 
							
						 
						
							
							
								
								Expose error more nicely  
							
							 
							
							
							
						 
						
							2015-10-13 11:43:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d5e081c7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							 
							
							
							
						 
						
							2015-10-02 10:33:49 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1ee3d26432 
								
							
								 
							
						 
						
							
							
								
								synapse/storage/_base.py:_simple_selectupdate_one was unused  
							
							 
							
							
							
						 
						
							2015-09-23 10:30:03 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								bb4dddd6c4 
								
							
								 
							
						 
						
							
							
								
								Move NullSource out of synapse and into tests since it is only used by the tests  
							
							 
							
							
							
						 
						
							2015-09-22 18:33:34 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								7213588083 
								
							
								 
							
						 
						
							
							
								
								Implement configurable stats reporting  
							
							 
							
							... 
							
							
							
							SYN-287
This requires that HS owners either opt in or out of stats reporting.
When --generate-config is passed, --report-stats must be specified
If an already-generated config is used, and doesn't have the
report_stats key, it is requested to be set. 
							
						 
						
							2015-09-22 12:57:40 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ee2d722f0f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #276  from matrix-org/markjh/history_for_rooms_that_have_been_left  
							
							 
							
							... 
							
							
							
							SPEC-216: Allow users to view the history of rooms that they have left. 
							
						 
						
							2015-09-21 14:38:13 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								728d07c8c1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #256  from matrix-org/auth  
							
							 
							
							... 
							
							
							
							Attempt to validate macaroons 
							
						 
						
							2015-09-14 18:09:33 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e2054ce21a 
								
							
								 
							
						 
						
							
							
								
								Allow users to GET individual state events for rooms that they have left  
							
							 
							
							
							
						 
						
							2015-09-10 15:06:47 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								bc8b25eb56 
								
							
								 
							
						 
						
							
							
								
								Allow users that have left the room to view the member list from the point they left  
							
							 
							
							
							
						 
						
							2015-09-09 15:42:16 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								187320b019 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/check_room_exists' into erikj/unfederatable  
							
							 
							
							
							
						 
						
							2015-09-01 15:58:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b345853918 
								
							
								 
							
						 
						
							
							
								
								Check against sender rather than event_id  
							
							 
							
							
							
						 
						
							2015-09-01 15:57:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								00149c063b 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2015-09-01 15:42:03 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e255c2c32f 
								
							
								 
							
						 
						
							
							
								
								s/user_id/user/g for consistency  
							
							 
							
							
							
						 
						
							2015-09-01 12:41:16 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								3063383547 
								
							
								 
							
						 
						
							
							
								
								Swap out bcrypt for md5 in tests  
							
							 
							
							... 
							
							
							
							This reduces our ~8 second sequential test time down to ~7 seconds 
							
						 
						
							2015-08-26 15:59:32 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								81450fded8 
								
							
								 
							
						 
						
							
							
								
								Turn TODO into thing which actually will fail  
							
							 
							
							
							
						 
						
							2015-08-26 13:56:01 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								6a4b650d8a 
								
							
								 
							
						 
						
							
							
								
								Attempt to validate macaroons  
							
							 
							
							... 
							
							
							
							A couple of weird caveats:
 * If we can't validate your macaroon, we fall back to checking that
   your access token is in the DB, and ignoring the failure
 * Even if we can validate your macaroon, we still have to hit the DB to
   get the access token ID, which we pretend is a device ID all over the
   codebase.
This mostly adds the interesting code, and points out the two pieces we
need to delete (and necessary conditions) in order to fix the above
caveats. 
							
						 
						
							2015-08-26 13:22:23 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								a9d8bd95e7 
								
							
								 
							
						 
						
							
							
								
								Stop looking up "admin", which we never read  
							
							 
							
							
							
						 
						
							2015-08-25 16:29:39 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								a0b181bd17 
								
							
								 
							
						 
						
							
							
								
								Remove completely unused concepts from codebase  
							
							 
							
							... 
							
							
							
							Removes device_id and ClientInfo
device_id is never actually written, and the matrix.org DB has no
non-null entries for it. Right now, it's just cluttering up code.
This doesn't remove the columns from the database, because that's
fiddly. 
							
						 
						
							2015-08-25 16:23:06 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e8cf77fa49 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into refresh  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/rest/client/v1/login.py 
							
						 
						
							2015-08-20 16:25:40 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								cecbd636e9 
								
							
								 
							
						 
						
							
							
								
								/tokenrefresh POST endpoint  
							
							 
							
							... 
							
							
							
							This allows refresh tokens to be exchanged for (access_token,
refresh_token).
It also starts issuing them on login, though no clients currently
interpret them. 
							
						 
						
							2015-08-20 16:21:35 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								13a6517d89 
								
							
								 
							
						 
						
							
							
								
								s/by_token/by_access_token/g  
							
							 
							
							... 
							
							
							
							We're about to have two kinds of token, access and refresh 
							
						 
						
							2015-08-20 16:01:29 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								617501dd2a 
								
							
								 
							
						 
						
							
							
								
								Move token generation to auth handler  
							
							 
							
							... 
							
							
							
							I prefer the auth handler to worry about all auth, and register to call
into it as needed, than to smatter auth logic between the two. 
							
						 
						
							2015-08-20 11:35:56 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a0b8e5f2fe 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #211  from matrix-org/email_in_use  
							
							 
							
							... 
							
							
							
							Changes for unique emails 
							
						 
						
							2015-08-20 10:04:04 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								70e265e695 
								
							
								 
							
						 
						
							
							
								
								Re-add whitespace around caveat operators  
							
							 
							
							
							
						 
						
							2015-08-19 14:30:31 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ce832c38d4 
								
							
								 
							
						 
						
							
							
								
								Remove padding space around caveat operators  
							
							 
							
							
							
						 
						
							2015-08-18 17:39:26 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								42e858daeb 
								
							
								 
							
						 
						
							
							
								
								Fix units in test  
							
							 
							
							... 
							
							
							
							I made the non-test seconds instead of ms, but not the test 
							
						 
						
							2015-08-18 17:38:37 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								3e6fdfda00 
								
							
								 
							
						 
						
							
							
								
								Fix some formatting to use tuples  
							
							 
							
							
							
						 
						
							2015-08-18 15:18:50 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1469141023 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into auth  
							
							 
							
							
							
						 
						
							2015-08-18 14:43:44 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2d3462714e 
								
							
								 
							
						 
						
							
							
								
								Issue macaroons as opaque auth tokens  
							
							 
							
							... 
							
							
							
							This just replaces random bytes with macaroons. The macaroons are not
inspected by the client or server.
In particular, they claim to have an expiry time, but nothing verifies
that they have not expired.
Follow-up commits will actually enforce the expiration, and allow for
token refresh.
See https://bit.ly/matrix-auth  for more information 
							
						 
						
							2015-08-18 14:22:02 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d7451e0f22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache  
							
							 
							
							
							
						 
						
							2015-08-12 10:30:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2df8dd9b37 
								
							
								 
							
						 
						
							
							
								
								Move all the caches into their own package, synapse.util.caches  
							
							 
							
							
							
						 
						
							2015-08-11 18:00:59 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								4ff0228c25 
								
							
								 
							
						 
						
							
							
								
								Remove call to recently removed function in mock  
							
							 
							
							
							
						 
						
							2015-08-11 16:56:30 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								dcd5983fe4 
								
							
								 
							
						 
						
							
							
								
								Remove call to recently removed function in mock  
							
							 
							
							
							
						 
						
							2015-08-11 16:54:06 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								20addfa358 
								
							
								 
							
						 
						
							
							
								
								Change Cache to not use *args in its interface  
							
							 
							
							
							
						 
						
							2015-08-07 18:32:47 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b8e386db59 
								
							
								 
							
						 
						
							
							
								
								Change Cache to not use *args in its interface  
							
							 
							
							
							
						 
						
							2015-08-07 11:52:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f596ff402e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache  
							
							 
							
							
							
						 
						
							2015-08-06 13:37:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2efb93af52 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds  
							
							 
							
							
							
						 
						
							2015-08-06 13:35:28 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7eea3e356f 
								
							
								 
							
						 
						
							
							
								
								Make @cached cache deferreds rather than the deferreds' values  
							
							 
							
							
							
						 
						
							2015-08-06 13:33:34 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07507643cb 
								
							
								 
							
						 
						
							
							
								
								Use dictionary cache to do group -> state fetching  
							
							 
							
							
							
						 
						
							2015-08-05 15:11:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c67ba143fa 
								
							
								 
							
						 
						
							
							
								
								Move DictionaryCache  
							
							 
							
							
							
						 
						
							2015-08-04 15:58:28 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e7768e77f5 
								
							
								 
							
						 
						
							
							
								
								Add basic dictionary cache  
							
							 
							
							
							
						 
						
							2015-08-04 15:56:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								07ad03d5df 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2015-08-04 15:18:40 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								11b0a34074 
								
							
								 
							
						 
						
							
							
								
								Use the same reg paths as register v1 for ASes.  
							
							 
							
							... 
							
							
							
							Namely this means using registration_handler.appservice_register. 
							
						 
						
							2015-07-29 10:00:54 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								a4d62ba36a 
								
							
								 
							
						 
						
							
							
								
								Fix v2_alpha registration. Add unit tests.  
							
							 
							
							... 
							
							
							
							V2 Registration forced everyone (including ASes) to create a password for a
user, when ASes should be able to omit passwords. Also unbreak AS registration
in general which checked too early if the given username was claimed by an AS;
it was checked before knowing if the AS was the one doing the registration! Add
unit tests for AS reg, user reg and disabled_registration flag. 
							
						 
						
							2015-07-28 17:34:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f0dd6d4cbd 
								
							
								 
							
						 
						
							
							
								
								Fix test.  
							
							 
							
							
							
						 
						
							2015-07-07 16:18:36 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bd1236c0ee 
								
							
								 
							
						 
						
							
							
								
								Consolidate duplicate code in notifier  
							
							 
							
							
							
						 
						
							2015-07-02 11:46:05 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ddf7979531 
								
							
								 
							
						 
						
							
							
								
								Add receipts_key to StreamToken  
							
							 
							
							
							
						 
						
							2015-07-02 11:45:44 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								d88e20cdb9 
								
							
								 
							
						 
						
							
							
								
								Fix bug where synapse was sending AS user queries incorrectly.  
							
							 
							
							... 
							
							
							
							Bug introduced in 92b20713d7 
which reversed the comparison when checking if a user existed
in the users table. Added UTs to prevent this happening again. 
							
						 
						
							2015-06-17 17:26:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								261ccd7f5f 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2015-06-12 17:17:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3bbd0d0e09 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #180  from matrix-org/erikj/prev_state_context  
							
							 
							
							... 
							
							
							
							Don't needlessly compute prev_state 
							
						 
						
							2015-06-03 17:20:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9dda396baa 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #179  from matrix-org/erikj/state_group_outliers  
							
							 
							
							... 
							
							
							
							Don't compute EventContext for outliers. 
							
						 
						
							2015-06-03 17:20:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								55bf90b9e4 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute prev_state  
							
							 
							
							
							
						 
						
							2015-06-03 16:44:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1c3d844e73 
								
							
								 
							
						 
						
							
							
								
								Don't needlessly compute context  
							
							 
							
							
							
						 
						
							2015-06-03 16:41:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d8866d7277 
								
							
								 
							
						 
						
							
							
								
								Caches should be bound to instances.  
							
							 
							
							... 
							
							
							
							Before, caches were global and so different instances of the stores
would share caches. This caused problems in the unit tests. 
							
						 
						
							2015-06-03 14:45:17 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								17167898c8 
								
							
								 
							
						 
						
							
							
								
								Fix the presence tests  
							
							 
							
							
							
						 
						
							2015-05-22 16:22:54 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								49a2c10279 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #157  from matrix-org/markjh/presence_performance  
							
							 
							
							... 
							
							
							
							Improve presence performance in loadtest 
							
						 
						
							2015-05-22 16:04:40 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f43544eecc 
								
							
								 
							
						 
						
							
							
								
								Make the appservice use 'users_in_room' rather than get_room_members since it is cached  
							
							 
							
							
							
						 
						
							2015-05-22 11:01:28 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								88f1ea36ce 
								
							
								 
							
						 
						
							
							
								
								Oops, get_rooms_for_user returns a namedtuple, not a room_id  
							
							 
							
							
							
						 
						
							2015-05-21 15:23:58 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a551c5dad7 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #155  from matrix-org/erikj/perf  
							
							 
							
							... 
							
							
							
							Bulk and batch retrieval of events. 
							
						 
						
							2015-05-21 14:54:40 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8eca5bd50a 
								
							
								 
							
						 
						
							
							
								
								Fix the presence tests  
							
							 
							
							
							
						 
						
							2015-05-20 13:22:18 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0b0033c40b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into notifier_performance  
							
							 
							
							
							
						 
						
							2015-05-18 13:50:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								131bdf9bb1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/perf  
							
							 
							
							
							
						 
						
							2015-05-18 10:23:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a2c4f3f150 
								
							
								 
							
						 
						
							
							
								
								Fix daedlock  
							
							 
							
							
							
						 
						
							2015-05-15 10:54:04 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c5d1b4986b 
								
							
								 
							
						 
						
							
							
								
								Remove unused arguments and doc PresenceHandler.push_update_to_clients  
							
							 
							
							
							
						 
						
							2015-05-14 14:59:31 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f1b83d88a3 
								
							
								 
							
						 
						
							
							
								
								Discard unused NotifierUserStreams  
							
							 
							
							
							
						 
						
							2015-05-13 16:54:02 +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
							
						 
						
							 
							
							
							
								
							
								43c2e8deae 
								
							
								 
							
						 
						
							
							
								
								Add support for using executemany  
							
							 
							
							
							
						 
						
							2015-05-05 15:13:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								327ca883ec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into postgres  
							
							 
							
							
							
						 
						
							2015-04-28 13:39:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6f8e2d517e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into postgres  
							
							 
							
							
							
						 
						
							2015-04-27 14:41:40 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6532b6e607 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into csauth  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/http/server.py 
							
						 
						
							2015-04-24 09:37:54 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								e1e5e53127 
								
							
								 
							
						 
						
							
							
								
								Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again  
							
							 
							
							
							
						 
						
							2015-04-23 19:01:37 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								8a785c3006 
								
							
								 
							
						 
						
							
							
								
								Store a list of the presence serial number at which remote users went offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)  
							
							 
							
							
							
						 
						
							2015-04-23 18:40:19 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								cb03fafdf1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into csauth  
							
							 
							
							
							
						 
						
							2015-04-17 13:51:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6ba2e3df4e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into postgres  
							
							 
							
							
							
						 
						
							2015-04-17 11:22:31 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								04c7f3576e 
								
							
								 
							
						 
						
							
							
								
								Various minor fixes to unit-test structure around typing notifications  
							
							 
							
							
							
						 
						
							2015-04-15 23:32:11 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								0268d40281 
								
							
								 
							
						 
						
							
							
								
								Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility  
							
							 
							
							
							
						 
						
							2015-04-15 23:09:35 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								22d7a59306 
								
							
								 
							
						 
						
							
							
								
								Fix tests after commit 9a0579  
							
							 
							
							
							
						 
						
							2015-04-08 16:57:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4fe95094d1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into mysql  
							
							 
							
							
							
						 
						
							2015-04-07 18:05:39 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9236136f3a 
								
							
								 
							
						 
						
							
							
								
								Make work in both Maria and SQLite. Fix tests  
							
							 
							
							
							
						 
						
							2015-04-01 14:12:33 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								9fa8bda099 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services-registration-script  
							
							 
							
							
							
						 
						
							2015-04-01 10:19:17 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								09cbff174a 
								
							
								 
							
						 
						
							
							
								
								Fix thinko whereby events *for the AS specifically* were not passed on.  
							
							 
							
							... 
							
							
							
							This was caused by not explicitly checking the service.sender field. This
has now been fixed and a regression test has been added. 
							
						 
						
							2015-03-31 16:44:45 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								cf1fa59f4b 
								
							
								 
							
						 
						
							
							
								
								Use a sender localpart instead of a user ID.  
							
							 
							
							... 
							
							
							
							Form the user ID at runtime instead, This gives less room for error in AS
config files since they cannot specify the domain of another HS. 
							
						 
						
							2015-03-31 13:48:03 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c217504949 
								
							
								 
							
						 
						
							
							
								
								Edit SQL schema to use string IDs not ints. Use token as ID. Update tests.  
							
							 
							
							
							
						 
						
							2015-03-31 12:07:56 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								b59aa74556 
								
							
								 
							
						 
						
							
							
								
								Fix tests and missing returns on deferreds.  
							
							 
							
							
							
						 
						
							2015-03-31 11:35:45 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								d33ae65efc 
								
							
								 
							
						 
						
							
							
								
								Remove more reg/unreg methods. Read config not database for cache.  
							
							 
							
							
							
						 
						
							2015-03-31 11:00:00 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								4edcbcee3b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services-txn-reliability  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/storage/__init__.py 
							
						 
						
							2015-03-26 10:07:59 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								9ba6487b3f 
								
							
								 
							
						 
						
							
							
								
								Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()  
							
							 
							
							
							
						 
						
							2015-03-25 19:05:34 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								7ab9f91a60 
								
							
								 
							
						 
						
							
							
								
								Unit-test that Cache() key eviction is ordered  
							
							 
							
							
							
						 
						
							2015-03-25 18:50:43 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								ce2766d19c 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2015-03-24 18:56:51 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								438a21c87b 
								
							
								 
							
						 
						
							
							
								
								Don't test exact equality of the list: as long as it has the fields we expect, that's just fine. I added the user_id (as in database pkey) and it broke: no point testing what that comes out as: it's determined by the db.  
							
							 
							
							
							
						 
						
							2015-03-24 18:21:54 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								0f86312c4c 
								
							
								 
							
						 
						
							
							
								
								Pull out the cache logic from the @cached wrapper into its own class we can reuse  
							
							 
							
							
							
						 
						
							2015-03-20 18:25:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7e282a53a5 
								
							
								 
							
						 
						
							
							
								
								Tidy up _simple_... methods  
							
							 
							
							
							
						 
						
							2015-03-20 15:05:10 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								d04fa1f712 
								
							
								 
							
						 
						
							
							
								
								Implement ServiceQueuer with tests.  
							
							 
							
							
							
						 
						
							2015-03-16 14:03:16 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								6279285b2a 
								
							
								 
							
						 
						
							
							
								
								Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests and add stub tests for ServiceQueuer.  
							
							 
							
							
							
						 
						
							2015-03-16 13:15:40 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								835e01fc70 
								
							
								 
							
						 
						
							
							
								
								Minor PR comment tweaks.  
							
							 
							
							
							
						 
						
							2015-03-16 10:16:59 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f9232c7917 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services-txn-reliability  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/storage/appservice.py 
							
						 
						
							2015-03-16 10:09:15 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								c1cdd7954d 
								
							
								 
							
						 
						
							
							
								
								Add an .inc_by() method to CounterMetric; implement DistributionMetric a neater way  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f1fbe3e09f 
								
							
								 
							
						 
						
							
							
								
								Rename TimerMetric to DistributionMetric; as it could count more than just time  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								cbc0406be8 
								
							
								 
							
						 
						
							
							
								
								Export CacheMetric as hits+total, rather than hits+misses, as it's easier to derive hit ratio from that  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								0e847540c3 
								
							
								 
							
						 
						
							
							
								
								Prometheus needs "escaped" label values  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b3a0179d64 
								
							
								 
							
						 
						
							
							
								
								Bugfix to rendering output of vectored TimerMetrics  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f9478e475b 
								
							
								 
							
						 
						
							
							
								
								Rename Metrics' "keys" to "labels"  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								72625f2f4d 
								
							
								 
							
						 
						
							
							
								
								Initial hack at a TimerMetric; for storing counts + duration accumulators  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								23ab0c68c2 
								
							
								 
							
						 
						
							
							
								
								Implement vector CallbackMetrics  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								8664599af7 
								
							
								 
							
						 
						
							
							
								
								Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric component to give the size of the cache  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								d8caa5454d 
								
							
								 
							
						 
						
							
							
								
								Initial attempt at a scalar callback-based metric to give instantaneous snapshot gauges  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								ce8b5769f7 
								
							
								 
							
						 
						
							
							
								
								Create the concept of a cachecounter metric; generating two counters specific to caches  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								e7420a3bef 
								
							
								 
							
						 
						
							
							
								
								Initial tiny attempt at (vectorable) counter metrics  
							
							 
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								b98cd03193 
								
							
								 
							
						 
						
							
							
								
								Use event IDs instead of dumping event content in the txns table.  
							
							 
							
							
							
						 
						
							2015-03-09 17:25:20 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								21fd84dcb8 
								
							
								 
							
						 
						
							
							
								
								Use seconds; start gluing in the AS scheduler into the AS handler.  
							
							 
							
							
							
						 
						
							2015-03-09 17:01:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6d74e46621 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2015-03-09 17:01:11 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0a60bbf4fa 
								
							
								 
							
						 
						
							
							
								
								Finish appservice txn storage impl and tests.  
							
							 
							
							
							
						 
						
							2015-03-09 15:53:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								1ead1caa18 
								
							
								 
							
						 
						
							
							
								
								Implement create_appservice_txn with tests.  
							
							 
							
							
							
						 
						
							2015-03-09 13:54:20 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								1c2dcf762a 
								
							
								 
							
						 
						
							
							
								
								Partially implement txn store methods with tests.  
							
							 
							
							
							
						 
						
							2015-03-09 13:10:31 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								10766f1e93 
								
							
								 
							
						 
						
							
							
								
								Update UTs  
							
							 
							
							
							
						 
						
							2015-03-06 16:17:01 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2602ddc379 
								
							
								 
							
						 
						
							
							
								
								Apply clarity and docstrings  
							
							 
							
							
							
						 
						
							2015-03-06 16:16:14 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0354659f9d 
								
							
								 
							
						 
						
							
							
								
								Finish synapse.appservice.scheduler implementation.  
							
							 
							
							... 
							
							
							
							With tests to assert behaviour. Not hooked up yet. Stub datastore methods
not implemented yet. 
							
						 
						
							2015-03-06 16:09:05 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f260cb72cd 
								
							
								 
							
						 
						
							
							
								
								Flesh out more stub functions.  
							
							 
							
							
							
						 
						
							2015-03-06 15:12:24 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0fbfe1b08a 
								
							
								 
							
						 
						
							
							
								
								Add more tests; fix bugs.  
							
							 
							
							
							
						 
						
							2015-03-06 14:36:52 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								192e228a98 
								
							
								 
							
						 
						
							
							
								
								Start adding some tests  
							
							 
							
							
							
						 
						
							2015-03-06 11:50:27 +00:00  
						
					 
				
					
						
							
							
								 
								Kegsay
							
						 
						
							 
							
							
							
								
							
								8ad024ea80 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #93  from matrix-org/application-services-exclusive  
							
							 
							
							... 
							
							
							
							Application services exclusive flag support 
							
						 
						
							2015-03-02 14:56:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0a036944bd 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu  
							
							 
							
							
							
						 
						
							2015-03-02 13:53:30 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								de190e49d5 
								
							
								 
							
						 
						
							
							
								
								Add more unit tests for exclusive namespaces.  
							
							 
							
							
							
						 
						
							2015-02-27 11:51:06 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								127efeeb68 
								
							
								 
							
						 
						
							
							
								
								Update unit tests to use new format.  
							
							 
							
							
							
						 
						
							2015-02-27 11:10:48 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0ebd632d39 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2015-02-27 09:46:38 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f53fcbce97 
								
							
								 
							
						 
						
							
							
								
								Use cache.pop() instead of a separate membership test + del []  
							
							 
							
							
							
						 
						
							2015-02-23 18:30:45 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								bd84755e64 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into performance-cache-improvements  
							
							 
							
							
							
						 
						
							2015-02-23 17:16:03 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								e76d485e29 
								
							
								 
							
						 
						
							
							
								
								Allow @cached-wrapped functions to have a prefill method for setting entries  
							
							 
							
							
							
						 
						
							2015-02-23 15:41:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								852816befe 
								
							
								 
							
						 
						
							
							
								
								Fix presence tests  
							
							 
							
							
							
						 
						
							2015-02-23 15:14:09 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								ebc3db295b 
								
							
								 
							
						 
						
							
							
								
								Take named arguments to @cached() decorator, add a 'max_entries' limit  
							
							 
							
							
							
						 
						
							2015-02-19 18:36:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5f4c28d313 
								
							
								 
							
						 
						
							
							
								
								Update tests  
							
							 
							
							
							
						 
						
							2015-02-19 14:34:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5358966a87 
								
							
								 
							
						 
						
							
							
								
								Use git aware version string in User-Agent and Server headers  
							
							 
							
							
							
						 
						
							2015-02-18 16:52:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								0d872f5aa6 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from matrix-org/application-services  
							
							 
							
							... 
							
							
							
							Application Services 
							
						 
						
							2015-02-13 15:06:14 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								021d93db11 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #62  from matrix-org/state-chache  
							
							 
							
							... 
							
							
							
							State chache 
							
						 
						
							2015-02-11 17:10:28 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								cb43fbeeb4 
								
							
								 
							
						 
						
							
							
								
								Fix tests which broke when event caching was introduced.  
							
							 
							
							
							
						 
						
							2015-02-11 16:46:01 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f2fdcb7c4b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-11 16:43:26 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f5a70e0d2e 
								
							
								 
							
						 
						
							
							
								
								Add a cache for get_event  
							
							 
							
							
							
						 
						
							2015-02-11 15:01:15 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								d8324d5a2b 
								
							
								 
							
						 
						
							
							
								
								Add a lru cache class  
							
							 
							
							
							
						 
						
							2015-02-11 14:52:23 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								896253e085 
								
							
								 
							
						 
						
							
							
								
								Factor out some of the common homeserver setup code into a  
							
							 
							
							... 
							
							
							
							setup_test_homeserver function in utils. 
							
						 
						
							2015-02-11 11:37:30 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c7783d6fee 
								
							
								 
							
						 
						
							
							
								
								Notify ASes for events sent by other users in a room which an AS user is a part of.  
							
							 
							
							
							
						 
						
							2015-02-11 10:36:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								164f6b9256 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2015-02-09 14:23:57 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								ab3c897ce1 
								
							
								 
							
						 
						
							
							
								
								Remove unused imports.  
							
							 
							
							
							
						 
						
							2015-02-09 14:16:36 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								5a7dd05818 
								
							
								 
							
						 
						
							
							
								
								Modify auth.get_user_by_req for authing appservices directly.  
							
							 
							
							... 
							
							
							
							Add logic to map the appservice token to the autogenned appservice user ID.
Add unit tests for all forms of get_user_by_req (user/appservice,
valid/bad/missing tokens) 
							
						 
						
							2015-02-09 14:14:15 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								11e6b3d18b 
								
							
								 
							
						 
						
							
							
								
								Dependency inject ApplicationServiceApi when creating ApplicationServicesHandler.  
							
							 
							
							
							
						 
						
							2015-02-05 17:04:59 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								951690e54d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into application-services  
							
							 
							
							
							
						 
						
							2015-02-05 14:28:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								131e036402 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests.  
							
							 
							
							
							
						 
						
							2015-02-05 13:22:20 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								bc658907f0 
								
							
								 
							
						 
						
							
							
								
								Add unit test for appservice_handler.query_room_alias_exists  
							
							 
							
							
							
						 
						
							2015-02-05 11:54:36 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								f0c730252f 
								
							
								 
							
						 
						
							
							
								
								Add unknown user ID check. Use store.get_aliases_for_room(room_id) when searching for services by alias.  
							
							 
							
							
							
						 
						
							2015-02-05 11:25:32 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								27091f146a 
								
							
								 
							
						 
						
							
							
								
								Add hs_token column and generate a different token f.e application service.  
							
							 
							
							
							
						 
						
							2015-02-05 10:08:12 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								89f2e8fbdf 
								
							
								 
							
						 
						
							
							
								
								Fix bug in store defer. Add more unit tests.  
							
							 
							
							
							
						 
						
							2015-02-04 15:21:03 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								525a218b2b 
								
							
								 
							
						 
						
							
							
								
								Begin to add unit tests for appservice glue and regex testing.  
							
							 
							
							
							
						 
						
							2015-02-04 12:24:20 +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
							
						 
						
							 
							
							
							
								
							
								1bd540ef79 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into rejections  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/storage/schema/im.sql 
							
						 
						
							2015-01-30 15:16:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								471c47441d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #37  from matrix-org/client_v2_filter  
							
							 
							
							... 
							
							
							
							Client v2 filter 
							
						 
						
							2015-01-30 14:56:08 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2aaedab203 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution  
							
							 
							
							
							
						 
						
							2015-01-30 14:09:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2ebf795c0a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into rejections  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql 
							
						 
						
							2015-01-30 11:10:37 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								93ed31dda2 
								
							
								 
							
						 
						
							
							
								
								Create a separate filter object to do the actual filtering, so that we can  
							
							 
							
							... 
							
							
							
							split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event 
							
						 
						
							2015-01-29 17:45:07 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								78015948a7 
								
							
								 
							
						 
						
							
							
								
								Initial implementation of auth conflict resolution  
							
							 
							
							
							
						 
						
							2015-01-29 16:52:33 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								33391db5f8 
								
							
								 
							
						 
						
							
							
								
								Merge in auth changes from develop  
							
							 
							
							
							
						 
						
							2015-01-29 15:54:54 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								9d8f798a3f 
								
							
								 
							
						 
						
							
							
								
								Merge changes from develop  
							
							 
							
							
							
						 
						
							2015-01-29 14:55:27 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								38b27bd2cb 
								
							
								 
							
						 
						
							
							
								
								Add filter_room_state unit tests.  
							
							 
							
							
							
						 
						
							2015-01-29 14:28:34 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								83172487b0 
								
							
								 
							
						 
						
							
							
								
								Add basic filtering public API unit tests. Use defers in the right places.  
							
							 
							
							
							
						 
						
							2015-01-29 12:20:59 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								5561a87920 
								
							
								 
							
						 
						
							
							
								
								Add more unit tests for the filter algorithm.  
							
							 
							
							
							
						 
						
							2015-01-29 12:06:16 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								777d9914b5 
								
							
								 
							
						 
						
							
							
								
								Implement filter algorithm. Add basic event type unit tests to assert it works.  
							
							 
							
							
							
						 
						
							2015-01-29 11:38:06 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								26c8fff19e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #36  from matrix-org/device_id_from_access_token  
							
							 
							
							... 
							
							
							
							Extract the device id and token id from the access token when autheniticating users 
							
						 
						
							2015-01-28 17:19:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								388581e087 
								
							
								 
							
						 
						
							
							
								
								Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events  
							
							 
							
							
							
						 
						
							2015-01-28 16:58:23 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c23e3db544 
								
							
								 
							
						 
						
							
							
								
								Add filter JSON sanity checks.  
							
							 
							
							
							
						 
						
							2015-01-28 16:45:18 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c59bcabf0b 
								
							
								 
							
						 
						
							
							
								
								Return the device_id from get_auth_by_req  
							
							 
							
							
							
						 
						
							2015-01-28 15:43:41 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								06cc147012 
								
							
								 
							
						 
						
							
							
								
								Initial stab at real SQL storage implementation of user filter definitions  
							
							 
							
							
							
						 
						
							2015-01-27 18:46:03 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								0c14a699bb 
								
							
								 
							
						 
						
							
							
								
								More unit-testing of REST errors  
							
							 
							
							
							
						 
						
							2015-01-27 18:07:21 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								54e513b4e6 
								
							
								 
							
						 
						
							
							
								
								Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests  
							
							 
							
							
							
						 
						
							2015-01-27 17:48:13 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								059651efa1 
								
							
								 
							
						 
						
							
							
								
								Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely  
							
							 
							
							
							
						 
						
							2015-01-27 16:17:56 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b1503112ce 
								
							
								 
							
						 
						
							
							
								
								Initial trivial unittest of Filtering object  
							
							 
							
							
							
						 
						
							2015-01-27 15:56:14 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f9958f3404 
								
							
								 
							
						 
						
							
							
								
								Use new V2AlphaRestTestCase  
							
							 
							
							
							
						 
						
							2015-01-27 13:17:25 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								0484d7f6e9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into client_v2_filter  
							
							 
							
							
							
						 
						
							2015-01-27 13:11:03 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								57d2bfca3f 
								
							
								 
							
						 
						
							
							
								
								Initial cut of a shared base class for REST unit tests  
							
							 
							
							
							
						 
						
							2015-01-27 13:09:57 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								39c1892b22 
								
							
								 
							
						 
						
							
							
								
								Minor changes to v2_alpha filter REST test to allow the setUp method to be shareable  
							
							 
							
							
							
						 
						
							2015-01-27 13:03:31 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								37b8a71f10 
								
							
								 
							
						 
						
							
							
								
								Initial trivial REST test of v2_alpha filter API  
							
							 
							
							
							
						 
						
							2015-01-26 15:27:40 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								d07dfe5392 
								
							
								 
							
						 
						
							
							
								
								Create (empty) v2_alpha REST tests directory  
							
							 
							
							
							
						 
						
							2015-01-26 14:32:17 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9b1e552b51 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into rejections  
							
							 
							
							
							
						 
						
							2015-01-23 15:51:48 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ada711504e 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_roomalias with RoomAlias.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 13:21:58 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1c06c48ce2 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_roomid with RoomID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:55:12 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5759bec43c 
								
							
								 
							
						 
						
							
							
								
								Replace hs.parse_userid with UserID.from_string  
							
							 
							
							
							
						 
						
							2015-01-23 11:47:15 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7dfd99f163 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #31  from matrix-org/client_api_resource  
							
							 
							
							... 
							
							
							
							Merge rest servlets into the client json resource object 
							
						 
						
							2015-01-23 10:55:18 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7256def8e4 
								
							
								 
							
						 
						
							
							
								
								Merge rest servlets into the client json resource object  
							
							 
							
							
							
						 
						
							2015-01-23 10:37:38 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								3a243c53f4 
								
							
								 
							
						 
						
							
							
								
								Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is still presence-specific  
							
							 
							
							
							
						 
						
							2015-01-22 20:06:28 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								cbb10879cb 
								
							
								 
							
						 
						
							
							
								
								Much merging of test case setUp() methods to make them much more  
							
							 
							
							... 
							
							
							
							shareable 
							
						 
						
							2015-01-22 20:06:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								53584420a5 
								
							
								 
							
						 
						
							
							
								
								Move client rest tests back under rest  
							
							 
							
							
							
						 
						
							2015-01-22 16:13:27 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								97c68c508d 
								
							
								 
							
						 
						
							
							
								
								Move rest APIs back under the rest directory  
							
							 
							
							
							
						 
						
							2015-01-22 16:10:07 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1d2016b4a8 
								
							
								 
							
						 
						
							
							
								
								Move client v1 api rest servlets into a "client/v1" directory  
							
							 
							
							
							
						 
						
							2015-01-22 14:59:08 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								16bfabb9c5 
								
							
								 
							
						 
						
							
							
								
								Fix manifest. Ignore contrib and docs directories when checking manifest against source control.  
							
							 
							
							
							
						 
						
							2015-01-22 14:32:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								73315ce9de 
								
							
								 
							
						 
						
							
							
								
								Abstract out the room ID from presence tests, so it's stored in self  
							
							 
							
							
							
						 
						
							2015-01-21 20:01:57 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								dbe71e670c 
								
							
								 
							
						 
						
							
							
								
								Use common base class for two Presence unit-tests, avoiding boilerplate copypasta  
							
							 
							
							
							
						 
						
							2015-01-21 16:58:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6dcade97be 
								
							
								 
							
						 
						
							
							
								
								Implement new state resolution algorithm  
							
							 
							
							
							
						 
						
							2015-01-21 16:27:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5fed042640 
								
							
								 
							
						 
						
							
							
								
								Finish renaming "context" to "room_id" in federation codebase  
							
							 
							
							
							
						 
						
							2015-01-16 19:01:03 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								cf7e723808 
								
							
								 
							
						 
						
							
							
								
								Have MockClock detect attempts to cancel expired timers, to prevent a repeat of SYN-230  
							
							 
							
							
							
						 
						
							2015-01-13 16:58:36 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3891597eb3 
								
							
								 
							
						 
						
							
							
								
								Remove unused functions  
							
							 
							
							
							
						 
						
							2015-01-13 15:57:26 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								9c804bc3fd 
								
							
								 
							
						 
						
							
							
								
								Check that setting typing notification still works after explicit timeout at REST layer - SYN-230  
							
							 
							
							
							
						 
						
							2015-01-12 18:31:48 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								db72a07ef5 
								
							
								 
							
						 
						
							
							
								
								Don't make @unittest.DEBUG print the huge amount of verbosity generated by the synapse.storage loggers  
							
							 
							
							
							
						 
						
							2015-01-12 18:16:27 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								968dc988f9 
								
							
								 
							
						 
						
							
							
								
								Check that setting typing notification still works after explicit timeout - SYN-230  
							
							 
							
							
							
						 
						
							2015-01-12 18:01:49 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								a09882de83 
								
							
								 
							
						 
						
							
							
								
								Update tests  
							
							 
							
							
							
						 
						
							2015-01-07 16:12:14 +00:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								4640239d34 
								
							
								 
							
						 
						
							
							
								
								Mock ratelimiter to make tests pass.  
							
							 
							
							
							
						 
						
							2014-12-19 17:49:47 +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
							
						 
						
							 
							
							
							
								
							
								dbe77ec79a 
								
							
								 
							
						 
						
							
							
								
								Replace distributor deferred list, with a simple for loop until I understand why the former breaks and the latter doesn't  
							
							 
							
							
							
						 
						
							2014-12-18 17:47:00 +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
							
						 
						
							 
							
							
							
								
							
								8b8beba194 
								
							
								 
							
						 
						
							
							
								
								Remove annotate_event_with_state as nothing was using it. Update state tests to call annotate_context_with_state  
							
							 
							
							
							
						 
						
							2014-12-16 15:08:37 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3c77d13aa5 
								
							
								 
							
						 
						
							
							
								
								Kill off synapse.api.events.*  
							
							 
							
							
							
						 
						
							2014-12-16 11:29:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cf6e5f1dbf 
								
							
								 
							
						 
						
							
							
								
								Rename MessageHandler.handle_event. Add a few comments.  
							
							 
							
							
							
						 
						
							2014-12-15 17:01:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								65cdf4e724 
								
							
								 
							
						 
						
							
							
								
								Get current member state from current_state snapshot. Fix leave test.  
							
							 
							
							
							
						 
						
							2014-12-15 15:03:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								57e0e619f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							... 
							
							
							
							Conflicts:
	tests/handlers/test_room.py 
							
						 
						
							2014-12-15 14:45:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1fc2a0e33e 
								
							
								 
							
						 
						
							
							
								
								Fix tests and remove debug logging  
							
							 
							
							
							
						 
						
							2014-12-12 15:08:29 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ebf2ec3ce6 
								
							
								 
							
						 
						
							
							
								
								Fix membership handler test  
							
							 
							
							
							
						 
						
							2014-12-12 14:32:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								41ff21c907 
								
							
								 
							
						 
						
							
							
								
								Fix test.  
							
							 
							
							
							
						 
						
							2014-12-12 14:10:32 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b0bb1756a9 
								
							
								 
							
						 
						
							
							
								
								Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others  
							
							 
							
							
							
						 
						
							2014-12-12 11:59:46 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fa4b610ae3 
								
							
								 
							
						 
						
							
							
								
								Fix stream test. Make sure we add join to auth_events for invitiations  
							
							 
							
							
							
						 
						
							2014-12-12 10:42:27 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f25764943c 
								
							
								 
							
						 
						
							
							
								
								Add a 'user_left_room' distributor signal analogous to 'user_joined_room'  
							
							 
							
							
							
						 
						
							2014-12-11 18:27:01 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								5ebc994f84 
								
							
								 
							
						 
						
							
							
								
								Actually auth-check to ensure people can only send typing notifications for rooms they're actually in  
							
							 
							
							
							
						 
						
							2014-12-11 18:11:43 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								6e1531682b 
								
							
								 
							
						 
						
							
							
								
								Move typing-notification REST tests into their own .py file  
							
							 
							
							
							
						 
						
							2014-12-11 17:54:42 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								1f26e56de0 
								
							
								 
							
						 
						
							
							
								
								Actually unit-test the event stream around REST typing tests  
							
							 
							
							
							
						 
						
							2014-12-11 17:54:42 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cde840a82c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor  
							
							 
							
							... 
							
							
							
							Conflicts:
	setup.py 
							
						 
						
							2014-12-11 17:48:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3fecacd86b 
								
							
								 
							
						 
						
							
							
								
								Fix replication tests  
							
							 
							
							
							
						 
						
							2014-12-11 17:11:06 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d3eb12c7b8 
								
							
								 
							
						 
						
							
							
								
								Fix federation test  
							
							 
							
							
							
						 
						
							2014-12-11 17:01:27 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c161b6cf96 
								
							
								 
							
						 
						
							
							
								
								Fix room creation test  
							
							 
							
							
							
						 
						
							2014-12-11 16:43:30 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								3b2cc26053 
								
							
								 
							
						 
						
							
							
								
								Initial hack at unit tests of room typing REST API  
							
							 
							
							
							
						 
						
							2014-12-11 16:03:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9191292b0f 
								
							
								 
							
						 
						
							
							
								
								Fix prev_content  
							
							 
							
							
							
						 
						
							2014-12-11 15:16:55 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e72b16f9a3 
								
							
								 
							
						 
						
							
							
								
								Fix redaction tests  
							
							 
							
							
							
						 
						
							2014-12-11 13:38:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8cdebce470 
								
							
								 
							
						 
						
							
							
								
								Fix redactions. Fix 'age' key  
							
							 
							
							
							
						 
						
							2014-12-11 13:25:19 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								1a75ff5c23 
								
							
								 
							
						 
						
							
							
								
								Hook up the event stream to typing notifications  
							
							 
							
							
							
						 
						
							2014-12-10 21:01:49 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								4006d58335 
								
							
								 
							
						 
						
							
							
								
								Store serial numbers per room for typing event stream purposes  
							
							 
							
							
							
						 
						
							2014-12-10 20:48:25 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								9eb819e828 
								
							
								 
							
						 
						
							
							
								
								First hack at implementing timeouts in typing notification handler  
							
							 
							
							
							
						 
						
							2014-12-10 19:39:01 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								4551afc6d2 
								
							
								 
							
						 
						
							
							
								
								Implement .cancel_call_later() in MockClock  
							
							 
							
							
							
						 
						
							2014-12-10 19:26:52 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								38da9884e7 
								
							
								 
							
						 
						
							
							
								
								Implement .call_later() in MockClock  
							
							 
							
							
							
						 
						
							2014-12-10 19:24:12 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								be9a8d68e0 
								
							
								 
							
						 
						
							
							
								
								Trivial test of MockClock()  
							
							 
							
							
							
						 
						
							2014-12-10 19:13:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4d6af0dde3 
								
							
								 
							
						 
						
							
							
								
								Fix some tests  
							
							 
							
							
							
						 
						
							2014-12-10 18:00:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								08aceea82e 
								
							
								 
							
						 
						
							
							
								
								Add newline back in  
							
							 
							
							
							
						 
						
							2014-12-10 10:26:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f26ec14b21 
								
							
								 
							
						 
						
							
							
								
								Remove whitespace  
							
							 
							
							
							
						 
						
							2014-12-10 10:25:21 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								8ada2d2018 
								
							
								 
							
						 
						
							
							
								
								fix UTs by telling all the mock stores about the new methods for tracking retries  
							
							 
							
							
							
						 
						
							2014-12-09 23:53:07 +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
							
						 
						
							 
							
							
							
								
							
								822b15ea43 
								
							
								 
							
						 
						
							
							
								
								Fix tests.  
							
							 
							
							
							
						 
						
							2014-11-26 10:45:37 +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
							
						 
						
							 
							
							
							
								
							
								a46e5ef621 
								
							
								 
							
						 
						
							
							
								
								SYN-163: Add an order by rowid to selects.  
							
							 
							
							... 
							
							
							
							This should fix the bug where the edges of the graph get returned in a
different order than they were inserted in, and so no get_event no
longer returned the exact same JSON as was inserted. This meant that
signature checks failed. 
							
						 
						
							2014-11-24 10:56:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								493055731e 
								
							
								 
							
						 
						
							
							
								
								Fix tests from prev commit  
							
							 
							
							
							
						 
						
							2014-11-19 18:00:07 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								03dc63f6c8 
								
							
								 
							
						 
						
							
							
								
								Initialise UserPresenceCache instances to always contain a 'presence' key  
							
							 
							
							
							
						 
						
							2014-11-19 17:31:46 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c5eabe3143 
								
							
								 
							
						 
						
							
							
								
								replace user_id with sender  
							
							 
							
							
							
						 
						
							2014-11-19 16:38:40 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								33d328d967 
								
							
								 
							
						 
						
							
							
								
								Include room members' presence in room initialSync  
							
							 
							
							
							
						 
						
							2014-11-18 15:28:58 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								17f977a9de 
								
							
								 
							
						 
						
							
							
								
								Include 'messages' snapshot in room initialSync  
							
							 
							
							
							
						 
						
							2014-11-18 14:07:51 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								31a049eb69 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into room-initial-sync  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/handlers/message.py 
							
						 
						
							2014-11-17 16:59:24 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								cb4b6c844a 
								
							
								 
							
						 
						
							
							
								
								Merge PDUs and Events into one object  
							
							 
							
							
							
						 
						
							2014-11-14 21:25:02 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								de1ec90133 
								
							
								 
							
						 
						
							
							
								
								Validate signatures on incoming events  
							
							 
							
							
							
						 
						
							2014-11-14 19:11:04 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e903c941cb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into request_logging  
							
							 
							
							... 
							
							
							
							Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py 
							
						 
						
							2014-11-14 11:16:50 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8d8a133c89 
								
							
								 
							
						 
						
							
							
								
								SYN-103: Remove "origin" and "destination" keys from edus  
							
							 
							
							
							
						 
						
							2014-11-13 15:49:03 +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
							
						 
						
							 
							
							
							
								
							
								37900a92db 
								
							
								 
							
						 
						
							
							
								
								Only allow people in a room to look up room state.  
							
							 
							
							
							
						 
						
							2014-11-11 17:55:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3db2c0d43e 
								
							
								 
							
						 
						
							
							
								
								Rename annotate_state_groups to annotate_event_with_state  
							
							 
							
							
							
						 
						
							2014-11-11 16:58:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								02ebb9f0c3 
								
							
								 
							
						 
						
							
							
								
								Fix state tests  
							
							 
							
							
							
						 
						
							2014-11-11 14:16:48 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed8b7d400c 
								
							
								 
							
						 
						
							
							
								
								Fix validation tests  
							
							 
							
							
							
						 
						
							2014-11-11 10:31:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								339c11dd86 
								
							
								 
							
						 
						
							
							
								
								Fix rest.test_rooms  
							
							 
							
							
							
						 
						
							2014-11-11 08:09:42 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								c23afed39a 
								
							
								 
							
						 
						
							
							
								
								Include room membership in room initialSync  
							
							 
							
							
							
						 
						
							2014-11-10 19:34:47 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								1fd8139138 
								
							
								 
							
						 
						
							
							
								
								Put room state in room initialSync output - I guess this is right; I really can't find any other tests similar...  
							
							 
							
							
							
						 
						
							2014-11-10 19:29:58 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								269f80bf8e 
								
							
								 
							
						 
						
							
							
								
								Have room initialSync return the room's room_id  
							
							 
							
							
							
						 
						
							2014-11-10 19:02:19 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								50c8e3fcda 
								
							
								 
							
						 
						
							
							
								
								Initial (empty) test that room initialSync at least returns 200 OK  
							
							 
							
							
							
						 
						
							2014-11-10 18:07:55 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ec824927c1 
								
							
								 
							
						 
						
							
							
								
								Fix rest.test_events. Convert to use SQLiteMemoryDbPool  
							
							 
							
							
							
						 
						
							2014-11-10 15:37:53 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ebdb19682 
								
							
								 
							
						 
						
							
							
								
								Fix SQLBaseStoreTestCase  
							
							 
							
							
							
						 
						
							2014-11-10 15:32:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3cd9c02f71 
								
							
								 
							
						 
						
							
							
								
								Fix stream test.  
							
							 
							
							
							
						 
						
							2014-11-10 15:29:19 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e2cebe26e8 
								
							
								 
							
						 
						
							
							
								
								Fix room_member storage test  
							
							 
							
							
							
						 
						
							2014-11-10 15:24:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c174d19d1e 
								
							
								 
							
						 
						
							
							
								
								Fix redaction storage test  
							
							 
							
							
							
						 
						
							2014-11-10 15:21:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b01159f234 
								
							
								 
							
						 
						
							
							
								
								Fix room handler test  
							
							 
							
							
							
						 
						
							2014-11-10 14:58:33 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3791b75000 
								
							
								 
							
						 
						
							
							
								
								Fix a couple more storage tests  
							
							 
							
							
							
						 
						
							2014-11-05 13:48:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2fcce3b3c5 
								
							
								 
							
						 
						
							
							
								
								Remove stale tests  
							
							 
							
							
							
						 
						
							2014-11-05 13:43:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								da80ebcc6b 
								
							
								 
							
						 
						
							
							
								
								Fix redaction storage test  
							
							 
							
							
							
						 
						
							2014-11-05 13:28:57 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1616df2f61 
								
							
								 
							
						 
						
							
							
								
								Fix typing tests  
							
							 
							
							
							
						 
						
							2014-11-05 11:15:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c670ce416b 
								
							
								 
							
						 
						
							
							
								
								Fix room tests  
							
							 
							
							
							
						 
						
							2014-11-05 11:15:15 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f48fce8bd3 
								
							
								 
							
						 
						
							
							
								
								Fix profile tests  
							
							 
							
							
							
						 
						
							2014-11-05 11:13:58 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24e2da4557 
								
							
								 
							
						 
						
							
							
								
								Fix presencelike test  
							
							 
							
							
							
						 
						
							2014-11-05 11:13:01 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								416ab4ebf0 
								
							
								 
							
						 
						
							
							
								
								Don't execute empty tests. Formatting.  
							
							 
							
							
							
						 
						
							2014-11-05 11:12:47 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								34c4614682 
								
							
								 
							
						 
						
							
							
								
								Fix presence test  
							
							 
							
							
							
						 
						
							2014-11-05 11:10:54 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9e429239ab 
								
							
								 
							
						 
						
							
							
								
								Fix Federation test  
							
							 
							
							
							
						 
						
							2014-11-05 11:10:36 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4a5e95511e 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2014-11-04 17:13:21 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dfb3d21a6d 
								
							
								 
							
						 
						
							
							
								
								Fix room handler tests  
							
							 
							
							
							
						 
						
							2014-11-04 17:12:39 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b0554682ed 
								
							
								 
							
						 
						
							
							
								
								Fix federation handler tests. I've removed the invite/join dance ones as they are completely out of date.  
							
							 
							
							
							
						 
						
							2014-11-04 16:51:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								7f4c7fe4e8 
								
							
								 
							
						 
						
							
							
								
								PEP8  
							
							 
							
							
							
						 
						
							2014-11-04 16:35:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dd3711bdbd 
								
							
								 
							
						 
						
							
							
								
								Fix tests.handlers.test_directory  
							
							 
							
							
							
						 
						
							2014-11-04 16:33:52 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b15e8d5bbc 
								
							
								 
							
						 
						
							
							
								
								event <-> pdu mappings are now trivial and will soon be scrapped  
							
							 
							
							
							
						 
						
							2014-11-04 16:20:02 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24305ba5bf 
								
							
								 
							
						 
						
							
							
								
								Fix up federation tests  
							
							 
							
							
							
						 
						
							2014-11-04 16:15:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ef9c4476a0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization  
							
							 
							
							
							
						 
						
							2014-10-30 11:18:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								7c06399512 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into request_logging  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/config/logger.py 
							
						 
						
							2014-10-30 11:13:58 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b29517bd01 
								
							
								 
							
						 
						
							
							
								
								Add a request-id to each log line  
							
							 
							
							
							
						 
						
							2014-10-30 01:21:33 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b1ee6fd7ed 
								
							
								 
							
						 
						
							
							
								
								Fix an off-by-one bug in presence event stream pagination; this might be responsible for any number of bug reports  
							
							 
							
							
							
						 
						
							2014-10-29 16:16:01 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								dc3c2823ac 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into event_signing  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/federation/replication.py 
							
						 
						
							2014-10-17 17:33:58 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								82c5820767 
								
							
								 
							
						 
						
							
							
								
								keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema  
							
							 
							
							
							
						 
						
							2014-10-17 17:31:48 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								f5cf7ac25b 
								
							
								 
							
						 
						
							
							
								
								SPEC-7: Rename 'ts' to 'origin_server_ts'  
							
							 
							
							
							
						 
						
							2014-10-17 17:12:25 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								bb04447c44 
								
							
								 
							
						 
						
							
							
								
								Include hashes of previous pdus when referencing them  
							
							 
							
							
							
						 
						
							2014-10-16 23:25:12 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								66104da10c 
								
							
								 
							
						 
						
							
							
								
								Sign outgoing PDUs.  
							
							 
							
							
							
						 
						
							2014-10-16 00:09:48 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1c445f88f6 
								
							
								 
							
						 
						
							
							
								
								persist hashes and origin signatures for PDUs  
							
							 
							
							
							
						 
						
							2014-10-15 17:09:04 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								9aed791fc3 
								
							
								 
							
						 
						
							
							
								
								SYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin from the transaction itself  
							
							 
							
							
							
						 
						
							2014-10-14 16:44:27 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								25d80f35f1 
								
							
								 
							
						 
						
							
							
								
								Raise a SynapseError if the authorisation header is missing or malformed  
							
							 
							
							
							
						 
						
							2014-10-13 15:53:18 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								6684855767 
								
							
								 
							
						 
						
							
							
								
								Verify signatures for server2server requests  
							
							 
							
							
							
						 
						
							2014-10-13 14:37:46 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								10ef8e6e4b 
								
							
								 
							
						 
						
							
							
								
								SYN-75 sign at the request level rather than the transaction level  
							
							 
							
							
							
						 
						
							2014-10-13 11:49:55 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								984e207b59 
								
							
								 
							
						 
						
							
							
								
								Merge branch develop into server2server_signing  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/app/homeserver.py 
							
						 
						
							2014-10-13 10:58:50 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								868eb478d8 
								
							
								 
							
						 
						
							
							
								
								Fixed test.  
							
							 
							
							
							
						 
						
							2014-10-09 15:55:07 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								3db09c4d15 
								
							
								 
							
						 
						
							
							
								
								Still broken.  
							
							 
							
							
							
						 
						
							2014-10-09 15:53:40 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								83c53113af 
								
							
								 
							
						 
						
							
							
								
								Break a test.  
							
							 
							
							
							
						 
						
							2014-10-09 15:51:05 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								72aef114ab 
								
							
								 
							
						 
						
							
							
								
								Fix unit test.  
							
							 
							
							
							
						 
						
							2014-10-08 15:18:19 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								6045bd89fb 
								
							
								 
							
						 
						
							
							
								
								Break unit test.  
							
							 
							
							
							
						 
						
							2014-10-08 15:16:03 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								574377636e 
								
							
								 
							
						 
						
							
							
								
								Add a keyword argument to get_json to avoid retrying on DNS failures. Rather than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter  
							
							 
							
							
							
						 
						
							2014-10-02 14:26:13 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								4f11518934 
								
							
								 
							
						 
						
							
							
								
								Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers  
							
							 
							
							
							
						 
						
							2014-10-02 14:03:26 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								9605593d11 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into server2server_signing  
							
							 
							
							... 
							
							
							
							Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py 
							
						 
						
							2014-09-30 17:55:06 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b95a178584 
								
							
								 
							
						 
						
							
							
								
								SYN-75 Verify signatures on server to server transactions  
							
							 
							
							
							
						 
						
							2014-09-30 15:15:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e06adc6d7e 
								
							
								 
							
						 
						
							
							
								
								SYN-2: Allow server admins to delete room aliases  
							
							 
							
							
							
						 
						
							2014-09-30 11:31:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d96cb61f26 
								
							
								 
							
						 
						
							
							
								
								Unbreak tests after changing storage API  
							
							 
							
							
							
						 
						
							2014-09-29 15:35:57 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0fdf308874 
								
							
								 
							
						 
						
							
							
								
								Track the IP users connect with. Add an admin column to users table.  
							
							 
							
							
							
						 
						
							2014-09-26 16:36:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								37bfe44046 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'deletions' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2014-09-25 17:02:53 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								72e80dbe0e 
								
							
								 
							
						 
						
							
							
								
								Rename redaction test case to something helpful  
							
							 
							
							
							
						 
						
							2014-09-25 15:52:23 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								59f2bef187 
								
							
								 
							
						 
						
							
							
								
								Fix test where we changed arguments used to call the notifier  
							
							 
							
							
							
						 
						
							2014-09-25 13:04:33 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								24e4c48468 
								
							
								 
							
						 
						
							
							
								
								More tests.  
							
							 
							
							
							
						 
						
							2014-09-25 10:19:16 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2721f5ccc9 
								
							
								 
							
						 
						
							
							
								
								Add test for redactions  
							
							 
							
							
							
						 
						
							2014-09-25 10:02:20 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								52ca867670 
								
							
								 
							
						 
						
							
							
								
								Sign federation transactions  
							
							 
							
							
							
						 
						
							2014-09-24 17:25:41 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3d2cca6762 
								
							
								 
							
						 
						
							
							
								
								Fix test.  
							
							 
							
							
							
						 
						
							2014-09-24 11:17:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dcc1965bfe 
								
							
								 
							
						 
						
							
							
								
								Test that prev_content get's added if there is a prev_state key (in the event stream).  
							
							 
							
							
							
						 
						
							2014-09-19 16:44:16 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								28bcd01e8d 
								
							
								 
							
						 
						
							
							
								
								SYN-47: Fix bug where we still returned events for rooms we had left.  
							
							 
							
							... 
							
							
							
							SYN-47 #resolve 
							
						 
						
							2014-09-19 14:45:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								335e5d131c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop  
							
							 
							
							... 
							
							
							
							Conflicts:
	tests/handlers/test_profile.py 
							
						 
						
							2014-09-18 14:31:47 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								4571cf7baa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into test-sqlite-memory  
							
							 
							
							
							
						 
						
							2014-09-17 18:27:47 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								bfae582fa3 
								
							
								 
							
						 
						
							
							
								
								Remark on remaining storage modules that still need unit tests  
							
							 
							
							
							
						 
						
							2014-09-17 18:27:30 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								bcf5121937 
								
							
								 
							
						 
						
							
							
								
								Neaten more of the storage layer tests with assertObjectHasAttributes; more standardisation on test layout  
							
							 
							
							
							
						 
						
							2014-09-17 16:58:59 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b588ce920d 
								
							
								 
							
						 
						
							
							
								
								Unit tests for (some) room events via the RoomStore  
							
							 
							
							
							
						 
						
							2014-09-17 16:31:11 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								ba41ca45fa 
								
							
								 
							
						 
						
							
							
								
								Use new assertObjectHasAttributes() in tests/storage/test_room.py  
							
							 
							
							
							
						 
						
							2014-09-17 16:04:05 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								7aacd6834a 
								
							
								 
							
						 
						
							
							
								
								Added a useful unit test primitive for asserting object attributes  
							
							 
							
							
							
						 
						
							2014-09-17 15:56:40 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								de14853237 
								
							
								 
							
						 
						
							
							
								
								More RoomStore tests  
							
							 
							
							
							
						 
						
							2014-09-17 15:33:10 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b6818fd4d2 
								
							
								 
							
						 
						
							
							
								
								SYN-40: When a user updates their displayname or avatar update all their join events for all the rooms they are currently in.  
							
							 
							
							
							
						 
						
							2014-09-17 15:05:14 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								e32cfed1d8 
								
							
								 
							
						 
						
							
							
								
								Initial pass at a RoomStore test  
							
							 
							
							
							
						 
						
							2014-09-15 18:41:24 +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
							
						 
						
							 
							
							
							
								
							
								0897a09f49 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests after adding extra argument on put_json  
							
							 
							
							
							
						 
						
							2014-09-15 16:24:03 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								2c00e1ecd9 
								
							
								 
							
						 
						
							
							
								
								Be consistent when associating keys with login types for registration/login.  
							
							 
							
							
							
						 
						
							2014-09-15 15:38:29 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								c04caff55c 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests.  
							
							 
							
							
							
						 
						
							2014-09-15 15:14:19 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								1aaa429081 
								
							
								 
							
						 
						
							
							
								
								Also unittest RoomMemberStore's joined_hosts_for_room()  
							
							 
							
							
							
						 
						
							2014-09-15 15:00:14 +01:00