d137e03231 
								
							
								 
							
						 
						
							
							
								
								Fix 500 ISE when sending alias event without a state_key  
							
							
							
						 
						
							2016-07-15 18:58:25 +01:00  
				
					
						
							
							
								 
						
							
							
								bd7c51921d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #919  from matrix-org/erikj/auth_fix  
							
							... 
							
							
							
							Various auth.py fixes. 
							
						 
						
							2016-07-15 11:38:33 +01:00  
				
					
						
							
							
								 
						
							
							
								ebdafd8114 
								
							
								 
							
						 
						
							
							
								
								Check sender signed event  
							
							
							
						 
						
							2016-07-14 17:03:24 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0136a522b1 
								
							
								 
							
						 
						
							
							
								
								Bug fix: expire invalid access tokens  
							
							
							
						 
						
							2016-07-13 15:00:37 +02:00  
				
					
						
							
							
								 
						
							
							
								2cb758ac75 
								
							
								 
							
						 
						
							
							
								
								Check if alias event's state_key matches sender's domain  
							
							
							
						 
						
							2016-07-13 13:12:25 +01:00  
				
					
						
							
							
								 
						
							
							
								560c71c735 
								
							
								 
							
						 
						
							
							
								
								Check creation event's room_id domain matches sender's  
							
							
							
						 
						
							2016-07-13 13:07:19 +01:00  
				
					
						
							
							
								 
						
							
							
								385aec4010 
								
							
								 
							
						 
						
							
							
								
								Implement  https://github.com/matrix-org/matrix-doc/pull/346/files  
							
							
							
						 
						
							2016-07-08 17:42:48 +01:00  
				
					
						
							
							
								 
						
							
							
								58930da52b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of github.com:matrix-org/synapse into develop  
							
							
							
						 
						
							2016-07-08 14:11:37 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								be8be535f7 
								
							
								 
							
						 
						
							
							
								
								requestToken update  
							
							... 
							
							
							
							Don't send requestToken request to untrusted ID servers
Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now. 
							
						 
						
							2016-06-30 17:51:28 +01:00  
				
					
						
							
							
								 
						
							
							
								1f31cc37f8 
								
							
								 
							
						 
						
							
							
								
								Working unsubscribe links going straight to the HS  
							
							... 
							
							
							
							and authed by macaroons that let you delete pushers and nothing else 
							
						 
						
							2016-06-02 17:21:31 +01:00  
				
					
						
							
							
								 
						
							
							
								812b5de0fe 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe  
							
							
							
						 
						
							2016-06-02 15:33:28 +01:00  
				
					
						
							
							
								 
						
							
							
								aaa70e26a2 
								
							
								 
							
						 
						
							
							
								
								special case m.room.third_party_invite event auth to match invites, otherwise they get out of sync and you get  https://github.com/vector-im/vector-web/issues/1208  
							
							
							
						 
						
							2016-06-01 22:13:47 +01:00  
				
					
						
							
							
								 
						
							
							
								991af8b0d6 
								
							
								 
							
						 
						
							
							
								
								WIP on unsubscribing email notifs without logging in  
							
							
							
						 
						
							2016-06-01 17:40:52 +01:00  
				
					
						
							
							
								 
						
							
							
								1a3a2002ff 
								
							
								 
							
						 
						
							
							
								
								Spell "domain" correctly  
							
							... 
							
							
							
							s/domian/domain/g 
							
						 
						
							2016-05-16 19:17:23 +01:00  
				
					
						
							
							
								 
						
							
							
								40aa6e8349 
								
							
								 
							
						 
						
							
							
								
								Create user with expiry  
							
							... 
							
							
							
							- Add unittests for client, api and handler
Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com> 
							
						 
						
							2016-05-13 15:34:15 +02:00  
				
					
						
							
							
								 
						
							
							
								c9eb6dfc1b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user  
							
							
							
						 
						
							2016-05-09 13:21:06 +01:00  
				
					
						
							
							
								 
						
							
							
								08dfa8eee2 
								
							
								 
							
						 
						
							
							
								
								Add and use get_domian_from_id  
							
							
							
						 
						
							2016-05-09 10:36:03 +01:00  
				
					
						
							
							
								 
						
							
							
								a438a6d2bc 
								
							
								 
							
						 
						
							
							
								
								Implement basic ignore user  
							
							
							
						 
						
							2016-05-04 10:16:46 +01:00  
				
					
						
							
							
								 
						
							
							
								0f2ca8cde1 
								
							
								 
							
						 
						
							
							
								
								Measure Auth.check  
							
							
							
						 
						
							2016-04-13 11:15:59 +01:00  
				
					
						
							
							
								 
						
							
							
								c53f9d561e 
								
							
								 
							
						 
						
							
							
								
								Don't auto log failed auth checks  
							
							
							
						 
						
							2016-04-13 11:11:46 +01:00  
				
					
						
							
							
								 
						
							
							
								3e7fac0d56 
								
							
								 
							
						 
						
							
							
								
								Add published room list edit API  
							
							
							
						 
						
							2016-03-21 15:06:07 +00:00  
				
					
						
							
							
								 
						
							
							
								874fd43257 
								
							
								 
							
						 
						
							
							
								
								Send the user ID matching the guest access token, since there is no Matrix API to discover what user ID an access token is for.  
							
							
							
						 
						
							2016-03-07 17:13:56 +00:00  
				
					
						
							
							
								 
						
							
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
				
					
						
							
							
								 
						
							
							
								e5ad2e5267 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #582  from matrix-org/erikj/presence  
							
							... 
							
							
							
							Rewrite presence for performance. 
							
						 
						
							2016-02-19 09:37:50 +00:00  
				
					
						
							
							
								 
						
							
							
								114b929f8b 
								
							
								 
							
						 
						
							
							
								
								Check presence state is a valid one  
							
							
							
						 
						
							2016-02-18 09:16:32 +00:00  
				
					
						
							
							
								 
						
							
							
								536f949a1a 
								
							
								 
							
						 
						
							
							
								
								api/filtering: don't assume that event content will always be a dict  
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-02-17 12:59:41 +01:00  
				
					
						
							
							
								 
						
							
							
								4de08a4672 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge two of the room join codepaths"  
							
							... 
							
							
							
							This reverts commit cf81375b94 
							
						 
						
							2016-02-12 16:17:24 +00:00  
				
					
						
							
							
								 
						
							
							
								cf81375b94 
								
							
								 
							
						 
						
							
							
								
								Merge two of the room join codepaths  
							
							... 
							
							
							
							There's at least one more to merge in.
Side-effects:
 * Stop reporting None as displayname and avatar_url in some cases
 * Joining a room by alias populates guest-ness in join event
 * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
   been called on matrix.org according to logs
 * Stop recording access_token_id on /join/room_id - currently we don't
   record it on /join/room_alias; I can try to thread it through at some
   point. 
							
						 
						
							2016-02-12 15:11:49 +00:00  
				
					
						
							
							
								 
						
							
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
				
					
						
							
							
								 
						
							
							
								737c4223ef 
								
							
								 
							
						 
						
							
							
								
								Host /media/r0 as well as /media/v1  
							
							
							
						 
						
							2016-02-05 10:47:46 +00:00  
				
					
						
							
							
								 
						
							
							
								2df6114bc4 
								
							
								 
							
						 
						
							
							
								
								Log more diagnostics for unrecognised access tokens  
							
							
							
						 
						
							2016-02-02 19:21:49 +00:00  
				
					
						
							
							
								 
						
							
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
				
					
						
							
							
								 
						
							
							
								35981c8b71 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							
							
						 
						
							2016-01-28 17:20:05 +00:00  
				
					
						
							
							
								 
						
							
							
								8c6012a4af 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							2016-01-25 13:12:35 +00:00  
				
					
						
							
							
								 
						
							
							
								4021f95261 
								
							
								 
							
						 
						
							
							
								
								Move logic from rest/ to handlers/  
							
							
							
						 
						
							2016-01-25 10:10:44 +00:00  
				
					
						
							
							
								 
						
							
							
								975903ae17 
								
							
								 
							
						 
						
							
							
								
								Sanitize filters  
							
							
							
						 
						
							2016-01-22 10:41:30 +00:00  
				
					
						
							
							
								 
						
							
							
								808a8aedab 
								
							
								 
							
						 
						
							
							
								
								Don't error on AS non-ghost user use  
							
							... 
							
							
							
							This will probably go away either when we fix our existing ASes, or when
we kill the concept of non-ghost users. 
							
						 
						
							2016-01-18 16:33:05 +00:00  
				
					
						
							
							
								 
						
							
							
								74474a6d63 
								
							
								 
							
						 
						
							
							
								
								Pull out app service user lookup  
							
							... 
							
							
							
							I find this a lot simpler than nested try-catches and stuff 
							
						 
						
							2016-01-18 16:32:33 +00:00  
				
					
						
							
							
								 
						
							
							
								ac5a4477ad 
								
							
								 
							
						 
						
							
							
								
								Require unbanning before other membership changes  
							
							
							
						 
						
							2016-01-15 16:27:26 +00:00  
				
					
						
							
							
								 
						
							
							
								5819b7a78c 
								
							
								 
							
						 
						
							
							
								
								M_INVALID_USERNAME to be consistent with the parameter name  
							
							
							
						 
						
							2016-01-15 10:06:34 +00:00  
				
					
						
							
							
								 
						
							
							
								3f8db3d597 
								
							
								 
							
						 
						
							
							
								
								Add specific error code for invalid user names.  
							
							
							
						 
						
							2016-01-14 17:21:04 +00:00  
				
					
						
							
							
								 
						
							
							
								7d09ab8915 
								
							
								 
							
						 
						
							
							
								
								Require AS users to be registered before use  
							
							
							
						 
						
							2016-01-13 13:19:47 +00:00  
				
					
						
							
							
								 
						
							
							
								2110e35fd6 
								
							
								 
							
						 
						
							
							
								
								Introduce a Requester object  
							
							... 
							
							
							
							This tracks data about the entity which made the request. This is
instead of passing around a tuple, which requires call-site
modifications every time a new piece of optional context is passed
around.
I tried to introduce a User object. I gave up. 
							
						 
						
							2016-01-11 17:48:45 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								392773ccb2 
								
							
								 
							
						 
						
							
							
								
								Guest users must be joined to a room to see it in /sync  
							
							
							
						 
						
							2016-01-06 16:44:13 +00:00  
				
					
						
							
							
								 
						
							
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							
							
						 
						
							2016-01-05 18:01:18 +00:00  
				
					
						
							
							
								 
						
							
							
								0ee0138325 
								
							
								 
							
						 
						
							
							
								
								Include the list of bad room ids in the error  
							
							
							
						 
						
							2015-12-22 15:49:32 +00:00  
				
					
						
							
							
								 
						
							
							
								c058625959 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into markjh/guest_access  
							
							... 
							
							
							
							Conflicts:
	synapse/api/filtering.py 
							
						 
						
							2015-12-22 13:58:18 +00:00