Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ad010f6306 
								
							
								 
							
						 
						
							
							
								
								Remove usage of request.postpath  
							
							 
							
							... 
							
							
							
							This is an undocumented variable in twisted, and relies on the servlet
being mounted in the right way.
This also breaks getting push rules on workers. 
							
						 
						
							2019-04-16 17:42:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ec638a1602 
								
							
								 
							
						 
						
							
							
								
								Only handle GET requests for /push_rules  
							
							 
							
							
							
						 
						
							2019-04-15 18:51:48 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								fd96dd75a3 
								
							
								 
							
						 
						
							
							
								
								Fix non-ASCII pushrules ( #4248 )  
							
							 
							
							
							
						 
						
							2018-12-04 12:44:02 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								02aa41809b 
								
									
								
							
								 
							
						 
						
							
							
								
								Port rest/ to Python 3 ( #3823 )  
							
							 
							
							
							
						 
						
							2018-09-12 20:41:31 +10:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								8a4f05fefb 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix develop because I broke it :( ( #3535 )  
							
							 
							
							
							
						 
						
							2018-07-14 09:51:00 +10:00  
						
					 
				
					
						
							
							
								 
								Krombel
							
						 
						
							 
							
							
							
								
							
								32fd6910d0 
								
							
								 
							
						 
						
							
							
								
								Use parse_{int,str} and assert from http.servlet  
							
							 
							
							... 
							
							
							
							parse_integer and parse_string can take a request and raise errors
in case we have wrong or missing params.
This PR tries to use them more to deduplicate some code and make it
better readable 
							
						 
						
							2018-07-13 21:40:14 +02:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6a0afa582a 
								
							
								 
							
						 
						
							
							
								
								Load push rules in storage layer, so that they get cached  
							
							 
							
							
							
						 
						
							2016-06-03 11:10:00 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								398cd1edfb 
								
							
								 
							
						 
						
							
							
								
								Fix regression where synapse checked whether push rules were valid JSON before the compatibility hack that handled clients sending invalid JSON  
							
							 
							
							
							
						 
						
							2016-03-14 14:16:41 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b7dbe5147a 
								
							
								 
							
						 
						
							
							
								
								Add a parse_json_object function  
							
							 
							
							... 
							
							
							
							to deduplicate all the copy+pasted _parse_json functions. Also document
the parse_.* functions. 
							
						 
						
							2016-03-09 11:26:26 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								1b4f4a936f 
								
							
								 
							
						 
						
							
							
								
								Hook up the push rules stream to account_data in /sync  
							
							 
							
							
							
						 
						
							2016-03-04 14:44:01 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								3406eba4ef 
								
							
								 
							
						 
						
							
							
								
								Move the code for formatting push rules into a separate function  
							
							 
							
							
							
						 
						
							2016-03-03 16:11:59 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								ddf9e7b302 
								
							
								 
							
						 
						
							
							
								
								Hook up the push rules to the notifier  
							
							 
							
							
							
						 
						
							2016-03-03 14:57:45 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								de27f7fc79 
								
							
								 
							
						 
						
							
							
								
								Add support for changing the actions for default rules  
							
							 
							
							... 
							
							
							
							See matrix-org/matrix-doc#283 
Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules`` 
							
						 
						
							2016-02-26 14:28:19 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								15c2ac2cac 
								
							
								 
							
						 
						
							
							
								
								Make sure we return a JSON object when returning the values of specif…  
							
							 
							
							... 
							
							
							
							…ic keys from a push rule 
							
						 
						
							2016-02-25 15:13:07 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								9892d017b2 
								
							
								 
							
						 
						
							
							
								
								Remove unused get_rule_attr method  
							
							 
							
							
							
						 
						
							2016-02-24 16:31:07 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b9977ea667 
								
							
								 
							
						 
						
							
							
								
								Remove dead code for setting device specific rules.  
							
							 
							
							... 
							
							
							
							It wasn't possible to hit the code from the API because of a typo
in parsing the request path. Since no-one was using the feature
we might as well remove the dead code. 
							
						 
						
							2016-02-18 16:05:13 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								458782bf67 
								
							
								 
							
						 
						
							
							
								
								Fix typo in request validation for adding push rules.  
							
							 
							
							
							
						 
						
							2016-02-16 18:00:30 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								8c94833b72 
								
							
								 
							
						 
						
							
							
								
								Fix adding push rules relative to other rules  
							
							 
							
							
							
						 
						
							2016-01-27 10:24:20 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								e18257f0e5 
								
							
								 
							
						 
						
							
							
								
								Add missing yield in push_rules set enabled  
							
							 
							
							
							
						 
						
							2016-01-25 16:51:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0d241e1114 
								
							
								 
							
						 
						
							
							
								
								Take a deepcopy of push rules before mutating them  
							
							 
							
							
							
						 
						
							2016-01-19 10:15:12 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								d1f56f732e 
								
							
								 
							
						 
						
							
							
								
								Use static for const dicts  
							
							 
							
							
							
						 
						
							2016-01-18 15:17:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0e39dcd135 
								
							
								 
							
						 
						
							
							
								
								Remove internal ids  
							
							 
							
							
							
						 
						
							2016-01-18 14:50:17 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a7927c13fd 
								
							
								 
							
						 
						
							
							
								
								Fix enabling & disabling push rules  
							
							 
							
							
							
						 
						
							2016-01-14 10:53:44 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								9c1f853d58 
								
							
								 
							
						 
						
							
							
								
								Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code  
							
							 
							
							
							
						 
						
							2016-01-13 13:32:59 +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
							
						 
						
							 
							
							
							
								
							
								41905784f7 
								
							
								 
							
						 
						
							
							
								
								Take object not bool  
							
							 
							
							... 
							
							
							
							Allows bool as legacy fallback
See https://github.com/matrix-org/matrix-doc/pull/212  
							
						 
						
							2015-12-07 10:44:33 +00:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								14d7acfad4 
								
							
								 
							
						 
						
							
							
								
								Host /unstable and /r0 versions of r0 APIs  
							
							 
							
							
							
						 
						
							2015-12-01 17:34:32 +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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								a0bebeda8b 
								
							
								 
							
						 
						
							
							
								
								SYN-390: Don't modify the dictionary returned from the data store  
							
							 
							
							
							
						 
						
							2015-05-26 10:14:15 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								04f8478aaa 
								
							
								 
							
						 
						
							
							
								
								Add the master push rule for the break-my-push button. Allow server default rules to be disabled by default.  
							
							 
							
							
							
						 
						
							2015-03-10 17:26:25 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6fab7bd2c1 
								
							
								 
							
						 
						
							
							
								
								s/user_name/user/ as per mjark's comment  
							
							 
							
							
							
						 
						
							2015-03-02 18:17:19 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								09f9e8493c 
								
							
								 
							
						 
						
							
							
								
								Oops, missed a replacement.  
							
							 
							
							
							
						 
						
							2015-03-02 17:37:22 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								20436cdf75 
								
							
								 
							
						 
						
							
							
								
								Blank lines  
							
							 
							
							
							
						 
						
							2015-03-02 15:58:12 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2a6dedd7cc 
								
							
								 
							
						 
						
							
							
								
								It's set_tweak now, not set_sound  
							
							 
							
							
							
						 
						
							2015-02-27 18:38:56 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1959088156 
								
							
								 
							
						 
						
							
							
								
								Add API for getting/setting enabled-ness of push rules.  
							
							 
							
							
							
						 
						
							2015-02-26 18:07:44 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a025055643 
								
							
								 
							
						 
						
							
							
								
								SYWEB-278 Don't allow rules with no rule_id.  
							
							 
							
							
							
						 
						
							2015-02-25 14:02:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4ebbaf0d43 
								
							
								 
							
						 
						
							
							
								
								Blunty replace json with simplejson  
							
							 
							
							
							
						 
						
							2015-02-11 14:23:10 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								b085fac735 
								
							
								 
							
						 
						
							
							
								
								Code-style fixes  
							
							 
							
							
							
						 
						
							2015-02-10 16:30:48 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								a93fa42bce 
								
							
								 
							
						 
						
							
							
								
								priority class now dealt with in namespaced rule_id  
							
							 
							
							
							
						 
						
							2015-02-05 15:45:16 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								aaf50bf6f3 
								
							
								 
							
						 
						
							
							
								
								Give server default rules the 'default' attribute and fix various brokenness.  
							
							 
							
							
							
						 
						
							2015-02-05 15:11:38 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2df41aa138 
								
							
								 
							
						 
						
							
							
								
								Server default rules now of all kinds rather than all being at lowest prio.  
							
							 
							
							
							
						 
						
							2015-02-05 14:46:37 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f90782a658 
								
							
								 
							
						 
						
							
							
								
								namespace rule IDs to be unique within their scope and rule type.  
							
							 
							
							
							
						 
						
							2015-02-05 14:46:37 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2e77ba637a 
								
							
								 
							
						 
						
							
							
								
								More s/instance_handle/profile_tag/  
							
							 
							
							
							
						 
						
							2015-02-04 16:24:15 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								dc7bb70f22 
								
							
								 
							
						 
						
							
							
								
								s/instance_handle/profile_tag/  
							
							 
							
							
							
						 
						
							2015-02-03 16:51:07 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								b4b892f4a3 
								
							
								 
							
						 
						
							
							
								
								Spit out server default rules too.  
							
							 
							
							
							
						 
						
							2015-01-30 15:54:51 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4ffac34a64 
								
							
								 
							
						 
						
							
							
								
								Add glob asterisks when running rules.  
							
							 
							
							... 
							
							
							
							Means that now you can't do exact matches even in override rules,
but I think we can live with that. Advantage is that you'll now
always get back what was put in to the API. 
							
						 
						
							2015-01-30 15:03:56 +00:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								4bdfce30d7 
								
							
								 
							
						 
						
							
							
								
								Renumber priority classes so we can use 0 for defaults.  
							
							 
							
							
							
						 
						
							2015-01-29 17:12:11 +00:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								acb68a39e0 
								
							
								 
							
						 
						
							
							
								
								Code style fixes.  
							
							 
							
							
							
						 
						
							2015-01-29 16:12:40 +00:00