14658 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brendan Abolivier	64fa928792	Simplify condition	2019-06-06 10:34:12 +01:00
Brendan Abolivier	b9c43c8463	Merge pull request #5355 from matrix-org/babolivier/heroes_left_members ... Include left members in room summaries' heroes	2019-06-06 10:05:27 +01:00
Richard van der Hoff	99d3497949	Merge pull request #5354 from matrix-org/rav/server_keys/99-room-v5 ... Implement room v5 which enforces signing key validity	2019-06-06 09:42:13 +01:00
Richard van der Hoff	2eb47e5ee7	Merge pull request #5353 from matrix-org/rav/verify_key_logging ... Associate a request_name with each verify request, for logging	2019-06-06 09:33:09 +01:00
Richard van der Hoff	a39be79216	Merge pull request #5362 from matrix-org/rav/fix_custom_ca ... Fix `federation_custom_ca_list` configuration option.	2019-06-05 22:54:41 +01:00
Amber Brown	6362e3af14	add more comments	2019-06-06 04:20:35 +10:00
Brendan Abolivier	ccbc9e5e17	Gah towncrier	2019-06-05 16:41:26 +01:00
Brendan Abolivier	d51ca9d9b3	Changelog	2019-06-05 16:38:51 +01:00
Brendan Abolivier	fe13bd52ac	Don't check whether the user's account is expired on /send_mail requests	2019-06-05 16:35:05 +01:00
Richard van der Hoff	7603a706eb	Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification	2019-06-05 16:32:35 +01:00
Richard van der Hoff	f8a45302c9	Fix federation_custom_ca_list configuration option. ... Previously, setting this option would cause an exception at startup.	2019-06-05 16:19:07 +01:00
Neil Johnson	94f6c674df	Neilj/add r0.5 to versions (#5360) ... * Update _matrix/client/versions to reference support for r0.5.0	2019-06-05 16:11:31 +01:00
Erik Johnston	75538813fc	Fix background updates to handle redactions/rejections (#5352) ... * Fix background updates to handle redactions/rejections In background updates based on current state delta stream we need to handle that we may not have all the events (or at least that `get_events` may raise an exception).	2019-06-06 00:45:46 +10:00
Richard van der Hoff	fb98c05e03	add a script to generate new signing_key files	2019-06-05 15:33:02 +01:00
Richard van der Hoff	b4f1cd31f4	Update sample config	2019-06-05 15:30:10 +01:00
Richard van der Hoff	95ab2eb4a1	Fix notes about well-known and acme (#5357) ... fixes #4951	2019-06-05 15:12:33 +01:00
Richard van der Hoff	e2dfb922e1	Validate federation server TLS certificates by default.	2019-06-05 14:17:50 +01:00
Brendan Abolivier	0a2f522644	Simplify condition	2019-06-05 14:02:29 +01:00
Erik Johnston	d53faa40e9	Merge pull request #5317 from matrix-org/erikj/make_do_auth_non_essential ... Fix handling of failures when calling /event_auth.	2019-06-05 14:01:32 +01:00
Brendan Abolivier	a4cf2c1184	Rewrite changelog	2019-06-05 14:00:18 +01:00
Neil Johnson	4650526b5e	Neilj/changelog clean up (#5356) ... * group together key validity refactors	2019-06-05 13:47:03 +01:00
Brendan Abolivier	40596aec0e	Merge branch 'develop' into m-heroes-empty-room-name	2019-06-05 13:38:01 +01:00
Neil Johnson	26713515de	Neilj/mau tracking config explainer (#5284) ... Improve documentation of monthly active user blocking and mau_trial_days	2019-06-05 13:16:23 +01:00
Brendan Abolivier	804f26a9ff	Properly format the changelog	2019-06-05 12:03:01 +01:00
Brendan Abolivier	a412be2bc7	Changelog	2019-06-05 11:53:50 +01:00
Brendan Abolivier	dbbaf25dd3	Do user_id != me checks before deciding whether we should pick heroes from the joined members or the parted ones	2019-06-05 11:50:27 +01:00
Erik Johnston	bc3d6b918b	Add logging when request fails and clarify we ignore errors.	2019-06-05 11:37:51 +01:00
Richard van der Hoff	d18e4ea0d4	Implement room v5 which enforces signing key validity ... Implements [MSC2077](https://github.com/matrix-org/matrix-doc/pull/2077) and fixes #5247 and #4364.	2019-06-05 11:00:47 +01:00
Richard van der Hoff	cea9750d11	Associate a request_name with each verify request, for logging ... Also: * rename VerifyKeyRequest->VerifyJsonRequest * calculate key_ids on VerifyJsonRequest construction * refactor things to pass around VerifyJsonRequests instead of 4-tuples	2019-06-05 10:46:26 +01:00
Richard van der Hoff	14f13babb0	Add a test room version where we enforce key validity (#5348)	2019-06-05 10:38:25 +01:00
Richard van der Hoff	2615c6bd9e	Clean up debug logging (#5347) ... Remove some spurious stuff, clarify some other stuff	2019-06-05 10:35:40 +01:00
Richard van der Hoff	016af01598	Rename VerifyKeyRequest.deferred field (#5343) ... it's a bit confusing	2019-06-05 10:35:13 +01:00
Richard van der Hoff	aa530e6800	Call RetryLimiter correctly (#5340) ... Fixes a regression introduced in #5335.	2019-06-04 22:02:53 +01:00
Richard van der Hoff	dae224a73f	Fix failure to fetch batches of PDUs (#5342) ... FederationClient.get_pdu is called in a loop to fetch a batch of PDUs. A failure to fetch one should not result in a failure of the whole batch. Add the missing `continue`.	2019-06-04 18:05:06 +01:00
Richard van der Hoff	b4189b112f	Rename get_events->get_events_from_store_or_dest (#5344) ... We have too many things called get_event, and it's hard to figure out what we mean. Also remove some unused params from the signature, and add some logging.	2019-06-04 18:01:09 +01:00
Brendan Abolivier	f6dd12d1e2	Merge pull request #5341 from matrix-org/babolivier/email_config ... Make account validity renewal emails work when email notifs are disabled	2019-06-04 14:49:06 +01:00
Brendan Abolivier	2f62e1f6ff	Only parse from email if provided	2019-06-04 14:24:36 +01:00
Erik Johnston	d1d38081a7	Merge pull request #5324 from matrix-org/erikj/ignore_null ... Ignore room state with null bytes in for room stats	2019-06-04 14:20:08 +01:00
Brendan Abolivier	1cc5fc1f6c	Lint	2019-06-04 13:51:23 +01:00
Brendan Abolivier	ac3cc32367	Make account validity renewal emails work when email notifs are disabled	2019-06-04 13:47:44 +01:00
Richard van der Hoff	df9c100542	Avoid rapidly backing-off a server if we ignore the retry interval (#5335)	2019-06-04 11:53:29 +01:00
Richard van der Hoff	4d08b8f30c	Don't do long retries when calling the key notary server. (#5334) ... It takes at least 20 minutes to work through the long_retries schedule (11 attempts, each with a 60 second timeout, and 60 seconds between each request), so if the notary server isn't returning within the timeout, we'll just end up blocking whatever request is happening for 20 minutes. Ain't nobody got time for that.	2019-06-04 11:53:07 +01:00
Richard van der Hoff	cb683d3e3c	Merge pull request #5333 from matrix-org/rav/server_keys/09_improve_notary_server ... Fixes for the key-notary server	2019-06-04 11:48:18 +01:00
Richard van der Hoff	5bdb189f86	Improve docstrings on MatrixFederationClient. (#5332)	2019-06-04 11:14:16 +01:00
Brendan Abolivier	aeb2263320	Merge branch 'develop' into babolivier/port_db_account_validity	2019-06-04 09:13:42 +01:00
Amber Brown	b2b90b7d34	Hawkowl/fix missing auth (#5328)	2019-06-04 15:54:27 +10:00
Richard van der Hoff	a3f2d000e0	changelog	2019-06-04 00:16:56 +01:00
Richard van der Hoff	c5d60eadd5	Notary server: make requests to origins in parallel ... ... else we're guaranteed to time out.	2019-06-04 00:16:56 +01:00
Richard van der Hoff	def5ea4062	Don't bomb out on direct key fetches as soon as one fails	2019-06-04 00:16:56 +01:00
Richard van der Hoff	dce6e9e0c1	Avoid rapidly backing-off a server if we ignore the retry interval	2019-06-03 23:58:42 +01:00