Erik Johnston
							
						 
						
							 
							
							
							
								
							
								af691e415c 
								
							
								 
							
						 
						
							
							
								
								Move register_device into handler  
							
							 
							
							
							
						 
						
							2019-02-18 16:49:38 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								41c3f21c3b 
								
							
								 
							
						 
						
							
							
								
								Fix unit tests  
							
							 
							
							
							
						 
						
							2019-02-18 13:43:16 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cb12a37708 
								
							
								 
							
						 
						
							
							
								
								Clarify and fix behaviour when there are multiple aliases  
							
							 
							
							
							
						 
						
							2019-02-14 18:16:32 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								eaf4d11af9 
								
							
								 
							
						 
						
							
							
								
								Add configurable room list publishing rules  
							
							 
							
							... 
							
							
							
							This allows specifying who and what is allowed to be published onto the
public room list 
							
						 
						
							2019-02-14 16:02:23 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								32b781bfe2 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix error when loading cert if tls is disabled ( #4618 )  
							
							 
							
							... 
							
							
							
							If TLS is disabled, it should not be an error if no cert is given.
Fixes  #4554 . 
							
						 
						
							2019-02-12 10:51:31 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0ca2908653 
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							 
							
							
							
						 
						
							2019-02-11 22:01:27 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								5d27730a73 
								
									
								
							
								 
							
						 
						
							
							
								
								Move ClientTLSOptionsFactory init out of refresh_certificates ( #4611 )  
							
							 
							
							... 
							
							
							
							It's nothing to do with refreshing the certificates. No idea why it was here. 
							
						 
						
							2019-02-11 18:03:30 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								719e073f00 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4580  from matrix-org/uhoreg/e2e_backup_add_updating  
							
							 
							
							... 
							
							
							
							add updating of backup versions 
							
						 
						
							2019-02-11 13:45:49 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								b201149c7e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4420  from matrix-org/jaywink/openid-listener  
							
							 
							
							... 
							
							
							
							New listener resource for the federation API "openid/userinfo" endpoint 
							
						 
						
							2019-02-11 09:44:00 +00:00  
						
					 
				
					
						
							
							
								 
								Hubert Chathi
							
						 
						
							 
							
							
							
								
							
								afae8442b5 
								
							
								 
							
						 
						
							
							
								
								make sure version is in body and wrap in linearizer queue  
							
							 
							
							... 
							
							
							
							also add tests 
							
						 
						
							2019-02-08 01:32:45 -05:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								8a21b03fba 
								
							
								 
							
						 
						
							
							
								
								Treat an invalid .well-known the same as an absent one  
							
							 
							
							... 
							
							
							
							... basically, carry on and fall back to SRV etc. 
							
						 
						
							2019-02-01 11:37:31 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d428b46346 
								
							
								 
							
						 
						
							
							
								
								Update federation routing logic to check .well-known before SRV  
							
							 
							
							
							
						 
						
							2019-01-31 23:14:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								6587b0b89b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4472  from matrix-org/neilj/room_capabilities  
							
							 
							
							... 
							
							
							
							Server capabilities support 
							
						 
						
							2019-01-30 14:26:56 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								c7b24ac3d0 
								
									
								
							
								 
							
						 
						
							
							
								
								Follow redirects on .well-known ( #4520 )  
							
							 
							
							
							
						 
						
							2019-01-30 11:43:33 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								bc5f6e1797 
								
									
								
							
								 
							
						 
						
							
							
								
								Add a caching layer to .well-known responses ( #4516 )  
							
							 
							
							
							
						 
						
							2019-01-30 10:55:25 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								3f189c902e 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix flake8 ( #4519 )  
							
							 
							
							
							
						 
						
							2019-01-30 10:53:17 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								ee4df7fd7a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/room_capabilities  
							
							 
							
							
							
						 
						
							2019-01-30 10:28:08 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e4bef9d470 
								
							
								 
							
						 
						
							
							
								
								rework format of change password capability  
							
							 
							
							
							
						 
						
							2019-01-29 18:04:56 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								cc2d650ef7 
								
									
								
							
								 
							
						 
						
							
							
								
								Relax requirement for a content-type on .well-known ( #4511 )  
							
							 
							
							
							
						 
						
							2019-01-29 16:49:17 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								f03b3a7a3a 
								
							
								 
							
						 
						
							
							
								
								support change_password in capabilities end-point  
							
							 
							
							
							
						 
						
							2019-01-29 15:58:37 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								6bd4374636 
								
									
								
							
								 
							
						 
						
							
							
								
								Do not generate self-signed TLS certificates by default. ( #4509 )  
							
							 
							
							
							
						 
						
							2019-01-29 14:09:10 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								b8d75ef53e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4481  from matrix-org/erikj/event_builder  
							
							 
							
							... 
							
							
							
							Refactor event building into EventBuilder 
							
						 
						
							2019-01-29 14:07:23 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								99e36d5e24 
								
									
								
							
								 
							
						 
						
							
							
								
								Implement MSC1708 (.well-known lookups for server routing) ( #4489 )  
							
							 
							
							
							
						 
						
							2019-01-29 13:53:02 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								4eeb2fb215 
								
							
								 
							
						 
						
							
							
								
								isort  
							
							 
							
							
							
						 
						
							2019-01-29 12:44:10 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								5488cadaae 
								
									
								
							
								 
							
						 
						
							
							
								
								Enable configuring test log level via env var ( #4506 )  
							
							 
							
							... 
							
							
							
							I got fed up with always adding '@unittest.DEBUG' every time I needed to debug a test. 
							
						 
						
							2019-01-29 12:07:00 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								a124025dab 
								
							
								 
							
						 
						
							
							
								
								enforce auth for capabilities endpoint  
							
							 
							
							
							
						 
						
							2019-01-29 11:37:56 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								aee39f7de8 
								
							
								 
							
						 
						
							
							
								
								Fix test to use valid event format  
							
							 
							
							
							
						 
						
							2019-01-29 11:19:50 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								554ca58ea1 
								
							
								 
							
						 
						
							
							
								
								Make add_hashes_and_signatures operate on dicts  
							
							 
							
							
							
						 
						
							2019-01-29 11:12:38 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								f2b553d656 
								
							
								 
							
						 
						
							
							
								
								Use SimpleResolverComplexifier in tests ( #4497 )  
							
							 
							
							... 
							
							
							
							two reasons for this. One, it saves a bunch of boilerplate. Two, it squashes
unicode to IDNA-in-a-`str` (even on python 3) in a way that it turns out we
rely on to give consistent behaviour between python 2 and 3. 
							
						 
						
							2019-01-29 09:38:29 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								f1a04462eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4482  from matrix-org/erikj/event_auth_room_version  
							
							 
							
							... 
							
							
							
							Pass through room version to event auth 
							
						 
						
							2019-01-28 20:09:38 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								7072fe3084 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix UPSERTs on SQLite 3.24+ ( #4477 )  
							
							 
							
							
							
						 
						
							2019-01-28 15:43:32 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								0fd5b3b53e 
								
							
								 
							
						 
						
							
							
								
								Handle IP literals explicitly  
							
							 
							
							... 
							
							
							
							We don't want to be doing .well-known lookups on these guys. 
							
						 
						
							2019-01-28 10:34:30 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								d840019192 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix idna and ipv6 literal handling in MatrixFederationAgent ( #4487 )  
							
							 
							
							... 
							
							
							
							Turns out that the library does a better job of parsing URIs than our
reinvented wheel. Who knew.
There are two things going on here. The first is that, unlike
parse_server_name, URI.fromBytes will strip off square brackets from IPv6
literals, which means that it is valid input to ClientTLSOptionsFactory and
HostnameEndpoint.
The second is that we stay in `bytes` throughout (except for the argument to
ClientTLSOptionsFactory), which avoids the weirdness of (sometimes) ending up
with idna-encoded values being held in `unicode` variables. TBH it probably
would have been ok but it made the tests fragile. 
							
						 
						
							2019-01-28 09:56:59 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ae2a957dba 
								
							
								 
							
						 
						
							
							
								
								Pass through room version to event auth  
							
							 
							
							
							
						 
						
							2019-01-25 18:31:41 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								b6dce9b9fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4470  from matrix-org/erikj/require_format_version  
							
							 
							
							... 
							
							
							
							Require event format version to parse or create events 
							
						 
						
							2019-01-25 15:59:36 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								8520bc3109 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix Host header sent by MatrixFederationAgent ( #4468 )  
							
							 
							
							... 
							
							
							
							Move the Host header logic down here so that (a) it is used if we reuse the
agent elsewhere, and (b) we can mess about with it with .well-known. 
							
						 
						
							2019-01-25 12:38:16 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								95f871fc0d 
								
							
								 
							
						 
						
							
							
								
								Support room version capabilities in CS API (MSC1804)  
							
							 
							
							
							
						 
						
							2019-01-25 11:16:29 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								9770ed91c2 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2019-01-25 10:32:26 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
								
								
							
							
								
							
								be6a7e47fa 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Require event format version to parse or create events"  
							
							 
							
							
							
						 
						
							2019-01-25 10:23:51 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								efb8ed1d45 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_format_version  
							
							 
							
							
							
						 
						
							2019-01-24 18:52:34 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								afd69a0920 
								
							
								 
							
						 
						
							
							
								
								Look up the right SRV record  
							
							 
							
							
							
						 
						
							2019-01-24 13:31:43 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								e1c8440e0c 
								
							
								 
							
						 
						
							
							
								
								lots more tests for MatrixFederationAgent  
							
							 
							
							
							
						 
						
							2019-01-24 13:28:07 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								10b89d5c2e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4435  from matrix-org/neilj/fix_threepid_auth_check  
							
							 
							
							... 
							
							
							
							Neilj/fix threepid auth check 
							
						 
						
							2019-01-24 13:02:50 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								58f6c48183 
								
									
								
							
								 
							
						 
						
							
							
								
								Use native UPSERTs where possible ( #4306 )  
							
							 
							
							
							
						 
						
							2019-01-24 21:31:54 +11:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								97fd29c019 
								
									
								
							
								 
							
						 
						
							
							
								
								Don't send IP addresses as SNI ( #4452 )  
							
							 
							
							... 
							
							
							
							The problem here is that we have cut-and-pasted an impl from Twisted, and then
failed to maintain it. It was fixed in Twisted in
https://github.com/twisted/twisted/pull/1047/files ; let's do the same here. 
							
						 
						
							2019-01-24 09:34:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								e79ba9eb34 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							 
							
							
							
						 
						
							2019-01-24 09:28:16 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								6b574f3df7 
								
							
								 
							
						 
						
							
							
								
								fix python2 test failure  
							
							 
							
							
							
						 
						
							2019-01-23 11:25:36 +00:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								6f680241bd 
								
							
								 
							
						 
						
							
							
								
								Fix flake8 issues  
							
							 
							
							... 
							
							
							
							Signed-off-by: Jason Robinson <jasonr@matrix.org> 
							
						 
						
							2019-01-23 10:53:48 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								1838ef1ac3 
								
							
								 
							
						 
						
							
							
								
								Fix openid tests after rebase  
							
							 
							
							... 
							
							
							
							Signed-off-by: Jason Robinson <jasonr@matrix.org> 
							
						 
						
							2019-01-23 10:38:13 +02:00  
						
					 
				
					
						
							
							
								 
								Jason Robinson
							
						 
						
							 
							
							
							
								
							
								a47fac9af6 
								
							
								 
							
						 
						
							
							
								
								Fix sorting of imports in tests. Remove an unnecessary mock  
							
							 
							
							... 
							
							
							
							Signed-off-by: Jason Robinson <jasonr@matrix.org> 
							
						 
						
							2019-01-23 10:32:41 +02:00