Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1529c19675 
								
							
								 
							
						 
						
							
							
								
								Prevent user tokens being used as guest tokens ( #1675 )  
							
							 
							
							... 
							
							
							
							Make sure that a user cannot pretend to be a guest by adding 'guest = True'
caveats. 
							
						 
						
							2016-12-06 15:31:37 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								aa09d6b8f0 
								
							
								 
							
						 
						
							
							
								
								Rip out more refresh_token code  
							
							 
							
							... 
							
							
							
							We might as well treat all refresh_tokens as invalid. Just return a 403 from
/tokenrefresh, so that we don't have a load of dead, untestable code hanging
around.
Still TODO: removing the table from the schema. 
							
						 
						
							2016-11-30 17:40:18 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								321fe5c44c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1656  from matrix-org/rav/remove_time_caveat  
							
							 
							
							... 
							
							
							
							Stop putting a time caveat on access tokens 
							
						 
						
							2016-11-30 16:53:20 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								4febfe47f0 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							 
							
							... 
							
							
							
							Update comments in verify_macaroon 
							
						 
						
							2016-11-30 07:36:32 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								77eca2487c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1653  from matrix-org/rav/guest_e2e  
							
							 
							
							... 
							
							
							
							Implement E2E for guests 
							
						 
						
							2016-11-29 17:41:35 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								1c4f05db41 
								
							
								 
							
						 
						
							
							
								
								Stop putting a time caveat on access tokens  
							
							 
							
							... 
							
							
							
							The 'time' caveat on the access tokens was something of a lie, since we weren't
enforcing it; more pertinently its presence stops us ever adding useful time
caveats.
Let's move in the right direction by not lying in our caveats. 
							
						 
						
							2016-11-29 16:49:41 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7f02e4d008 
								
							
								 
							
						 
						
							
							
								
								Give guest users a device_id  
							
							 
							
							... 
							
							
							
							We need to create devices for guests so that they can use e2e, but we don't
have anywhere to store it, so just use a fixed one. 
							
						 
						
							2016-11-25 15:25:30 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e1d7c96814 
								
							
								 
							
						 
						
							
							
								
								Remove redundant list of known caveat prefixes  
							
							 
							
							... 
							
							
							
							Also add some comments. 
							
						 
						
							2016-11-24 12:38:17 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								177f104432 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1098  from matrix-org/markjh/bearer_token  
							
							 
							
							... 
							
							
							
							Allow clients to supply access_tokens as headers 
							
						 
						
							2016-10-25 17:33:15 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								07caa749bf 
								
							
								 
							
						 
						
							
							
								
								Closing brace on following line  
							
							 
							
							
							
						 
						
							2016-10-20 12:07:16 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								f09db236b1 
								
							
								 
							
						 
						
							
							
								
								as_user->app_service, less redundant comments, better positioned comments  
							
							 
							
							
							
						 
						
							2016-10-20 12:04:54 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								8bfd01f619 
								
							
								 
							
						 
						
							
							
								
								flake8  
							
							 
							
							
							
						 
						
							2016-10-20 11:52:46 +01:00  
						
					 
				
					
						
							
							
								 
								Luke Barnard
							
						 
						
							 
							
							
							
								
							
								1b17d1a106 
								
							
								 
							
						 
						
							
							
								
								Use real AS object by passing it through the requester  
							
							 
							
							... 
							
							
							
							This means synapse does not have to check if the AS is interested, but instead it effectively re-uses what it already knew about the requesting user 
							
						 
						
							2016-10-20 11:43:05 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a2f2516199 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1157  from Rugvip/nolimit  
							
							 
							
							... 
							
							
							
							Remove rate limiting from app service senders and fix get_or_create_user requester 
							
						 
						
							2016-10-11 11:20:54 +01:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								9bfc617791 
								
							
								 
							
						 
						
							
							
								
								storage/appservice: make appservice methods only relying on the cache synchronous  
							
							 
							
							
							
						 
						
							2016-10-06 15:24:59 +02:00  
						
					 
				
					
						
							
							
								 
								Patrik Oldsberg
							
						 
						
							 
							
							
							
								
							
								24a70e19c7 
								
							
								 
							
						 
						
							
							
								
								api/auth: fix for not being allowed to set your own state_key  
							
							 
							
							... 
							
							
							
							Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com> 
							
						 
						
							2016-09-30 13:08:25 +02:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f96020550f 
								
							
								 
							
						 
						
							
							
								
								Update comments  
							
							 
							
							
							
						 
						
							2016-09-22 12:54:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2e9ee30969 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							 
							
							
							
						 
						
							2016-09-22 11:59:46 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a61e4522b5 
								
							
								 
							
						 
						
							
							
								
								Shuffle things around to make unit tests work  
							
							 
							
							
							
						 
						
							2016-09-22 11:08:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1168cbd54d 
								
							
								 
							
						 
						
							
							
								
								Allow invites via 3pid to bypass sender sig check  
							
							 
							
							... 
							
							
							
							When a server sends a third party invite another server may be the one
that the inviting user registers with. In this case it is that remote
server that will issue an actual invitation, and wants to do it "in the
name of" the original invitee. However, the new proper invite will not
be signed by the original server, and thus other servers would reject
the invite if it was seen as coming from the original user.
To fix this, a special case has been added to the auth rules whereby
another server can send an invite "in the name of" another server's
user, so long as that user had previously issued a third party invite
that is now being accepted. 
							
						 
						
							2016-09-22 10:56:53 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ec609f8094 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2016-09-12 10:46:02 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8e01263587 
								
							
								 
							
						 
						
							
							
								
								Allow clients to supply access_tokens as headers  
							
							 
							
							... 
							
							
							
							Clients can continue to supply access tokens as query parameters
or can supply the token as a header:
   Authorization: Bearer <access_token_goes_here>
This matches the ouath2 format of
https://tools.ietf.org/html/rfc6750#section-2.1  
							
						 
						
							2016-09-09 18:17:42 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed7a703d4c 
								
							
								 
							
						 
						
							
							
								
								Handle the fact that workers can't generate state groups  
							
							 
							
							
							
						 
						
							2016-08-31 15:53:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c10cb581c6 
								
							
								 
							
						 
						
							
							
								
								Correctly handle the difference between prev and current state  
							
							 
							
							
							
						 
						
							2016-08-31 14:26:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								1ccdc1e93a 
								
							
								 
							
						 
						
							
							
								
								Cache check_host_in_room  
							
							 
							
							
							
						 
						
							2016-08-26 10:59:40 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								25414b44a2 
								
							
								 
							
						 
						
							
							
								
								Add measure on check_host_in_room  
							
							 
							
							
							
						 
						
							2016-08-26 10:47:00 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0e1900d819 
								
							
								 
							
						 
						
							
							
								
								Pull out full state less  
							
							 
							
							
							
						 
						
							2016-08-25 18:15:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								a3dc1e9cbe 
								
							
								 
							
						 
						
							
							
								
								Replace context.current_state with context.current_state_ids  
							
							 
							
							
							
						 
						
							2016-08-25 17:32:22 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6fe6a6f029 
								
							
								 
							
						 
						
							
							
								
								Fix login with m.login.token  
							
							 
							
							... 
							
							
							
							login with token (as used by CAS auth) was broken by 067596d , such that it
always returned a 401. 
							
						 
						
							2016-08-08 16:40:39 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								c824b29e77 
								
							
								 
							
						 
						
							
							
								
								Check if the user is banned when handling 3pid invites  
							
							 
							
							
							
						 
						
							2016-07-26 16:39:14 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								053e83dafb 
								
							
								 
							
						 
						
							
							
								
								More doc-comments  
							
							 
							
							... 
							
							
							
							Fix some more comments on some things 
							
						 
						
							2016-07-20 16:40:28 +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
							
						 
						
							 
							
							
							
								
							
								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
							
						 
						
							 
							
							
							
								
							
								ebdafd8114 
								
							
								 
							
						 
						
							
							
								
								Check sender signed event  
							
							 
							
							
							
						 
						
							2016-07-14 17:03:24 +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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								812b5de0fe 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe  
							
							 
							
							
							
						 
						
							2016-06-02 15:33:28 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								991af8b0d6 
								
							
								 
							
						 
						
							
							
								
								WIP on unsubscribing email notifs without logging in  
							
							 
							
							
							
						 
						
							2016-06-01 17:40:52 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1a3a2002ff 
								
							
								 
							
						 
						
							
							
								
								Spell "domain" correctly  
							
							 
							
							... 
							
							
							
							s/domian/domain/g 
							
						 
						
							2016-05-16 19:17:23 +01:00  
						
					 
				
					
						
							
							
								 
								Negi Fazeli
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								08dfa8eee2 
								
							
								 
							
						 
						
							
							
								
								Add and use get_domian_from_id  
							
							 
							
							
							
						 
						
							2016-05-09 10:36:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0f2ca8cde1 
								
							
								 
							
						 
						
							
							
								
								Measure Auth.check  
							
							 
							
							
							
						 
						
							2016-04-13 11:15:59 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								c53f9d561e 
								
							
								 
							
						 
						
							
							
								
								Don't auto log failed auth checks  
							
							 
							
							
							
						 
						
							2016-04-13 11:11:46 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e7fac0d56 
								
							
								 
							
						 
						
							
							
								
								Add published room list edit API  
							
							 
							
							
							
						 
						
							2016-03-21 15:06:07 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								577951b032 
								
							
								 
							
						 
						
							
							
								
								Allow third_party_signed to be specified on /join  
							
							 
							
							
							
						 
						
							2016-02-23 15:11:25 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2c1fbea531 
								
							
								 
							
						 
						
							
							
								
								Fix up logcontexts  
							
							 
							
							
							
						 
						
							2016-02-08 14:26:45 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2df6114bc4 
								
							
								 
							
						 
						
							
							
								
								Log more diagnostics for unrecognised access tokens  
							
							 
							
							
							
						 
						
							2016-02-02 19:21:49 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								d83d004ccd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for new flake8  
							
							 
							
							
							
						 
						
							2016-02-02 17:18:50 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								7d09ab8915 
								
							
								 
							
						 
						
							
							
								
								Require AS users to be registered before use  
							
							 
							
							
							
						 
						
							2016-01-13 13:19:47 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							 
							
							
							
						 
						
							2016-01-05 18:01:18 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								8c5f252edb 
								
							
								 
							
						 
						
							
							
								
								Strip address and such out of 3pid invites  
							
							 
							
							... 
							
							
							
							We're not meant to leak that into the graph 
							
						 
						
							2015-12-17 18:09:51 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								17dd5071ef 
								
							
								 
							
						 
						
							
							
								
								Allow user to redact with an equal power  
							
							 
							
							... 
							
							
							
							Users only need their power level to be equal to the redact level for
them to be allowed to redact events. 
							
						 
						
							2015-11-26 11:17:57 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								1cfda3d2d8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/forgetrooms  
							
							 
							
							
							
						 
						
							2015-11-19 16:53:13 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								248cfd5eb3 
								
							
								 
							
						 
						
							
							
								
								Take a boolean not a list of lambdas  
							
							 
							
							
							
						 
						
							2015-11-19 15:16:25 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								ba26eb3d5d 
								
							
								 
							
						 
						
							
							
								
								Allow users to forget rooms  
							
							 
							
							
							
						 
						
							2015-11-17 17:17:30 -05:00  
						
					 
				
					
						
							
							
								 
								Steven Hammerton
							
						 
						
							 
							
							
							
								
							
								f20d064e05 
								
							
								 
							
						 
						
							
							
								
								Always check guest = true in macaroons  
							
							 
							
							
							
						 
						
							2015-11-17 10:58:05 +00:00  
						
					 
				
					
						
							
							
								 
								Steven Hammerton
							
						 
						
							 
							
							
							
								
							
								dd2eb49385 
								
							
								 
							
						 
						
							
							
								
								Share more code between macaroon validation  
							
							 
							
							
							
						 
						
							2015-11-11 11:12:35 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								2cebe53545 
								
							
								 
							
						 
						
							
							
								
								Exchange 3pid invites for m.room.member invites  
							
							 
							
							
							
						 
						
							2015-11-05 16:43:19 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								f522f50a08 
								
							
								 
							
						 
						
							
							
								
								Allow guests to register and call /events?room_id=  
							
							 
							
							... 
							
							
							
							This follows the same flows-based flow as regular registration, but as
the only implemented flow has no requirements, it auto-succeeds. In the
future, other flows (e.g. captcha) may be required, so clients should
treat this like the regular registration flow choices. 
							
						 
						
							2015-11-04 17:29:07 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e60dad86ba 
								
							
								 
							
						 
						
							
							
								
								Reject events which are too large  
							
							 
							
							... 
							
							
							
							SPEC-222 
							
						 
						
							2015-10-22 11:44:31 +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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0e5239ffc3 
								
							
								 
							
						 
						
							
							
								
								Stuff signed data in a standalone object  
							
							 
							
							... 
							
							
							
							Makes both generating it in sydent, and verifying it here, simpler at
the cost of some repetition 
							
						 
						
							2015-10-16 17:45:48 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								c225d63e9e 
								
							
								 
							
						 
						
							
							
								
								Add signing host and keyname to signatures  
							
							 
							
							
							
						 
						
							2015-10-16 15:07:56 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b8dd5b1a2d 
								
							
								 
							
						 
						
							
							
								
								Verify third party ID server certificates  
							
							 
							
							
							
						 
						
							2015-10-16 14:54:54 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								0c38e8637f 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary class-wrapping  
							
							 
							
							
							
						 
						
							2015-10-13 18:00:38 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								95e53ac535 
								
							
								 
							
						 
						
							
							
								
								Add some docstring  
							
							 
							
							
							
						 
						
							2015-10-13 17:18:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								17dffef5ec 
								
							
								 
							
						 
						
							
							
								
								Move event contents into third_party_layout field  
							
							 
							
							
							
						 
						
							2015-10-13 15:48:12 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								1cacc71050 
								
							
								 
							
						 
						
							
							
								
								Add third party invites to auth_events for joins  
							
							 
							
							
							
						 
						
							2015-10-06 10:13:28 -05:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								58e6a58eb7 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into daniel/3pidinvites  
							
							 
							
							
							
						 
						
							2015-10-05 10:33:41 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d5e081c7ae 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							 
							
							
							
						 
						
							2015-10-02 10:33:49 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								5b3e9713dd 
								
							
								 
							
						 
						
							
							
								
								Implement third party identifier invites  
							
							 
							
							
							
						 
						
							2015-10-01 17:49:52 +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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8e3bbc9bd0 
								
							
								 
							
						 
						
							
							
								
								Clarify which event is returned by check_user_was_in_room  
							
							 
							
							
							
						 
						
							2015-09-21 13:47:44 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d59acb8c5b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable  
							
							 
							
							
							
						 
						
							2015-09-14 18:05:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								91cb3b630d 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #265  from matrix-org/erikj/check_room_exists  
							
							 
							
							... 
							
							
							
							Check room exists when authenticating an event 
							
						 
						
							2015-09-14 17:56:18 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1d579df664 
								
							
								 
							
						 
						
							
							
								
								Allow rooms/{roomId}/state for a room that has been left  
							
							 
							
							
							
						 
						
							2015-09-09 14:12:24 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								89ae0166de 
								
							
								 
							
						 
						
							
							
								
								Allow room initialSync for users that have left the room, returning a snapshot of how the room was when they left it  
							
							 
							
							
							
						 
						
							2015-09-09 13:25:22 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9b05ef6f39 
								
							
								 
							
						 
						
							
							
								
								Also check the domains for membership state_keys  
							
							 
							
							
							
						 
						
							2015-09-01 16:17:25 +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
							
						 
						
							 
							
							
							
								
							
								a88e16152f 
								
							
								 
							
						 
						
							
							
								
								Add flag which disables federation of the room  
							
							 
							
							
							
						 
						
							2015-09-01 15:47:30 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								00149c063b 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2015-09-01 15:42:03 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ab9e01809d 
								
							
								 
							
						 
						
							
							
								
								Check room exists when authenticating an event, by asserting they reference a creation event  
							
							 
							
							
							
						 
						
							2015-09-01 15:21:24 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e255c2c32f 
								
							
								 
							
						 
						
							
							
								
								s/user_id/user/g for consistency  
							
							 
							
							
							
						 
						
							2015-09-01 12:41:16 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								b854a375b0 
								
							
								 
							
						 
						
							
							
								
								Check domain of events properly  
							
							 
							
							... 
							
							
							
							Federated servers still need to delegate authority to owning servers 
							
						 
						
							2015-09-01 11:53:31 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								8256a8ece7 
								
							
								 
							
						 
						
							
							
								
								Allow users to redact their own events  
							
							 
							
							
							
						 
						
							2015-08-28 15:31:49 +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