0c1b7f843b 
								
							
								 
							
						 
						
							
							
								
								Unused import  
							
							
							
						 
						
							2015-04-30 13:33:30 +01:00  
				
					
						
							
							
								 
						
							
							
								4b46fbec5b 
								
							
								 
							
						 
						
							
							
								
								Doesn't look like this is used anymore  
							
							
							
						 
						
							2015-04-30 12:04:08 +01:00  
				
					
						
							
							
								 
						
							
							
								6532b6e607 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into csauth  
							
							... 
							
							
							
							Conflicts:
	synapse/http/server.py 
							
						 
						
							2015-04-24 09:37:54 +01:00  
				
					
						
							
							
								 
						
							
							
								1967650bc4 
								
							
								 
							
						 
						
							
							
								
								Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator  
							
							
							
						 
						
							2015-04-21 16:35:53 +01:00  
				
					
						
							
							
								 
						
							
							
								1ebff9736b 
								
							
								 
							
						 
						
							
							
								
								Split out the JsonResource request logging and error handling into a separate wrapper function  
							
							
							
						 
						
							2015-04-21 16:07:20 +01:00  
				
					
						
							
							
								 
						
							
							
								c5bf0343e8 
								
							
								 
							
						 
						
							
							
								
								Explain how I justified to myself making JsonResource not always send JSON.  
							
							
							
						 
						
							2015-04-01 15:13:14 +01:00  
				
					
						
							
							
								 
						
							
							
								e9c908ebc0 
								
							
								 
							
						 
						
							
							
								
								Completely replace fallback auth for C/S V2:  
							
							... 
							
							
							
							* Now only the auth part goes to fallback, not the whole operation
 * Auth fallback is a normal API endpoint, not a static page
 * Params like the recaptcha pubkey can just live in the config
Involves a little engineering on JsonResource so its servlets aren't always forced to return JSON. I should document this more, in fact I'll do that now. 
							
						 
						
							2015-04-01 15:05:30 +01:00  
				
					
						
							
							
								 
						
							
							
								f129ee1e18 
								
							
								 
							
						 
						
							
							
								
								Make docs a bit more true  
							
							
							
						 
						
							2015-03-31 18:25:10 +01:00  
				
					
						
							
							
								 
						
							
							
								d18e7779ca 
								
							
								 
							
						 
						
							
							
								
								Grammar and deduplication  
							
							
							
						 
						
							2015-03-31 14:40:02 +01:00  
				
					
						
							
							
								 
						
							
							
								3f7a31d366 
								
							
								 
							
						 
						
							
							
								
								Add a DistributionMetric to HTTP request/response processing time in the server  
							
							
							
						 
						
							2015-03-16 18:31:29 +00:00  
				
					
						
							
							
								 
						
							
							
								c8032aec17 
								
							
								 
							
						 
						
							
							
								
								actually uphold the bind_host parameter. in theory should make ipv6 binds work like bind_host: 'fe80::1%lo0'  
							
							
							
						 
						
							2015-03-14 00:12:20 +00:00  
				
					
						
							
							
								 
						
							
							
								128cf2daf7 
								
							
								 
							
						 
						
							
							
								
								Appease pep8  
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
				
					
						
							
							
								 
						
							
							
								1748605c5d 
								
							
								 
							
						 
						
							
							
								
								Count incoming HTTP requests per servlet that responds  
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
				
					
						
							
							
								 
						
							
							
								b0cf867319 
								
							
								 
							
						 
						
							
							
								
								Use _ instead of . as a metric namespacing separator, for Prometheus  
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
				
					
						
							
							
								 
						
							
							
								f9478e475b 
								
							
								 
							
						 
						
							
							
								
								Rename Metrics' "keys" to "labels"  
							
							
							
						 
						
							2015-03-12 16:24:51 +00:00  
				
					
						
							
							
								 
						
							
							
								7d72e44eb9 
								
							
								 
							
						 
						
							
							
								
								Add vector counters to HTTP clients and servers; count the requests by method and responses by method and response code  
							
							
							
						 
						
							2015-03-12 16:24:50 +00:00  
				
					
						
							
							
								 
						
							
							
								9d9d39536b 
								
							
								 
							
						 
						
							
							
								
								Slightly reduce the insane amounts of indentation in main http server response path, by 'continue'ing around a non-match or falling through  
							
							
							
						 
						
							2015-03-05 16:24:13 +00:00  
				
					
						
							
							
								 
						
							
							
								5358966a87 
								
							
								 
							
						 
						
							
							
								
								Use git aware version string in User-Agent and Server headers  
							
							
							
						 
						
							2015-02-18 16:52:04 +00:00  
				
					
						
							
							
								 
						
							
							
								6370cffbbf 
								
							
								 
							
						 
						
							
							
								
								Fix bug where variable was not always defined  
							
							
							
						 
						
							2015-02-11 10:34:41 +00:00  
				
					
						
							
							
								 
						
							
							
								24cc6979fb 
								
							
								 
							
						 
						
							
							
								
								Log when we receive a request, when we send a response and how long it took to process it.  
							
							
							
						 
						
							2015-02-09 13:46:22 +00:00  
				
					
						
							
							
								 
						
							
							
								ede491b4e0 
								
							
								 
							
						 
						
							
							
								
								Oops: second part of commit  dc938606 
							
							
							
						 
						
							2015-01-22 17:38:53 +00:00  
				
					
						
							
							
								 
						
							
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
				
					
						
							
							
								 
						
							
							
								773de09774 
								
							
								 
							
						 
						
							
							
								
								Set a content-length for JSON responses  
							
							
							
						 
						
							2015-01-06 13:05:19 +00:00  
				
					
						
							
							
								 
						
							
							
								24b5d01853 
								
							
								 
							
						 
						
							
							
								
								Include version in User-Agent and Server headers  
							
							
							
						 
						
							2014-12-22 10:16:02 +00:00  
				
					
						
							
							
								 
						
							
							
								1fc2a0e33e 
								
							
								 
							
						 
						
							
							
								
								Fix tests and remove debug logging  
							
							
							
						 
						
							2014-12-12 15:08:29 +00:00  
				
					
						
							
							
								 
						
							
							
								7b43a503f3 
								
							
								 
							
						 
						
							
							
								
								Consistently url decode and decode as utf 8 the URL parts  
							
							
							
						 
						
							2014-12-12 15:05:37 +00:00  
				
					
						
							
							
								 
						
							
							
								5da65085d1 
								
							
								 
							
						 
						
							
							
								
								Get uploads working with new media repo  
							
							
							
						 
						
							2014-12-02 19:51:47 +00:00  
				
					
						
							
							
								 
						
							
							
								279c48c8b4 
								
							
								 
							
						 
						
							
							
								
								Write the upload portion of version 1 of the media repository  
							
							
							
						 
						
							2014-12-02 17:13:14 +00:00  
				
					
						
							
							
								 
						
							
							
								db9ce032a4 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 codestyle warnings  
							
							
							
						 
						
							2014-11-20 17:26:36 +00:00  
				
					
						
							
							
								 
						
							
							
								dfdda2c871 
								
							
								 
							
						 
						
							
							
								
								Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'  
							
							
							
						 
						
							2014-11-20 17:10:37 +00:00  
				
					
						
							
							
								 
						
							
							
								b29517bd01 
								
							
								 
							
						 
						
							
							
								
								Add a request-id to each log line  
							
							
							
						 
						
							2014-10-30 01:21:33 +00:00  
				
					
						
							
							
								 
						
							
							
								8a7c1d6a00 
								
							
								 
							
						 
						
							
							
								
								fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.  
							
							
							
						 
						
							2014-09-03 17:31:57 +01:00  
				
					
						
							
							
								 
						
							
							
								bf10cf5f1a 
								
							
								 
							
						 
						
							
							
								
								move contentrepo class to it's own file  
							
							
							
						 
						
							2014-09-03 11:10:44 +01:00  
				
					
						
							
							
								 
						
							
							
								112c7ea315 
								
							
								 
							
						 
						
							
							
								
								Set status message for ratelimit error responses  
							
							
							
						 
						
							2014-09-03 09:37:44 +01:00  
				
					
						
							
							
								 
						
							
							
								68a04b9282 
								
							
								 
							
						 
						
							
							
								
								given everything's apparently gone https:// by default for c-s, change this hardcoding...  
							
							
							
						 
						
							2014-09-01 23:28:43 +01:00  
				
					
						
							
							
								 
						
							
							
								2b7918bd6f 
								
							
								 
							
						 
						
							
							
								
								missed a s#/matrix#/_matrix/g  
							
							
							
						 
						
							2014-08-31 14:54:58 +01:00  
				
					
						
							
							
								 
						
							
							
								0c3b4a1f63 
								
							
								 
							
						 
						
							
							
								
								For the content repo, don't just use homeserver.hostname as that might not include the port due to SRV.  
							
							
							
						 
						
							2014-08-24 11:56:55 +01:00  
				
					
						
							
							
								 
						
							
							
								acf5127604 
								
							
								 
							
						 
						
							
							
								
								Make the content repo work with in daemon mode. Return the full url on upload. Update the webclient to use new content repo api.  
							
							
							
						 
						
							2014-08-22 10:25:32 +01:00  
				
					
						
							
							
								 
						
							
							
								f48792eec4 
								
							
								 
							
						 
						
							
							
								
								Reduce the amount of incredibly spammy stack traces. Expected errors (e.g. SynapseErrors) shouldn't have their full trace logged every time. Don't send responses to disconnected requests.  
							
							
							
						 
						
							2014-08-19 10:56:43 +01:00  
				
					
						
							
							
								 
						
							
							
								e37b040bc3 
								
							
								 
							
						 
						
							
							
								
								Small amounts of cleanup and bonus round comments.  
							
							
							
						 
						
							2014-08-18 17:22:31 +01:00  
				
					
						
							
							
								 
						
							
							
								58548ab557 
								
							
								 
							
						 
						
							
							
								
								Implemented GETs for the ContentRepoResource. It all actually appears to be working.  
							
							
							
						 
						
							2014-08-18 17:18:54 +01:00  
				
					
						
							
							
								 
						
							
							
								590ab24c85 
								
							
								 
							
						 
						
							
							
								
								hs: Make the uploads directory if it doesn't exist. Namespace uploads by the base64 encoded user id of the uploader. Make a reasonable attempt to retry clashing upload paths. Try to guess a sensible file extension depending on the content type.  
							
							
							
						 
						
							2014-08-18 17:18:54 +01:00  
				
					
						
							
							
								 
						
							
							
								35da1bf4a3 
								
							
								 
							
						 
						
							
							
								
								Auth content uploads. Added a mapping function from request > filename. Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore.  
							
							
							
						 
						
							2014-08-18 17:18:54 +01:00  
				
					
						
							
							
								 
						
							
							
								a18b1a649c 
								
							
								 
							
						 
						
							
							
								
								Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.  
							
							
							
						 
						
							2014-08-18 17:18:54 +01:00  
				
					
						
							
							
								 
						
							
							
								9fd445eb92 
								
							
								 
							
						 
						
							
							
								
								If the web client is enabled, automatically redirect root '/' to the web client path.  
							
							
							
						 
						
							2014-08-14 11:37:13 +01:00  
				
					
						
							
							
								 
						
							
							
								9a1638ed21 
								
							
								 
							
						 
						
							
							
								
								Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.  
							
							
							
						 
						
							2014-08-14 10:18:54 +01:00  
				
					
						
							
							
								 
						
							
							
								9f863d3466 
								
							
								 
							
						 
						
							
							
								
								Start phasing out HttpServer: we should be using Resources instead. Added resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.  
							
							
							
						 
						
							2014-08-14 09:55:16 +01:00  
				
					
						
							
							
								 
						
							
							
								f98e6380f1 
								
							
								 
							
						 
						
							
							
								
								add in whitespace after copyright statements to improve legibility  
							
							
							
						 
						
							2014-08-13 03:14:34 +01:00  
				
					
						
							
							
								 
						
							
							
								4add1c70e9 
								
							
								 
							
						 
						
							
							
								
								Just say yes to OPTIONS requests, since we want to turn on CORS headers for all paths  
							
							
							
						 
						
							2014-08-12 17:17:14 +01:00  
				
					
						
							
							
								 
						
							
							
								4f475c7697 
								
							
								 
							
						 
						
							
							
								
								Reference Matrix Home Server  
							
							
							
						 
						
							2014-08-12 15:10:52 +01:00