Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e0910d0145 
								
							
								 
							
						 
						
							
							
								
								Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1  
							
							 
							
							... 
							
							
							
							Fixes  #4371  
							
						 
						
							2019-01-10 14:12:50 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								aa70d24125 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34  
							
							 
							
							
							
						 
						
							2019-01-10 12:58:33 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								566947ff34 
								
							
								 
							
						 
						
							
							
								
								Skip macaroon check for access tokens in the db  
							
							 
							
							
							
						 
						
							2019-01-10 12:57:21 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d2f7c4e6b1 
								
									
								
							
								 
							
						 
						
							
							
								
								create support user ( #4141 )  
							
							 
							
							... 
							
							
							
							Allow for the creation of a support user.
A support user can access the server, join rooms, interact with other users, but does not appear in the user directory nor does it contribute to monthly active user limits. 
							
						 
						
							2018-12-14 18:20:59 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								7e07d25ed6 
								
							
								 
							
						 
						
							
							
								
								Allow backslashes in event field filters  
							
							 
							
							... 
							
							
							
							Fixes a bug introduced in https://github.com/matrix-org/synapse/pull/1783  which
meant that single backslashes were not allowed in event field filters.
The intention here is to allow single-backslashes, but disallow
double-backslashes. 
							
						 
						
							2018-10-24 11:11:24 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								52ec6e9dfa 
								
									
								
							
								 
							
						 
						
							
							
								
								Port tests/ to Python 3 ( #3808 )  
							
							 
							
							
							
						 
						
							2018-09-07 02:58:18 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ea068d6f3c 
								
							
								 
							
						 
						
							
							
								
								fix bug where preserved threepid user comes to sign up and server is mau blocked  
							
							 
							
							
							
						 
						
							2018-08-31 10:49:14 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								05077e06fa 
								
							
								 
							
						 
						
							
							
								
								Change admin_uri to admin_contact in config and errors  
							
							 
							
							
							
						 
						
							2018-08-24 16:51:27 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e07970165f 
								
							
								 
							
						 
						
							
							
								
								rename error code  
							
							 
							
							
							
						 
						
							2018-08-18 14:39:45 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ba1fbf7d5b 
								
							
								 
							
						 
						
							
							
								
								special case server_notices_mxid  
							
							 
							
							
							
						 
						
							2018-08-18 12:31:08 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								13ad9930c8 
								
							
								 
							
						 
						
							
							
								
								add new error type ResourceLimit  
							
							 
							
							
							
						 
						
							2018-08-16 18:02:02 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								b8429c7c81 
								
							
								 
							
						 
						
							
							
								
								update error codes for resource limiting  
							
							 
							
							
							
						 
						
							2018-08-15 10:19:48 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ab035bdeac 
								
							
								 
							
						 
						
							
							
								
								replace admin_email with admin_uri for greater flexibility  
							
							 
							
							
							
						 
						
							2018-08-15 10:16:41 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								f4b49152e2 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							 
							
							
							
						 
						
							2018-08-13 21:09:47 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ce7de9ae6b 
								
							
								 
							
						 
						
							
							
								
								Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"  
							
							 
							
							... 
							
							
							
							This reverts commit 0d43f991a1 . 
							
						 
						
							2018-08-13 18:06:18 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								0d43f991a1 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							 
							
							
							
						 
						
							2018-08-13 18:00:23 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								99dd975dae 
								
									
								
							
								 
							
						 
						
							
							
								
								Run tests under PostgreSQL ( #3423 )  
							
							 
							
							
							
						 
						
							2018-08-13 16:47:46 +10:00  
						
					 
				
					
						
							
							
								 
								black
							
						 
						
							 
							
							
							
								
							
								8b3d9b6b19 
								
							
								 
							
						 
						
							
							
								
								Run black.  
							
							 
							
							
							
						 
						
							2018-08-10 23:54:09 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								42c6823827 
								
							
								 
							
						 
						
							
							
								
								disable HS from config  
							
							 
							
							
							
						 
						
							2018-08-04 22:07:04 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								d08296f9f2 
								
							
								 
							
						 
						
							
							
								
								remove unused import  
							
							 
							
							
							
						 
						
							2018-08-03 23:00:16 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								886be75ad1 
								
							
								 
							
						 
						
							
							
								
								bug fixes  
							
							 
							
							
							
						 
						
							2018-08-03 22:29:03 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								74b1d46ad9 
								
							
								 
							
						 
						
							
							
								
								do mau checks based on monthly_active_users table  
							
							 
							
							
							
						 
						
							2018-08-02 16:57:35 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								da7785147d 
								
									
								
							
								 
							
						 
						
							
							
								
								Python 3: Convert some unicode/bytes uses ( #3569 )  
							
							 
							
							
							
						 
						
							2018-08-02 00:54:06 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								f82cf3c7df 
								
							
								 
							
						 
						
							
							
								
								add test  
							
							 
							
							
							
						 
						
							2018-06-28 21:14:16 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								e72234f6bd 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2018-06-28 20:56:07 +01:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								566641a0b5 
								
							
								 
							
						 
						
							
							
								
								use jsonschema.FormatChecker for RoomID and UserID strings  
							
							 
							
							... 
							
							
							
							* use a valid filter in rest/client/v2_alpha test
Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:41 -03:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								acafcf1c5b 
								
							
								 
							
						 
						
							
							
								
								Add valid filter tests, flake8, fix typo  
							
							 
							
							... 
							
							
							
							Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:10 -03:00  
						
					 
				
					
						
							
							
								 
								pik
							
						 
						
							 
							
							
							
								
							
								e56c79c114 
								
							
								 
							
						 
						
							
							
								
								check_valid_filter using JSONSchema  
							
							 
							
							... 
							
							
							
							* add invalid filter tests
Signed-off-by: pik <alexander.maznev@gmail.com> 
							
						 
						
							2017-03-23 11:42:07 -03:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								5d6bad1b3c 
								
							
								 
							
						 
						
							
							
								
								Optimise state resolution  
							
							 
							
							
							
						 
						
							2017-01-17 13:22:19 +00:00  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ec609f8094 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2016-09-12 10:46:02 +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  
						
					 
				
					
						
							
							
								 
								Negar Fazeli
							
						 
						
							 
							
							
							
								
							
								0136a522b1 
								
							
								 
							
						 
						
							
							
								
								Bug fix: expire invalid access tokens  
							
							 
							
							
							
						 
						
							2016-07-13 15:00:37 +02: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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								5c79ef9396 
								
							
								 
							
						 
						
							
							
								
								Test Filter.filter_rooms  
							
							 
							
							... 
							
							
							
							Also check that the __repr__ method for FilterCollection does something
sensible. 
							
						 
						
							2016-02-19 17:55:28 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								700487a7c7 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 warnings for tests  
							
							 
							
							
							
						 
						
							2016-02-19 15:34:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								35981c8b71 
								
							
								 
							
						 
						
							
							
								
								Fix test  
							
							 
							
							
							
						 
						
							2016-01-28 17:20:05 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8c6012a4af 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2016-01-25 13:12:35 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								8f9c74e9f1 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2016-01-22 10:48:27 +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  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							 
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								cfd07aafff 
								
							
								 
							
						 
						
							
							
								
								Allow guests to upgrade their accounts  
							
							 
							
							
							
						 
						
							2016-01-05 18:01:18 +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  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								45cd2b0233 
								
							
								 
							
						 
						
							
							
								
								Refactor api.filtering to have a Filter API  
							
							 
							
							
							
						 
						
							2015-10-20 15:33:25 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8897781558 
								
							
								 
							
						 
						
							
							
								
								update filtering tests  
							
							 
							
							
							
						 
						
							2015-10-13 14:13:51 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								e255c2c32f 
								
							
								 
							
						 
						
							
							
								
								s/user_id/user/g for consistency  
							
							 
							
							
							
						 
						
							2015-09-01 12:41:16 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								81450fded8 
								
							
								 
							
						 
						
							
							
								
								Turn TODO into thing which actually will fail  
							
							 
							
							
							
						 
						
							2015-08-26 13:56:01 +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  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								a9d8bd95e7 
								
							
								 
							
						 
						
							
							
								
								Stop looking up "admin", which we never read  
							
							 
							
							
							
						 
						
							2015-08-25 16:29:39 +01:00