Mark Haines
							
						 | 
						
							
							
							
							
								
							
								5da65085d1
								
							
								
							
						 | 
						
							
							
								
								Get uploads working with new media repo
							
							
							
							
							
						 | 
						
							2014-12-02 19:51:47 +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 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								c6ea29d916
								
							
								
							
						 | 
						
							
							
								
								Revert accidental commit of bad file
							
							
							
							
							
						 | 
						
							2014-11-18 15:57:00 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								95614e5220
								
							
								
							
						 | 
						
							
							
								
								Fix auth to correctly handle initial creation of rooms
							
							
							
							
							
						 | 
						
							2014-11-18 15:36:41 +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 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								3cb678f84c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
							
							
							
							
							
						 | 
						
							2014-11-07 10:55:28 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								dca3ba2f77
								
							
								
							
						 | 
						
							
							
								
								Determine webclient path by the python module it is contained in
							
							
							
							
							
						 | 
						
							2014-11-04 16:19:16 +00:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								af7ae048f8
								
							
								
							
						 | 
						
							
							
								
								Add option to not bind to HTTPS port. This is useful if running behind an ssl load balancer
							
							
							
							
							
						 | 
						
							2014-11-03 15:06:40 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								7a756e5d9d
								
							
								
							
						 | 
						
							
							
								
								Remove unused 'context' variables to appease pyflakes
							
							
							
							
							
						 | 
						
							2014-10-30 11:15:39 +00:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								b29517bd01
								
							
								
							
						 | 
						
							
							
								
								Add a request-id to each log line
							
							
							
							
							
						 | 
						
							2014-10-30 01:21:33 +00: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
							
						 | 
						
							
							
							
							
								
							
								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
							
						 | 
						
							
							
							
							
								
							
								e3117a2a23
								
							
								
							
						 | 
						
							
							
								
								Add a _matrix/key/v1 resource with the verification keys of the local server
							
							
							
							
							
						 | 
						
							2014-09-23 18:43:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								55397f6347
								
							
								
							
						 | 
						
							
							
								
								prepare_database() on db_conn, not plain name, so we can pass in the connection from outside
							
							
							
							
							
						 | 
						
							2014-09-10 16:23:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								2faffc52ee
								
							
								
							
						 | 
						
							
							
								
								Make sure not to open our TCP ports until /after/ the DB is nicely prepared ready for use
							
							
							
							
							
						 | 
						
							2014-09-10 16:16:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								6c1f0055dc
								
							
								
							
						 | 
						
							
							
								
								No need for a tiny run() function any more, just use reactor.run() directly
							
							
							
							
							
						 | 
						
							2014-09-10 16:07:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								ce55a8cc4b
								
							
								
							
						 | 
						
							
							
								
								Move database preparing code out of homserver.py into storage where it belongs
							
							
							
							
							
						 | 
						
							2014-09-10 15:42:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								9dd4570b68
								
							
								
							
						 | 
						
							
							
								
								Generate m.room.aliases event when the HS creates a room alias
							
							
							
							
							
						 | 
						
							2014-09-05 21:35:56 +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 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								756e171ad0
								
							
								
							
						 | 
						
							
							
								
								Store SQL DDL deltas as well; attempt to upgrade the database on startup if it's too old
							
							
							
							
							
						 | 
						
							2014-09-03 14:14:39 +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 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								c7a7cdf734
								
							
								
							
						 | 
						
							
							
								
								Add ratelimiting function to basehandler
							
							
							
							
							
						 | 
						
							2014-09-02 17:57:04 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								399e004884
								
							
								
							
						 | 
						
							
							
								
								Add unsecure listener port to homeserver
							
							
							
							
							
						 | 
						
							2014-09-01 22:38:52 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								bcfaaf7da6
								
							
								
							
						 | 
						
							
							
								
								That was a breaking db change. You need to recreate the databases. (In reality, it's enough to just run the im.sql through your db and change the schema version)
							
							
							
							
							
						 | 
						
							2014-09-01 20:34:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								a53946a8a1
								
							
								
							
						 | 
						
							
							
								
								Enable SSL for s2s http client
							
							
							
							
							
						 | 
						
							2014-09-01 18:30:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								ef6a8e4f32
								
							
								
							
						 | 
						
							
							
								
								Listen using SSL
							
							
							
							
							
						 | 
						
							2014-09-01 16:30:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								9ea1de432d
								
							
								
							
						 | 
						
							
							
								
								Fix homeserver config parsing
							
							
							
							
							
						 | 
						
							2014-09-01 15:51:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								d9ebe531ed
								
							
								
							
						 | 
						
							
							
								
								Add config tree to synapse. Add support for reading config from a file
							
							
							
							
							
						 | 
						
							2014-08-31 16:06:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								1d95e78759
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into storage_transactions
							
							
							
							
							
						 | 
						
							2014-08-27 16:54:12 +01:00 | 
						
					
				
					
						
							
							
								 
								Mark Haines
							
						 | 
						
							
							
							
							
								
							
								46a2f6a816
								
							
								
							
						 | 
						
							
							
								
								Remove call to get_federation from homeserver
							
							
							
							
							
						 | 
						
							2014-08-27 14:36:20 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								05fa81fee4
								
							
								
							
						 | 
						
							
							
								
								A reliable logger.info() message /after/ the TCP port has been opened and is listening; this is essential for avoiding races in wrapper scripts e.g. integration testing
							
							
							
							
							
						 | 
						
							2014-08-27 13:08:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								e677a3114e
								
							
								
							
						 | 
						
							
							
								
								Use SQLite's PRAGMA user_version to check if the database file really matches the schema we have in mind
							
							
							
							
							
						 | 
						
							2014-08-27 11:45:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								648796ef1d
								
							
								
							
						 | 
						
							
							
								
								Neater database setup at application startup time; only .connect() it once, not once per schema file; don't build the db_pool twice
							
							
							
							
							
						 | 
						
							2014-08-27 11:45:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								1291ac93f3
								
							
								
							
						 | 
						
							
							
								
								Add the ability to turn on the twisted manhole telnet service.
							
							
							
							
							
						 | 
						
							2014-08-26 13:43:55 +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 | 
						
					
				
					
						
							
							
								 
								Matthew Hodgson
							
						 | 
						
							
							
							
							
								
							
								1b0d427285
								
							
								
							
						 | 
						
							
							
								
								host a webclient by default
							
							
							
							
							
						 | 
						
							2014-08-21 23:35:45 +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 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								a18b1a649c
								
							
								
							
						 | 
						
							
							
								
								Added /matrix/content path, HS resource_for_content_repo attribute and FileUploadResource. Added stub methods.
							
							
							
							
							
						 | 
						
							2014-08-18 17:18:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Erik Johnston
							
						 | 
						
							
							
							
							
								
							
								e4061383b8
								
							
								
							
						 | 
						
							
							
								
								Change relative db paths to absolute paths in case we daemonize.
							
							
							
							
							
						 | 
						
							2014-08-14 14:07:22 +01:00 | 
						
					
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 | 
						
							
							
							
							
								
							
								e37de2aef3
								
							
								
							
						 | 
						
							
							
								
								chmod +x homeserver.py
							
							
							
							
							
						 | 
						
							2014-08-14 14:05:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								d253a35539
								
							
								
							
						 | 
						
							
							
								
								Added web client prefix
							
							
							
							
							
						 | 
						
							2014-08-14 11:54:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Kegan Dougal
							
						 | 
						
							
							
							
							
								
							
								c75add6ec8
								
							
								
							
						 | 
						
							
							
								
								Added a urls module for keeping client and federation prefixes.
							
							
							
							
							
						 | 
						
							2014-08-14 11:52:56 +01:00 |