Erik Johnston
							
						 
						
							 
							
							
							
								
							
								04fc8bbcb0 
								
							
								 
							
						 
						
							
							
								
								Update keyring Measure  
							
							 
							
							
							
						 
						
							2016-08-19 18:23:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								39b900b316 
								
							
								 
							
						 
						
							
							
								
								Measure http.server render  
							
							 
							
							
							
						 
						
							2016-08-19 18:23:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								47dd8f02a1 
								
							
								 
							
						 
						
							
							
								
								Measure _get_event_from_row  
							
							 
							
							
							
						 
						
							2016-08-19 18:23:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2426c2f21a 
								
							
								 
							
						 
						
							
							
								
								Measure keyrings  
							
							 
							
							
							
						 
						
							2016-08-19 18:23:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								39242090e3 
								
							
								 
							
						 
						
							
							
								
								Add measure blocks to notifier  
							
							 
							
							
							
						 
						
							2016-08-19 18:23:44 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								290763f559 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1029  from matrix-org/erikj/appservice_stream  
							
							 
							
							... 
							
							
							
							Make get_new_events_for_appservice use indices 
							
						 
						
							2016-08-19 10:54:32 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b770435389 
								
							
								 
							
						 
						
							
							
								
								Make get_new_events_for_appservice use indices  
							
							 
							
							
							
						 
						
							2016-08-19 10:28:42 +01:00  
						
					 
				
					
						
							
							
								 
								Paul Evans
							
						 
						
							 
							
							
							
								
							
								5674ea3e6c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1026  from matrix-org/paul/thirdpartylookup  
							
							 
							
							... 
							
							
							
							3rd party entity lookup 
							
						 
						
							2016-08-18 20:52:50 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								65201631a4 
								
							
								 
							
						 
						
							
							
								
								Move validation logic for AS 3PE query response into ApplicationServiceApi class, to keep the handler logic neater  
							
							 
							
							
							
						 
						
							2016-08-18 17:33:56 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								697872cf08 
								
							
								 
							
						 
						
							
							
								
								More warnings about invalid results from AS 3PE query  
							
							 
							
							
							
						 
						
							2016-08-18 17:24:39 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b515f844ee 
								
							
								 
							
						 
						
							
							
								
								Avoid so much copypasta between 3PU and 3PL query by unifying around a ThirdPartyEntityKind enumeration  
							
							 
							
							
							
						 
						
							2016-08-18 17:19:55 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								2a91799fcc 
								
							
								 
							
						 
						
							
							
								
								Minor syntax neatenings  
							
							 
							
							
							
						 
						
							2016-08-18 16:58:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								be088b32d8 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1027  from matrix-org/erikj/appservice_stream  
							
							 
							
							... 
							
							
							
							Add appservice worker 
							
						 
						
							2016-08-18 16:49:43 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								fcf1dec809 
								
							
								 
							
						 
						
							
							
								
								Appease pep8  
							
							 
							
							
							
						 
						
							2016-08-18 16:26:19 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								105ff162d4 
								
							
								 
							
						 
						
							
							
								
								Authenticate 3PE lookup requests  
							
							 
							
							
							
						 
						
							2016-08-18 16:19:23 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								06964c4a0a 
								
							
								 
							
						 
						
							
							
								
								Copypasta the 3PU support code to also do 3PL  
							
							 
							
							
							
						 
						
							2016-08-18 16:09:50 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f3afd6ef1a 
								
							
								 
							
						 
						
							
							
								
								Remove TODO note about request fields being strings - they're always strings  
							
							 
							
							
							
						 
						
							2016-08-18 15:53:01 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								bcbd74dc5b 
								
							
								 
							
						 
						
							
							
								
								Remove log lines  
							
							 
							
							
							
						 
						
							2016-08-18 15:52:10 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								d7b42afc74 
								
							
								 
							
						 
						
							
							
								
								Log a warning if an AS yields an invalid 3PU lookup result  
							
							 
							
							
							
						 
						
							2016-08-18 15:49:55 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								80f4740c8f 
								
							
								 
							
						 
						
							
							
								
								Scattergather the call out to ASes; validate received results  
							
							 
							
							
							
						 
						
							2016-08-18 15:40:41 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								522c804f6b 
								
							
								 
							
						 
						
							
							
								
								Empty commit  
							
							 
							
							
							
						 
						
							2016-08-18 15:31:49 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								19a625362b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/appservice_stream  
							
							 
							
							
							
						 
						
							2016-08-18 15:06:31 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								90b8b7706f 
								
							
								 
							
						 
						
							
							
								
								Jenkins: tox install setuptools  
							
							 
							
							
							
						 
						
							2016-08-18 15:06:16 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								07229bbdae 
								
							
								 
							
						 
						
							
							
								
								Add appservice worker  
							
							 
							
							
							
						 
						
							2016-08-18 14:59:55 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								434bbf2cb5 
								
							
								 
							
						 
						
							
							
								
								Filter 3PU lookups by only ASes that declare knowledge of that protocol  
							
							 
							
							
							
						 
						
							2016-08-18 14:56:02 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								d5bf7a4a99 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup  
							
							 
							
							
							
						 
						
							2016-08-18 14:21:01 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								718ffcf8bb 
								
							
								 
							
						 
						
							
							
								
								Since empty lookups now return 200/empty list not 404, we can safely log failures as exceptions  
							
							 
							
							
							
						 
						
							2016-08-18 14:18:37 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								3856582741 
								
							
								 
							
						 
						
							
							
								
								Ensure that 3PU lookup request fields actually get passed in  
							
							 
							
							
							
						 
						
							2016-08-18 14:06:02 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								f0c73a1e7a 
								
							
								 
							
						 
						
							
							
								
								Extend individual list results into the main return list, don't append  
							
							 
							
							
							
						 
						
							2016-08-18 13:53:54 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								b3511adb92 
								
							
								 
							
						 
						
							
							
								
								Don't catch the return-value-as-exception that @defer.inlineCallbacks will use  
							
							 
							
							
							
						 
						
							2016-08-18 13:45:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6762a7268c 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1025  from matrix-org/erikj/appservice_stream  
							
							 
							
							... 
							
							
							
							Make AppserviceHandler stream events from database 
							
						 
						
							2016-08-18 12:59:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9da84a9a1e 
								
							
								 
							
						 
						
							
							
								
								Make AppserviceHandler stream events from database  
							
							 
							
							... 
							
							
							
							This is for two reasons:
1. Suppresses duplicates correctly, as the notifier doesn't do any
   duplicate suppression.
2. Makes it easier to connect the AppserviceHandler to the replication
   stream. 
							
						 
						
							2016-08-18 11:54:41 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								403ecd8a2c 
								
							
								 
							
						 
						
							
							
								
								Missed a s/federation reader/media repository/ in a log message  
							
							 
							
							
							
						 
						
							2016-08-18 10:26:15 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								47fbff7a05 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1024  from matrix-org/markjh/media_repository  
							
							 
							
							... 
							
							
							
							Add a media repository worker 
							
						 
						
							2016-08-18 10:12:17 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								396624864a 
								
							
								 
							
						 
						
							
							
								
								Add a media repository worker  
							
							 
							
							
							
						 
						
							2016-08-18 09:38:42 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e73dcb66da 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1022  from matrix-org/erikj/as_notify_perf  
							
							 
							
							... 
							
							
							
							Make notify_interested_services faster 
							
						 
						
							2016-08-18 09:35:19 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ea166f2ac9 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1023  from matrix-org/erikj/update_fix  
							
							 
							
							... 
							
							
							
							Fix push_display_name_rename schema update 
							
						 
						
							2016-08-18 09:16:53 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								3ec10dffd6 
								
							
								 
							
						 
						
							
							
								
								Actually make 3PU lookup calls out to ASes  
							
							 
							
							
							
						 
						
							2016-08-18 00:39:09 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								732cf72b86 
								
							
								 
							
						 
						
							
							
								
								Fix push_display_name_rename schema update  
							
							 
							
							
							
						 
						
							2016-08-17 18:12:21 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								abcb9aee5b 
								
							
								 
							
						 
						
							
							
								
								Make push Measure finer grained  
							
							 
							
							
							
						 
						
							2016-08-17 18:00:18 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								2a0d8f8219 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1021  from matrix-org/erikj/mediasecurity_policy  
							
							 
							
							... 
							
							
							
							Set `Content-Security-Policy` on media repo 
							
						 
						
							2016-08-17 17:22:43 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								320dfe523c 
								
							
								 
							
						 
						
							
							
								
								Make notify_interested_services faster  
							
							 
							
							
							
						 
						
							2016-08-17 17:20:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								0af9e1a637 
								
							
								 
							
						 
						
							
							
								
								Set `Content-Security-Policy` on media repo  
							
							 
							
							... 
							
							
							
							This is to inform browsers that they should sandbox the returned
media. This is particularly cruical for javascript/HTML files. 
							
						 
						
							2016-08-17 16:27:39 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								fa87c981e1 
								
							
								 
							
						 
						
							
							
								
								Thread 3PU lookup through as far as the AS API object; which currently noöps it  
							
							 
							
							
							
						 
						
							2016-08-17 16:17:28 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								0d7cef0943 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1011  from matrix-org/dbkr/contains_display_name_override  
							
							 
							
							... 
							
							
							
							Move display name rule 
							
						 
						
							2016-08-17 16:15:45 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								f90b3d83a3 
								
							
								 
							
						 
						
							
							
								
								Add None check to _iterate_over_text  
							
							 
							
							
							
						 
						
							2016-08-17 15:17:17 +01:00  
						
					 
				
					
						
							
							
								 
								Matrix
							
						 
						
							 
							
							
							
								
							
								f743471380 
								
							
								 
							
						 
						
							
							
								
								Change name of metric  
							
							 
							
							
							
						 
						
							2016-08-17 15:05:50 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b9e888858c 
								
							
								 
							
						 
						
							
							
								
								Move Measure block inside loop  
							
							 
							
							
							
						 
						
							2016-08-17 14:52:26 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								973d67a033 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1019  from matrix-org/erikj/appservice_clean  
							
							 
							
							... 
							
							
							
							Clean up _ServiceQueuer 
							
						 
						
							2016-08-17 14:37:21 +01:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								e3e3fbc23a 
								
							
								 
							
						 
						
							
							
								
								Initial empty implementation that just registers an API endpoint handler  
							
							 
							
							
							
						 
						
							2016-08-17 12:46:49 +01:00