8aee5aa068 
								
							
								 
							
						 
						
							
							
								
								Add helper function for getting access_tokens from requests  
							
							... 
							
							
							
							Rather than reimplementing the token parsing in the various places.
This will make it easier to change the token parsing to allow access_tokens
in HTTP headers. 
							
						 
						
							2016-09-09 16:33:15 +01:00  
				
					
						
							
							
								 
						
							
							
								ed7a703d4c 
								
							
								 
							
						 
						
							
							
								
								Handle the fact that workers can't generate state groups  
							
							
							
						 
						
							2016-08-31 15:53:19 +01:00  
				
					
						
							
							
								 
						
							
							
								c10cb581c6 
								
							
								 
							
						 
						
							
							
								
								Correctly handle the difference between prev and current state  
							
							
							
						 
						
							2016-08-31 14:26:22 +01:00  
				
					
						
							
							
								 
						
							
							
								1ccdc1e93a 
								
							
								 
							
						 
						
							
							
								
								Cache check_host_in_room  
							
							
							
						 
						
							2016-08-26 10:59:40 +01:00  
				
					
						
							
							
								 
						
							
							
								25414b44a2 
								
							
								 
							
						 
						
							
							
								
								Add measure on check_host_in_room  
							
							
							
						 
						
							2016-08-26 10:47:00 +01:00  
				
					
						
							
							
								 
						
							
							
								30961182f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids  
							
							
							
						 
						
							2016-08-26 09:48:13 +01:00  
				
					
						
							
							
								 
						
							
							
								1294d4a329 
								
							
								 
							
						 
						
							
							
								
								Move ThirdPartyEntityKind into api.constants so the expectation becomes that the value is significant  
							
							
							
						 
						
							2016-08-25 18:34:47 +01:00  
				
					
						
							
							
								 
						
							
							
								0e1900d819 
								
							
								 
							
						 
						
							
							
								
								Pull out full state less  
							
							
							
						 
						
							2016-08-25 18:15:51 +01:00  
				
					
						
							
							
								 
						
							
							
								142983b4ea 
								
							
								 
							
						 
						
							
							
								
								APP_SERVICE_PREFIX is never used; don't bother  
							
							
							
						 
						
							2016-08-25 18:06:05 +01:00  
				
					
						
							
							
								 
						
							
							
								a3dc1e9cbe 
								
							
								 
							
						 
						
							
							
								
								Replace context.current_state with context.current_state_ids  
							
							
							
						 
						
							2016-08-25 17:32:22 +01:00  
				
					
						
							
							
								 
						
							
							
								6fe6a6f029 
								
							
								 
							
						 
						
							
							
								
								Fix login with m.login.token  
							
							... 
							
							
							
							login with token (as used by CAS auth) was broken by 067596d 
							
						 
						
							2016-08-08 16:40:39 +01:00  
				
					
						
							
							
								 
						
							
							
								c63b1697f4 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #952  from matrix-org/markjh/more_fixes  
							
							... 
							
							
							
							Check if the user is banned when handling 3pid invites 
							
						 
						
							2016-07-26 19:20:56 +01:00  
				
					
						
							
							
								 
						
							
							
								eb359eced4 
								
							
								 
							
						 
						
							
							
								
								Add `create_requester` function  
							
							... 
							
							
							
							Wrap the `Requester` constructor with a function which provides sensible
defaults, and use it throughout 
							
						 
						
							2016-07-26 16:46:53 +01:00  
				
					
						
							
							
								 
						
							
							
								c824b29e77 
								
							
								 
							
						 
						
							
							
								
								Check if the user is banned when handling 3pid invites  
							
							
							
						 
						
							2016-07-26 16:39:14 +01:00  
				
					
						
							
							
								 
						
							
							
								ec041b335e 
								
							
								 
							
						 
						
							
							
								
								Record device_id in client_ips  
							
							... 
							
							
							
							Record the device_id when we add a client ip; it's somewhat redundant as we
could get it via the access_token, but it will make querying rather easier. 
							
						 
						
							2016-07-20 16:41:03 +01:00  
				
					
						
							
							
								 
						
							
							
								053e83dafb 
								
							
								 
							
						 
						
							
							
								
								More doc-comments  
							
							... 
							
							
							
							Fix some more comments on some things 
							
						 
						
							2016-07-20 16:40:28 +01:00  
				
					
						
							
							
								 
						
							
							
								1e2a7f18a1 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #922  from matrix-org/erikj/file_api2  
							
							... 
							
							
							
							Feature: Add filter to /messages. Add 'contains_url' to filter. 
							
						 
						
							2016-07-20 10:40:48 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e5142f65a6 
								
							
								 
							
						 
						
							
							
								
								Add 'contains_url' to filter  
							
							
							
						 
						
							2016-07-14 15:35:48 +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