7ca5c68233 
								
							
								 
							
						 
						
							
							
								
								Move deactivate_account into its own handler  
							
							... 
							
							
							
							Non-functional refactoring to move deactivate_account. This means that we'll be
able to properly deactivate devices and access tokens without introducing a
dependency loop. 
							
						 
						
							2017-11-29 16:44:35 +00:00  
				
					
						
							
							
								 
						
							
							
								2c6d63922a 
								
							
								 
							
						 
						
							
							
								
								Remove pushers when deleting access tokens  
							
							... 
							
							
							
							Whenever an access token is invalidated, we should remove the associated
pushers. 
							
						 
						
							2017-11-29 16:44:35 +00:00  
				
					
						
							
							
								 
						
							
							
								cdf6fc15b0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2686  from matrix-org/luke/as-flair  
							
							... 
							
							
							
							Add automagical AS Publicised Group(s) 
							
						 
						
							2017-11-17 10:13:46 +00:00  
				
					
						
							
							
								 
						
							
							
								34c3d0a386 
								
							
								 
							
						 
						
							
							
								
								typo  
							
							
							
						 
						
							2017-11-17 01:54:02 +00:00  
				
					
						
							
							
								 
						
							
							
								5b48eec4a1 
								
							
								 
							
						 
						
							
							
								
								Make sure we check AS groups for lookup on bulk  
							
							
							
						 
						
							2017-11-16 17:55:15 +00:00  
				
					
						
							
							
								 
						
							
							
								624a8bbd67 
								
							
								 
							
						 
						
							
							
								
								Fix auth handler  #2678  
							
							
							
						 
						
							2017-11-16 17:19:02 +00:00  
				
					
						
							
							
								 
						
							
							
								97bd18af4e 
								
							
								 
							
						 
						
							
							
								
								Add automagical AS Publicised Group(s)  
							
							... 
							
							
							
							via registration file "users" namespace:
```YAML
...
namespaces:
  users:
    - exclusive: true
      regex: '.*luke.*'
      group_id: '+all_the_lukes:hsdomain'
...
```
This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API. 
							
						 
						
							2017-11-16 16:44:55 +00:00  
				
					
						
							
							
								 
						
							
							
								1b83c09c03 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2675  from matrix-org/rav/remove_broken_logcontext_funcs  
							
							... 
							
							
							
							Remove preserve_context_over_{fn, deferred} 
							
						 
						
							2017-11-15 11:13:53 +00:00  
				
					
						
							
							
								 
						
							
							
								7e6fa29cb5 
								
							
								 
							
						 
						
							
							
								
								Remove preserve_context_over_{fn, deferred}  
							
							... 
							
							
							
							Both of these functions ae known to leak logcontexts. Replace the remaining
calls to them and kill them off. 
							
						 
						
							2017-11-14 11:22:42 +00:00  
				
					
						
							
							
								 
						
							
							
								44a1bfd6a6 
								
							
								 
							
						 
						
							
							
								
								Reshuffle room list request code  
							
							... 
							
							
							
							I'm not entirely sure if this will actually help anything, but it simplifies
the code and might give further clues about why room list search requests are
blowing out the get_current_state_ids caches. 
							
						 
						
							2017-11-14 10:29:58 +00:00  
				
					
						
							
							
								 
						
							
							
								1fc66c7460 
								
							
								 
							
						 
						
							
							
								
								Add a load of logging to the room_list handler  
							
							... 
							
							
							
							So we can see what it gets up to. 
							
						 
						
							2017-11-14 10:23:47 +00:00  
				
					
						
							
							
								 
						
							
							
								9b803ccc98 
								
							
								 
							
						 
						
							
							
								
								Revert "Allow upper-case characters in mxids"  
							
							... 
							
							
							
							This reverts commit b70b646903 
							
						 
						
							2017-11-09 21:57:24 +00:00  
				
					
						
							
							
								 
						
							
							
								b70b646903 
								
							
								 
							
						 
						
							
							
								
								Allow upper-case characters in mxids  
							
							... 
							
							
							
							Because we're never going to be able to fix this :'( 
							
						 
						
							2017-11-09 19:36:13 +00:00  
				
					
						
							
							
								 
						
							
							
								e8814410ef 
								
							
								 
							
						 
						
							
							
								
								Have an explicit API to update room config  
							
							
							
						 
						
							2017-11-08 16:13:27 +00:00  
				
					
						
							
							
								 
						
							
							
								94ff2cda73 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Modify group room association API to allow modification of is_public"  
							
							
							
						 
						
							2017-11-08 15:43:34 +00:00  
				
					
						
							
							
								 
						
							
							
								d305987b40 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2631  from xyzz/fix_appservice_event_backlog  
							
							... 
							
							
							
							Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services 
							
						 
						
							2017-11-08 11:54:10 +00:00  
				
					
						
							
							
								 
						
							
							
								02a9a93bde 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2649  from matrix-org/rav/fix_delta_on_state_res  
							
							... 
							
							
							
							Fix bug in state group storage 
							
						 
						
							2017-11-08 09:22:13 +00:00  
				
					
						
							
							
								 
						
							
							
								e148438e97 
								
							
								 
							
						 
						
							
							
								
								s/items/iteritems/  
							
							
							
						 
						
							2017-11-08 09:21:41 +00:00  
				
					
						
							
							
								 
						
							
							
								d46386d57e 
								
							
								 
							
						 
						
							
							
								
								Remove useless assignment in notify_interested_services  
							
							
							
						 
						
							2017-11-07 22:23:22 +03:00  
				
					
						
							
							
								 
						
							
							
								228ccf1fe3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2643  from matrix-org/matthew/user_dir_typos  
							
							... 
							
							
							
							Fix various embarrassing typos around user_directory and add some doc. 
							
						 
						
							2017-11-07 17:31:11 +00:00  
				
					
						
							
							
								 
						
							
							
								780dbb378f 
								
							
								 
							
						 
						
							
							
								
								Update deltas when doing auth resolution  
							
							... 
							
							
							
							Fixes a bug where the persisted state groups were different to those actually
being used after auth resolution. 
							
						 
						
							2017-11-07 16:43:00 +00:00  
				
					
						
							
							
								 
						
							
							
								1ca4288135 
								
							
								 
							
						 
						
							
							
								
								factor out _update_context_for_auth_events  
							
							... 
							
							
							
							This is duplicated, so let's factor it out before fixing it 
							
						 
						
							2017-11-07 16:43:00 +00:00  
				
					
						
							
							
								 
						
							
							
								5ef5e14ecc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2636  from farialima/me-master  
							
							... 
							
							
							
							Fix for #2635 : correctly update rooms avatar/display name when modified by admin 
							
						 
						
							2017-11-07 13:49:27 +00:00  
				
					
						
							
							
								 
						
							
							
								d1622e080f 
								
							
								 
							
						 
						
							
							
								
								s/intial/initial/  
							
							
							
						 
						
							2017-11-04 19:35:14 +00:00  
				
					
						
							
							
								 
						
							
							
								f103b91ffa 
								
							
								 
							
						 
						
							
							
								
								removed unused import flagged by flake8a  
							
							
							
						 
						
							2017-11-03 18:45:49 +01:00  
				
					
						
							
							
								 
						
							
							
								fa4f337b49 
								
							
								 
							
						 
						
							
							
								
								Fix for issue 2635: correctly update rooms avatar/display name when modified by admin  
							
							
							
						 
						
							2017-11-03 18:25:04 +01:00  
				
					
						
							
							
								 
						
							
							
								45fbe4ff67 
								
							
								 
							
						 
						
							
							
								
								Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services  
							
							
							
						 
						
							2017-11-02 22:49:43 +03:00  
				
					
						
							
							
								 
						
							
							
								1189be43a2 
								
							
								 
							
						 
						
							
							
								
								Factor _AccountHandler proxy out to ModuleApi  
							
							... 
							
							
							
							We're going to need to use this from places that aren't password auth, so let's
move it to a proper class. 
							
						 
						
							2017-11-02 14:36:11 +00:00  
				
					
						
							
							
								 
						
							
							
								b19d9e2174 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2624  from matrix-org/rav/password_provider_notify_logout  
							
							... 
							
							
							
							Notify auth providers on logout 
							
						 
						
							2017-11-02 10:55:17 +00:00  
				
					
						
							
							
								 
						
							
							
								1f080a6c97 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2623  from matrix-org/rav/callbacks_for_auth_providers  
							
							... 
							
							
							
							Allow password_auth_providers to return a callback 
							
						 
						
							2017-11-02 10:49:03 +00:00  
				
					
						
							
							
								 
						
							
							
								04897c9dc1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2622  from matrix-org/rav/db_access_for_auth_providers  
							
							... 
							
							
							
							Let auth providers get to the database 
							
						 
						
							2017-11-02 10:41:25 +00:00  
				
					
						
							
							
								 
						
							
							
								979eed4362 
								
							
								 
							
						 
						
							
							
								
								Fix user-interactive password auth  
							
							... 
							
							
							
							this got broken in the previous commit 
							
						 
						
							2017-11-01 17:03:20 +00:00  
				
					
						
							
							
								 
						
							
							
								bc8a5c0330 
								
							
								 
							
						 
						
							
							
								
								Notify auth providers on logout  
							
							... 
							
							
							
							Provide a hook by which auth providers can be notified of logouts. 
							
						 
						
							2017-11-01 16:51:51 +00:00  
				
					
						
							
							
								 
						
							
							
								4c8f94ac94 
								
							
								 
							
						 
						
							
							
								
								Allow password_auth_providers to return a callback  
							
							... 
							
							
							
							... so that they have a way to record access tokens. 
							
						 
						
							2017-11-01 16:51:03 +00:00  
				
					
						
							
							
								 
						
							
							
								846a94fbc9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2620  from matrix-org/rav/auth_non_password  
							
							... 
							
							
							
							Let password auth providers handle arbitrary login types 
							
						 
						
							2017-11-01 16:45:33 +00:00  
				
					
						
							
							
								 
						
							
							
								3cd6b22c7b 
								
							
								 
							
						 
						
							
							
								
								Let password auth providers handle arbitrary login types  
							
							... 
							
							
							
							Provide a hook where password auth providers can say they know about other
login types, and get passed the relevant parameters 
							
						 
						
							2017-11-01 16:43:57 +00:00  
				
					
						
							
							
								 
						
							
							
								4f0488b307 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_delete  
							
							
							
						 
						
							2017-11-01 16:20:19 +00:00  
				
					
						
							
							
								 
						
							
							
								e5e930aec3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2615  from matrix-org/rav/break_auth_device_dep  
							
							... 
							
							
							
							Break dependency of auth_handler on device_handler 
							
						 
						
							2017-11-01 16:06:31 +00:00  
				
					
						
							
							
								 
						
							
							
								fbbacb284e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2613  from matrix-org/rav/kill_refresh_tokens  
							
							... 
							
							
							
							Remove the last vestiges of refresh_tokens 
							
						 
						
							2017-11-01 15:57:35 +00:00  
				
					
						
							
							
								 
						
							
							
								dd13310fb8 
								
							
								 
							
						 
						
							
							
								
								Move access token deletion into auth handler  
							
							... 
							
							
							
							Also move duplicated deactivation code into the auth handler.
I want to add some hooks when we deactivate an access token, so let's bring it
all in here so that there's somewhere to put it. 
							
						 
						
							2017-11-01 15:46:22 +00:00  
				
					
						
							
							
								 
						
							
							
								74c56f794c 
								
							
								 
							
						 
						
							
							
								
								Break dependency of auth_handler on device_handler  
							
							... 
							
							
							
							I'm going to need to make the device_handler depend on the auth_handler, so I
need to break this dependency to avoid a cycle.
It turns out that the auth_handler was only using the device_handler in one
place which was an edge case which we can more elegantly handle by throwing an
error rather than fixing it up. 
							
						 
						
							2017-11-01 10:27:06 +00:00  
				
					
						
							
							
								 
						
							
							
								356bcafc44 
								
							
								 
							
						 
						
							
							
								
								Remove the last vestiges of refresh_tokens  
							
							
							
						 
						
							2017-10-31 20:35:58 +00:00  
				
					
						
							
							
								 
						
							
							
								3e0aaad190 
								
							
								 
							
						 
						
							
							
								
								Let auth providers get to the database  
							
							... 
							
							
							
							Somewhat open to abuse, but also somewhat unavoidable :/ 
							
						 
						
							2017-10-31 17:22:29 +00:00  
				
					
						
							
							
								 
						
							
							
								20fe347906 
								
							
								 
							
						 
						
							
							
								
								Modify group room association API to allow modification of is_public  
							
							... 
							
							
							
							also includes renamings to make things more consistent. 
							
						 
						
							2017-10-31 17:04:28 +00:00  
				
					
						
							
							
								 
						
							
							
								1b65ae00ac 
								
							
								 
							
						 
						
							
							
								
								Refactor some logic from LoginRestServlet into AuthHandler  
							
							... 
							
							
							
							I'm going to need some more flexibility in handling login types in password
auth providers, so as a first step, move some stuff from LoginRestServlet into
AuthHandler.
In particular, we pass everything other than SAML, JWT and token logins down to
the AuthHandler, which now has responsibility for checking the login type and
fishing the password out of the login dictionary, as well as qualifying the
user_id if need be. Ideally SAML, JWT and token would go that way too, but
there's no real need for it right now and I'm trying to minimise impact.
This commit *should* be non-functional. 
							
						 
						
							2017-10-31 10:48:41 +00:00  
				
					
						
							
							
								 
						
							
							
								110b373e9c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2589  from matrix-org/rav/as_deactivate_account  
							
							... 
							
							
							
							Allow ASes to deactivate their own users 
							
						 
						
							2017-10-27 12:29:32 +01:00  
				
					
						
							
							
								 
						
							
							
								785bd7fd75 
								
							
								 
							
						 
						
							
							
								
								Allow ASes to deactivate their own users  
							
							
							
						 
						
							2017-10-27 00:01:00 +01:00  
				
					
						
							
							
								 
						
							
							
								566e21eac8 
								
							
								 
							
						 
						
							
							
								
								Update room_list.py  
							
							
							
						 
						
							2017-10-26 11:39:54 +01:00  
				
					
						
							
							
								 
						
							
							
								2a7e9faeec 
								
							
								 
							
						 
						
							
							
								
								Do logcontexts outside ResponseCache  
							
							
							
						 
						
							2017-10-25 15:21:08 +01:00  
				
					
						
							
							
								 
						
							
							
								33a9026cdf 
								
							
								 
							
						 
						
							
							
								
								Add logging and fix log contexts for publicRooms  
							
							
							
						 
						
							2017-10-25 10:26:06 +01:00