536bc63a4e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into erikj/client_apis_move  
							
							
							
						 
						
							2018-07-24 09:57:05 +01:00  
				
					
						
							
							
								 
						
							
							
								e42510ba63 
								
							
								 
							
						 
						
							
							
								
								Use new getters  
							
							
							
						 
						
							2018-07-23 13:17:22 +01:00  
				
					
						
							
							
								 
						
							
							
								0ecf68aedc 
								
							
								 
							
						 
						
							
							
								
								Move check_in_room_or_world_readable to Auth  
							
							
							
						 
						
							2018-07-20 15:30:59 +01:00  
				
					
						
							
							
								 
						
							
							
								33b60c01b5 
								
									
								
							
								 
							
						 
						
							
							
								
								Make auth & transactions more testable ( #3499 )  
							
							
							
						 
						
							2018-07-14 07:34:49 +10:00  
				
					
						
							
							
								 
						
							
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
				
					
						
							
							
								 
						
							
							
								f4f1cda928 
								
							
								 
							
						 
						
							
							
								
								add ip_range_whitelist parameter to limit where ASes can connect from  
							
							
							
						 
						
							2018-06-28 20:32:00 +01:00  
				
					
						
							
							
								 
						
							
							
								ec1e799e17 
								
							
								 
							
						 
						
							
							
								
								Don't print invalid access tokens in the logs  
							
							... 
							
							
							
							Tokens shouldn't be appearing the logs, valid or invalid. 
Signed-off-by: Travis Ralston <travpc@gmail.com> 
							
						 
						
							2018-06-24 12:17:01 -06:00  
				
					
						
							
							
								 
						
							
							
								557b686eac 
								
							
								 
							
						 
						
							
							
								
								Refactor get_send_level to take a power_levels event  
							
							... 
							
							
							
							it makes it easier for me to reason about 
							
						 
						
							2018-06-14 11:26:27 +01:00  
				
					
						
							
							
								 
						
							
							
								c936a52a9e 
								
									
								
							
								 
							
						 
						
							
							
								
								Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy ( #3307 )  
							
							
							
						 
						
							2018-05-31 19:03:47 +10:00  
				
					
						
							
							
								 
						
							
							
								df9f72d9e5 
								
							
								 
							
						 
						
							
							
								
								replacing portions  
							
							
							
						 
						
							2018-05-21 19:47:37 -05:00  
				
					
						
							
							
								 
						
							
							
								6168351877 
								
							
								 
							
						 
						
							
							
								
								Add b prefixes to some strings that are bytes in py3  
							
							... 
							
							
							
							This has no effect on python2
Signed-off-by: Adrian Tschira <nota@notafile.com> 
							
						 
						
							2018-04-04 13:48:51 +02:00  
				
					
						
							
							
								 
						
							
							
								da562bd6a1 
								
							
								 
							
						 
						
							
							
								
								Improve comments on get_user_by_access_token  
							
							... 
							
							
							
							because I have to reverse-engineer this every time. 
							
						 
						
							2017-11-29 15:52:41 +00:00  
				
					
						
							
							
								 
						
							
							
								aa620d09a0 
								
							
								 
							
						 
						
							
							
								
								Add a config option to block all room invites ( #2457 )  
							
							... 
							
							
							
							- allows sysadmins the ability to lock down their servers so that people can't
send their users room invites. 
							
						 
						
							2017-09-19 16:08:14 +01:00  
				
					
						
							
							
								 
						
							
							
								ed9a7f5436 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2309  from matrix-org/erikj/user_ip_repl  
							
							... 
							
							
							
							Fix up user_ip replication commands 
							
						 
						
							2017-07-06 14:33:14 +01:00  
				
					
						
							
							
								 
						
							
							
								2c365f4723 
								
							
								 
							
						 
						
							
							
								
								Cache macaroon parse and validation  
							
							... 
							
							
							
							Turns out this can be quite expensive for requests, and is easily
cachable. We don't cache the lookup to the DB so invalidation still
works. 
							
						 
						
							2017-06-29 14:50:18 +01:00  
				
					
						
							
							
								 
						
							
							
								8c23221666 
								
							
								 
							
						 
						
							
							
								
								Fix up  
							
							
							
						 
						
							2017-06-27 15:53:45 +01:00  
				
					
						
							
							
								 
						
							
							
								ed3d0170d9 
								
							
								 
							
						 
						
							
							
								
								Batch upsert user ips  
							
							
							
						 
						
							2017-06-27 13:37:04 +01:00  
				
					
						
							
							
								 
						
							
							
								0185b75381 
								
							
								 
							
						 
						
							
							
								
								Change is_host_joined to use current_state table  
							
							... 
							
							
							
							This bypasses a bug where using the state groups to figure out if a host
is in a room sometimes errors if the servers isn't in the room. (For
example when the server rejected an invite to a remote room) 
							
						 
						
							2017-06-09 10:52:26 +01:00  
				
					
						
							
							
								 
						
							
							
								19b9366d73 
								
							
								 
							
						 
						
							
							
								
								Fix a couple of logcontext leaks  
							
							... 
							
							
							
							Use preserve_fn to correctly manage the logcontexts around things we don't want
to yield on. 
							
						 
						
							2017-03-23 00:17:46 +00:00  
				
					
						
							
							
								 
						
							
							
								5f027d1fc5 
								
							
								 
							
						 
						
							
							
								
								Change resolve_state_groups call site logging to DEBUG  
							
							
							
						 
						
							2017-01-17 17:07:15 +00:00  
				
					
						
							
							
								 
						
							
							
								e178feca3f 
								
							
								 
							
						 
						
							
							
								
								Remove unused function  
							
							
							
						 
						
							2017-01-13 15:16:45 +00:00  
				
					
						
							
							
								 
						
							
							
								8b2fa38256 
								
							
								 
							
						 
						
							
							
								
								Split event auth code into seperate module  
							
							
							
						 
						
							2017-01-13 15:07:32 +00:00  
				
					
						
							
							
								 
						
							
							
								7e6c2937c3 
								
							
								 
							
						 
						
							
							
								
								Split out static auth methods from Auth object  
							
							
							
						 
						
							2017-01-10 18:16:54 +00:00  
				
					
						
							
							
								 
						
							
							
								c18f7fc410 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 and update changelog  
							
							
							
						 
						
							2017-01-05 13:50:22 +00:00  
				
					
						
							
							
								 
						
							
							
								d79d165761 
								
							
								 
							
						 
						
							
							
								
								add logging for all the places we call resolve_state_groups. my kingdom for a backtrace that actually works.  
							
							
							
						 
						
							2017-01-05 13:40:39 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4febfe47f0 
								
							
								 
							
						 
						
							
							
								
								Comments  
							
							... 
							
							
							
							Update comments in verify_macaroon 
							
						 
						
							2016-11-30 07:36:32 +00:00  
				
					
						
							
							
								 
						
							
							
								77eca2487c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1653  from matrix-org/rav/guest_e2e  
							
							... 
							
							
							
							Implement E2E for guests 
							
						 
						
							2016-11-29 17:41:35 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								e1d7c96814 
								
							
								 
							
						 
						
							
							
								
								Remove redundant list of known caveat prefixes  
							
							... 
							
							
							
							Also add some comments. 
							
						 
						
							2016-11-24 12:38:17 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								07caa749bf 
								
							
								 
							
						 
						
							
							
								
								Closing brace on following line  
							
							
							
						 
						
							2016-10-20 12:07:16 +01:00  
				
					
						
							
							
								 
						
							
							
								f09db236b1 
								
							
								 
							
						 
						
							
							
								
								as_user->app_service, less redundant comments, better positioned comments  
							
							
							
						 
						
							2016-10-20 12:04:54 +01:00  
				
					
						
							
							
								 
						
							
							
								8bfd01f619 
								
							
								 
							
						 
						
							
							
								
								flake8  
							
							
							
						 
						
							2016-10-20 11:52:46 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								9bfc617791 
								
							
								 
							
						 
						
							
							
								
								storage/appservice: make appservice methods only relying on the cache synchronous  
							
							
							
						 
						
							2016-10-06 15:24:59 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f96020550f 
								
							
								 
							
						 
						
							
							
								
								Update comments  
							
							
							
						 
						
							2016-09-22 12:54:22 +01:00  
				
					
						
							
							
								 
						
							
							
								2e9ee30969 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							
							
						 
						
							2016-09-22 11:59:46 +01:00  
				
					
						
							
							
								 
						
							
							
								a61e4522b5 
								
							
								 
							
						 
						
							
							
								
								Shuffle things around to make unit tests work  
							
							
							
						 
						
							2016-09-22 11:08:12 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ec609f8094 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							
							
						 
						
							2016-09-12 10:46:02 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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