Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								ae8ad55cb8
								
							
								
							
						 | 
						
							
							
								
								typos
							
							
							
							
							
						 | 
						
							2014-11-24 01:41:12 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								610c2ea131
								
							
								
							
						 | 
						
							
							
								
								Fix pep8 and pyflakes warnings
							
							
							
							
							
						 | 
						
							2014-11-20 18:00:10 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								f1c7f8e813
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into http_client_refactor
							
							
							
							
							
						 | 
						
							2014-11-20 17:49:48 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								e377d33652
								
							
								
							
						 | 
						
							
							
								
								Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
							
							
							
							
							
						 | 
						
							2014-11-20 17:41:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								db9ce032a4
								
							
								
							
						 | 
						
							
							
								
								Fix pep8 codestyle warnings
							
							
							
							
							
						 | 
						
							2014-11-20 17:26:36 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								dc60eee50e
								
							
								
							
						 | 
						
							
							
								
								Refactor the HTTP clients a little.
							
							
							
							
							
						 | 
						
							2014-11-20 13:53:34 +00:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								cf66532ac1
								
							
								
							
						 | 
						
							
							
								
								CaptchaServerHttpClient should extend the base, not matrix http client.
							
							
							
							
							
						 | 
						
							2014-11-20 12:48:21 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								3e54d70ae2
								
							
								
							
						 | 
						
							
							
								
								SYN-141: Encode query params as UTF-8.
							
							
							
							
							
						 | 
						
							2014-11-18 19:43:08 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e903c941cb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into request_logging
							
							
							
							
							
							
							
							Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py 
							
						 | 
						
							2014-11-14 11:16:50 +00:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								7df8c8c287
								
							
								
							
						 | 
						
							
							
								
								apply some cache headers to try to make the content repo less nutso
							
							
							
							
							
						 | 
						
							2014-11-11 05:36:39 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7c06399512
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into request_logging
							
							
							
							
							
							
							
							Conflicts:
	synapse/config/logger.py 
							
						 | 
						
							2014-10-30 11:13:58 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7d709542ca
								
							
								
							
						 | 
						
							
							
								
								Fix pep8 warnings
							
							
							
							
							
						 | 
						
							2014-10-30 11:10:17 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b29517bd01
								
							
								
							
						 | 
						
							
							
								
								Add a request-id to each log line
							
							
							
							
							
						 | 
						
							2014-10-30 01:21:33 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4be99c2989
								
							
								
							
						 | 
						
							
							
								
								Add get_json method to 3pid http client. Better logging for errors in 3pid requests
							
							
							
							
							
						 | 
						
							2014-10-20 14:10:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								f74e850b5c
								
							
								
							
						 | 
						
							
							
								
								remove debugging logging for signing requests
							
							
							
							
							
						 | 
						
							2014-10-14 11:46:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								6684855767
								
							
								
							
						 | 
						
							
							
								
								Verify signatures for server2server requests
							
							
							
							
							
						 | 
						
							2014-10-13 14:37:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								10ef8e6e4b
								
							
								
							
						 | 
						
							
							
								
								SYN-75 sign at the request level rather than the transaction level
							
							
							
							
							
						 | 
						
							2014-10-13 11:49:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								cecda27d73
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into server2server_signing
							
							
							
							
							
						 | 
						
							2014-10-13 11:06:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								984e207b59
								
							
								
							
						 | 
						
							
							
								
								Merge branch develop into server2server_signing
							
							
							
							
							
							
							
							Conflicts:
	synapse/app/homeserver.py 
							
						 | 
						
							2014-10-13 10:58:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								693d0b8f45
								
							
								
							
						 | 
						
							
							
								
								Replace on_send_callback with something a bit clearer so that we can sign messages
							
							
							
							
							
						 | 
						
							2014-10-13 10:49:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b9cdc443d7
								
							
								
							
						 | 
						
							
							
								
								Fix pyflakes errors
							
							
							
							
							
						 | 
						
							2014-10-02 14:37:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								574377636e
								
							
								
							
						 | 
						
							
							
								
								Add a keyword argument to get_json to avoid retrying on DNS failures. Rather than passing MatrixHttpClient.RETRY_DNS_LOOKUP_FAILURES as a fake query string parameter
							
							
							
							
							
						 | 
						
							2014-10-02 14:26:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								4f11518934
								
							
								
							
						 | 
						
							
							
								
								Split PlainHttpClient into separate clients for talking to Identity servers and talking to Capatcha servers
							
							
							
							
							
						 | 
						
							2014-10-02 14:03:26 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c8d67beb9c
								
							
								
							
						 | 
						
							
							
								
								remove "red", "blue" and "green" server_name mappings
							
							
							
							
							
						 | 
						
							2014-10-01 15:52:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								bf4b224fcf
								
							
								
							
						 | 
						
							
							
								
								Fix a few pyflakes errors in the server_key_resource
							
							
							
							
							
						 | 
						
							2014-09-23 18:43:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								e3117a2a23
								
							
								
							
						 | 
						
							
							
								
								Add a _matrix/key/v1 resource with the verification keys of the local server
							
							
							
							
							
						 | 
						
							2014-09-23 18:43:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								6ac0b4ade8
								
							
								
							
						 | 
						
							
							
								
								Fix 'age' key to update on retries
							
							
							
							
							
						 | 
						
							2014-09-15 16:24:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								1829b55bb0
								
							
								
							
						 | 
						
							
							
								
								Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.
							
							
							
							
							
						 | 
						
							2014-09-05 19:18:23 -07:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								d72ce4da64
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into develop
							
							
							
							
							
							
							
							Conflicts:
	synapse/http/client.py 
							
						 | 
						
							2014-09-03 18:25:17 +01:00 | 
						
					
				
					
						
							
							
								 
								David Baker
							
						 | 
						
							
							
							
							
								
							
								d6ecbbdf0a
								
							
								
							
						 | 
						
							
							
								
								Add support for registering with a threepid to the HS (get credentials from the client and check them against an ID server).
							
							
							
							
							
						 | 
						
							2014-09-03 18:22:27 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								ee2bcdec65
								
							
								
							
						 | 
						
							
							
								
								Limit the size of uploads
							
							
							
							
							
						 | 
						
							2014-09-03 17:04:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								7fc84c7019
								
							
								
							
						 | 
						
							
							
								
								Make retrying requests on DNS failures configurable, and turn off retrying only in directory.get_association
							
							
							
							
							
						 | 
						
							2014-09-03 14:26:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								b1195c125f
								
							
								
							
						 | 
						
							
							
								
								hs: Updated synapse.http.client to handle DNSLookupErrors and bail immediately.
							
							
							
							
							
						 | 
						
							2014-09-03 13:51:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								b50ea730b1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into develop
							
							
							
							
							
							
							
							Conflicts:
	synapse/http/server.py
        synapse/http/content_repository.py
							
						 | 
						
							2014-09-03 12:01:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								bc21350298
								
							
								
							
						 | 
						
							
							
								
								Add option to change content repo location
							
							
							
							
							
						 | 
						
							2014-09-03 11:57:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								bf10cf5f1a
								
							
								
							
						 | 
						
							
							
								
								move contentrepo class to it's own file
							
							
							
							
							
						 | 
						
							2014-09-03 11:10:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								ddc16d8642
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into develop
							
							
							
							
							
						 | 
						
							2014-09-03 09:46:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								112c7ea315
								
							
								
							
						 | 
						
							
							
								
								Set status message for ratelimit error responses
							
							
							
							
							
						 | 
						
							2014-09-03 09:37:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								235f686da9
								
							
								
							
						 | 
						
							
							
								
								Update default endpoint port to match the default ports in the config
							
							
							
							
							
						 | 
						
							2014-09-02 16:56:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								68a04b9282
								
							
								
							
						 | 
						
							
							
								
								given everything's apparently gone https:// by default for c-s, change this hardcoding...
							
							
							
							
							
						 | 
						
							2014-09-01 23:28:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								5452a8ee29
								
							
								
							
						 | 
						
							
							
								
								Fix SSL for federation http client
							
							
							
							
							
						 | 
						
							2014-09-01 18:43:08 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a53946a8a1
								
							
								
							
						 | 
						
							
							
								
								Enable SSL for s2s http client
							
							
							
							
							
						 | 
						
							2014-09-01 18:30:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								2b7918bd6f
								
							
								
							
						 | 
						
							
							
								
								missed a s#/matrix#/_matrix/g
							
							
							
							
							
						 | 
						
							2014-08-31 14:54:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								e37b040bc3
								
							
								
							
						 | 
						
							
							
								
								Small amounts of cleanup and bonus round comments.
							
							
							
							
							
						 | 
						
							2014-08-18 17:22:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								58548ab557
								
							
								
							
						 | 
						
							
							
								
								Implemented GETs for the ContentRepoResource. It all actually appears to be working.
							
							
							
							
							
						 | 
						
							2014-08-18 17:18:54 +01:00 |