Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								93efcb8526 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #928  from matrix-org/rav/refactor_login  
							
							 
							
							... 
							
							
							
							Refactor login flow 
							
						 
						
							2016-07-18 16:12:35 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								dcfd71aa4c 
								
							
								 
							
						 
						
							
							
								
								Refactor login flow  
							
							 
							
							... 
							
							
							
							Make sure that we have the canonical user_id *before* calling
get_login_tuple_for_user_id.
Replace login_with_password with a method which just validates the password,
and have the caller call get_login_tuple_for_user_id. This brings the password
flow into line with the other flows, and will give us a place to register the
device_id if necessary. 
							
						 
						
							2016-07-18 15:23:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								fca90b3445 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #924  from matrix-org/erikj/purge_history  
							
							 
							
							... 
							
							
							
							Fix /purge_history bug 
							
						 
						
							2016-07-18 15:11:11 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a292454aa1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #925  from matrix-org/markjh/auth_fix  
							
							 
							
							... 
							
							
							
							Fix 500 ISE when sending alias event without a state_key 
							
						 
						
							2016-07-18 15:04:47 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4f81edbd4f 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #927  from Half-Shot/develop  
							
							 
							
							... 
							
							
							
							Fall back to 'username' if 'user' is not given for appservice registration. 
							
						 
						
							2016-07-18 10:44:56 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6344db659f 
								
							
								 
							
						 
						
							
							
								
								Fix a doc-comment  
							
							 
							
							... 
							
							
							
							The `store` in a handler is a generic DataStore, not just an events.StateStore. 
							
						 
						
							2016-07-18 09:48:10 +01:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								511a52afc8 
								
							
								 
							
						 
						
							
							
								
								Use body.get to check for 'user'  
							
							 
							
							
							
						 
						
							2016-07-16 18:44:08 +01:00  
						
					 
				
					
						
							
							
								 
								Will Hunt
							
						 
						
							 
							
							
							
								
							
								e885e2a623 
								
							
								 
							
						 
						
							
							
								
								Fall back to 'username' if 'user' is not given for appservice reg.  
							
							 
							
							
							
						 
						
							2016-07-16 18:33:48 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								d137e03231 
								
							
								 
							
						 
						
							
							
								
								Fix 500 ISE when sending alias event without a state_key  
							
							 
							
							
							
						 
						
							2016-07-15 18:58:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f52565de50 
								
							
								 
							
						 
						
							
							
								
								Fix /purge_history bug  
							
							 
							
							... 
							
							
							
							This was caused by trying to insert duplicate backward extremeties 
							
						 
						
							2016-07-15 14:23:15 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a2d288c6a9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #923  from matrix-org/erikj/purge_history  
							
							 
							
							... 
							
							
							
							Various purge_history fixes 
							
						 
						
							2016-07-15 13:23:29 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bd7c51921d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #919  from matrix-org/erikj/auth_fix  
							
							 
							
							... 
							
							
							
							Various auth.py fixes. 
							
						 
						
							2016-07-15 11:38:33 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								978fa53cc2 
								
							
								 
							
						 
						
							
							
								
								Pull out min stream_ordering from ex_outlier_stream  
							
							 
							
							
							
						 
						
							2016-07-15 10:22:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eec9609e96 
								
							
								 
							
						 
						
							
							
								
								event_backwards_extremeties may not be empty  
							
							 
							
							
							
						 
						
							2016-07-15 10:22:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9e1b43bcbf 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2016-07-15 09:29:54 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a3036ac37e 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #921  from matrix-org/erikj/account_deactivate  
							
							 
							
							... 
							
							
							
							Feature: Add an /account/deactivate endpoint 
							
						 
						
							2016-07-14 17:25:15 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ebdafd8114 
								
							
								 
							
						 
						
							
							
								
								Check sender signed event  
							
							 
							
							
							
						 
						
							2016-07-14 17:03:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a98d215204 
								
							
								 
							
						 
						
							
							
								
								Add filter param to /messages API  
							
							 
							
							
							
						 
						
							2016-07-14 16:30:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d554ca5e1d 
								
							
								 
							
						 
						
							
							
								
								Add support for filters in paginate_room_events  
							
							 
							
							
							
						 
						
							2016-07-14 15:59:04 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								209e04fa11 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #918  from negzi/bugfix_for_token_expiry  
							
							 
							
							... 
							
							
							
							Bug fix: expire invalid access tokens 
							
						 
						
							2016-07-14 15:51:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e5142f65a6 
								
							
								 
							
						 
						
							
							
								
								Add 'contains_url' to filter  
							
							 
							
							
							
						 
						
							2016-07-14 15:35:48 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b64aa6d687 
								
							
								 
							
						 
						
							
							
								
								Add sender and contains_url field to events table  
							
							 
							
							
							
						 
						
							2016-07-14 15:35:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								848d3bf2e1 
								
							
								 
							
						 
						
							
							
								
								Add hs object  
							
							 
							
							
							
						 
						
							2016-07-14 10:25:52 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b55c770271 
								
							
								 
							
						 
						
							
							
								
								Only accept password auth  
							
							 
							
							
							
						 
						
							2016-07-14 10:00:38 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d543b72562 
								
							
								 
							
						 
						
							
							
								
								Add an /account/deactivate endpoint  
							
							 
							
							
							
						 
						
							2016-07-14 09:56:53 +01:00  
						
					 
				
					
						
							
							
								 
								Negar Fazeli
							
						 
						
							 
							
							
							
								
							
								0136a522b1 
								
							
								 
							
						 
						
							
							
								
								Bug fix: expire invalid access tokens  
							
							 
							
							
							
						 
						
							2016-07-13 15:00:37 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2cb758ac75 
								
							
								 
							
						 
						
							
							
								
								Check if alias event's state_key matches sender's domain  
							
							 
							
							
							
						 
						
							2016-07-13 13:12:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								560c71c735 
								
							
								 
							
						 
						
							
							
								
								Check creation event's room_id domain matches sender's  
							
							 
							
							
							
						 
						
							2016-07-13 13:07:19 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a37ee2293c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #915  from matrix-org/dbkr/more_requesttokens  
							
							 
							
							... 
							
							
							
							Add requestToken endpoints 
							
						 
						
							2016-07-13 11:51:46 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								c55ad2e375 
								
							
								 
							
						 
						
							
							
								
								be more pythonic  
							
							 
							
							
							
						 
						
							2016-07-12 14:15:10 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								aaa9d9f0e1 
								
							
								 
							
						 
						
							
							
								
								on_OPTIONS isn't neccessary  
							
							 
							
							
							
						 
						
							2016-07-12 14:13:14 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								75fa7f6b3c 
								
							
								 
							
						 
						
							
							
								
								Remove other debug logging  
							
							 
							
							
							
						 
						
							2016-07-12 14:08:57 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a5db0026ed 
								
							
								 
							
						 
						
							
							
								
								Separate out requestTokens to separate handlers  
							
							 
							
							
							
						 
						
							2016-07-11 09:57:07 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								9c491366c5 
								
							
								 
							
						 
						
							
							
								
								Oops, remove debug logging  
							
							 
							
							
							
						 
						
							2016-07-11 09:07:40 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								385aec4010 
								
							
								 
							
						 
						
							
							
								
								Implement  https://github.com/matrix-org/matrix-doc/pull/346/files  
							
							 
							
							
							
						 
						
							2016-07-08 17:42:48 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								10f4856b0c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #914  from matrix-org/markjh/upgrade  
							
							 
							
							... 
							
							
							
							Ensure that the guest user is in the database when upgrading accounts 
							
						 
						
							2016-07-08 17:02:06 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								dfde67a6fe 
								
							
								 
							
						 
						
							
							
								
								Add a comment explaining allow_none  
							
							 
							
							
							
						 
						
							2016-07-08 15:57:06 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								10c843fcfb 
								
							
								 
							
						 
						
							
							
								
								Ensure that the guest user is in the database when upgrading accounts  
							
							 
							
							
							
						 
						
							2016-07-08 15:15:55 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								58930da52b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							 
							
							
							
						 
						
							2016-07-08 14:11:37 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0870588c20 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'hotfixes-v0.16.1'  
							
							 
							
							
							
						 
						
							2016-07-08 13:22:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f90cf150e2 
								
							
								 
							
						 
						
							
							
								
								Bump version and changelog  
							
							 
							
							
							
						 
						
							2016-07-07 16:33:00 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								067596d341 
								
							
								 
							
						 
						
							
							
								
								Fix bug where we did not correctly explode when multiple user_ids were set in macaroon  
							
							 
							
							
							
						 
						
							2016-07-07 16:22:24 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								70d650be2b 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #911  from matrix-org/erikj/purge_history  
							
							 
							
							... 
							
							
							
							Feature: Purge local room history. 
							
						 
						
							2016-07-07 13:34:28 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b92e7955be 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							 
							
							
							
						 
						
							2016-07-07 11:42:15 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c98e1479bd 
								
							
								 
							
						 
						
							
							
								
								Return 400 rather than 500  
							
							 
							
							
							
						 
						
							2016-07-07 11:41:07 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								67f2c901ea 
								
							
								 
							
						 
						
							
							
								
								Add rest servlet. Fix SQL.  
							
							 
							
							
							
						 
						
							2016-07-06 15:56:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eef7778af9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2  
							
							 
							
							
							
						 
						
							2016-07-06 14:50:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a17e7caeb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'erikj/shared_secret' into erikj/test2  
							
							 
							
							
							
						 
						
							2016-07-06 14:46:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f0c06ac65c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #909  from matrix-org/erikj/shared_secret  
							
							 
							
							... 
							
							
							
							Add an admin option to shared secret registration (breaks backwards compat) 
							
						 
						
							2016-07-06 14:08:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								76b18df3d9 
								
							
								 
							
						 
						
							
							
								
								Check that there are no null bytes in user and passsword  
							
							 
							
							
							
						 
						
							2016-07-06 11:17:53 +01:00