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  
				
					
						
							
							
								 
						
							
							
								aa70d24125 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34  
							
							
							
						 
						
							2019-01-10 12:58:33 +00:00  
				
					
						
							
							
								 
						
							
							
								566947ff34 
								
							
								 
							
						 
						
							
							
								
								Skip macaroon check for access tokens in the db  
							
							
							
						 
						
							2019-01-10 12:57:21 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								1737753a62 
								
							
								 
							
						 
						
							
							
								
								Add an option to enable recording IPs for appservice users ( #3831 )  
							
							
							
						 
						
							2018-12-04 12:44:41 +01:00  
				
					
						
							
							
								 
						
							
							
								301cb60d0b 
								
							
								 
							
						 
						
							
							
								
								assert rather than warn  
							
							
							
						 
						
							2018-08-31 17:29:35 +01:00  
				
					
						
							
							
								 
						
							
							
								0b01281e77 
								
							
								 
							
						 
						
							
							
								
								move threepid checker to config, add missing yields  
							
							
							
						 
						
							2018-08-31 17:11:11 +01:00  
				
					
						
							
							
								 
						
							
							
								e8e540630e 
								
							
								 
							
						 
						
							
							
								
								fix reference to is_threepid_reserved  
							
							
							
						 
						
							2018-08-31 16:09:15 +01:00  
				
					
						
							
							
								 
						
							
							
								09f3cf1a7e 
								
							
								 
							
						 
						
							
							
								
								ensure post registration auth checks do not fail erroneously  
							
							
							
						 
						
							2018-08-31 15:42:51 +01:00  
				
					
						
							
							
								 
						
							
							
								ea068d6f3c 
								
							
								 
							
						 
						
							
							
								
								fix bug where preserved threepid user comes to sign up and server is mau blocked  
							
							
							
						 
						
							2018-08-31 10:49:14 +01:00  
				
					
						
							
							
								 
						
							
							
								05077e06fa 
								
							
								 
							
						 
						
							
							
								
								Change admin_uri to admin_contact in config and errors  
							
							
							
						 
						
							2018-08-24 16:51:27 +01:00  
				
					
						
							
							
								 
						
							
							
								cd77270a66 
								
							
								 
							
						 
						
							
							
								
								Implement trail users  
							
							
							
						 
						
							2018-08-23 19:17:19 +01:00  
				
					
						
							
							
								 
						
							
							
								fd2dbf1836 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking  
							
							
							
						 
						
							2018-08-22 17:06:10 +01:00  
				
					
						
							
							
								 
						
							
							
								324525f40c 
								
									
								
							
								 
							
						 
						
							
							
								
								Port over enough to get some sytests running on Python 3 ( #3668 )  
							
							
							
						 
						
							2018-08-20 23:54:49 +10:00  
				
					
						
							
							
								 
						
							
							
								e07970165f 
								
							
								 
							
						 
						
							
							
								
								rename error code  
							
							
							
						 
						
							2018-08-18 14:39:45 +01:00  
				
					
						
							
							
								 
						
							
							
								c5171bf171 
								
							
								 
							
						 
						
							
							
								
								special case server_notices_mxid  
							
							
							
						 
						
							2018-08-18 12:33:07 +01:00  
				
					
						
							
							
								 
						
							
							
								69c49d3fa3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/limit_exceeded_error  
							
							
							
						 
						
							2018-08-17 12:44:26 +00:00  
				
					
						
							
							
								 
						
							
							
								bcfeb44afe 
								
							
								 
							
						 
						
							
							
								
								call reap on start up and fix under reaping bug  
							
							
							
						 
						
							2018-08-16 22:55:32 +01:00  
				
					
						
							
							
								 
						
							
							
								13ad9930c8 
								
							
								 
							
						 
						
							
							
								
								add new error type ResourceLimit  
							
							
							
						 
						
							2018-08-16 18:02:02 +01:00  
				
					
						
							
							
								 
						
							
							
								ab035bdeac 
								
							
								 
							
						 
						
							
							
								
								replace admin_email with admin_uri for greater flexibility  
							
							
							
						 
						
							2018-08-15 10:16:41 +01:00  
				
					
						
							
							
								 
						
							
							
								19b433e3f4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into neilj/admin_email  
							
							
							
						 
						
							2018-08-14 17:44:46 +01:00  
				
					
						
							
							
								 
						
							
							
								2545993ce4 
								
							
								 
							
						 
						
							
							
								
								make comments clearer  
							
							
							
						 
						
							2018-08-14 15:48:12 +01:00  
				
					
						
							
							
								 
						
							
							
								f4b49152e2 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							
							
						 
						
							2018-08-13 21:09:47 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0d43f991a1 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							
							
						 
						
							2018-08-13 18:00:23 +01:00  
				
					
						
							
							
								 
						
							
							
								885ea9c602 
								
							
								 
							
						 
						
							
							
								
								rename _user_last_seen_monthly_active  
							
							
							
						 
						
							2018-08-09 18:02:12 +01:00  
				
					
						
							
							
								 
						
							
							
								c1f9dec92a 
								
							
								 
							
						 
						
							
							
								
								fix errant parenthesis  
							
							
							
						 
						
							2018-08-09 17:43:26 +01:00  
				
					
						
							
							
								 
						
							
							
								09cf130898 
								
							
								 
							
						 
						
							
							
								
								only block on sync where user is not part of the mau cohort  
							
							
							
						 
						
							2018-08-09 17:39:12 +01:00  
				
					
						
							
							
								 
						
							
							
								7bcf126b18 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'neilj/mau_tracker' of github.com:matrix-org/synapse into neilj/disable_hs  
							
							
							
						 
						
							2018-08-06 21:39:44 +01:00  
				
					
						
							
							
								 
						
							
							
								1911c037cb 
								
							
								 
							
						 
						
							
							
								
								update comments to reflect new sig  
							
							
							
						 
						
							2018-08-06 18:01:46 +01:00  
				
					
						
							
							
								 
						
							
							
								42c6823827 
								
							
								 
							
						 
						
							
							
								
								disable HS from config  
							
							
							
						 
						
							2018-08-04 22:07:04 +01:00  
				
					
						
							
							
								 
						
							
							
								e10830e976 
								
							
								 
							
						 
						
							
							
								
								wip commit - tests failing  
							
							
							
						 
						
							2018-08-03 17:55:50 +01:00  
				
					
						
							
							
								 
						
							
							
								74b1d46ad9 
								
							
								 
							
						 
						
							
							
								
								do mau checks based on monthly_active_users table  
							
							
							
						 
						
							2018-08-02 16:57:35 +01:00  
				
					
						
							
							
								 
						
							
							
								00f99f74b1 
								
							
								 
							
						 
						
							
							
								
								insertion into monthly_active_users  
							
							
							
						 
						
							2018-08-02 13:47:19 +01:00  
				
					
						
							
							
								 
						
							
							
								da7785147d 
								
									
								
							
								 
							
						 
						
							
							
								
								Python 3: Convert some unicode/bytes uses ( #3569 )  
							
							
							
						 
						
							2018-08-02 00:54:06 +10:00  
				
					
						
							
							
								 
						
							
							
								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